Merge pull request #3612 from MikeMcQuaid/more-deprecations

requirements: move more to compat.

6 files changed, 18 insertions, 32 deletions

diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index 5ba3c20bd..cfbd260b3 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -66,7 +66,7 @@ describe DependencyCollector do
       expect(dep).to be_optional
     end
 
-    specify "ant dependency" do
+    specify "ant dependency", :needs_compat do
       subject.add ant: :build
       expect(find_dependency("ant")).to eq(Dependency.new("ant", [:build]))
     end
diff --git a/Library/Homebrew/test/formula_installer_spec.rb b/Library/Homebrew/test/formula_installer_spec.rb
index b85e75b81..d3710a4cb 100644
--- a/Library/Homebrew/test/formula_installer_spec.rb
+++ b/Library/Homebrew/test/formula_installer_spec.rb
@@ -133,7 +133,7 @@ describe FormulaInstaller do
     }.to raise_error(CannotInstallFormulaError)
   end
 
-  describe "#install_requirement_formula?" do
+  describe "#install_requirement_formula?", :needs_compat do
     before do
       @requirement = Python3Requirement.new
       @requirement_dependency = @requirement.to_dependency
diff --git a/Library/Homebrew/test/formula_spec.rb b/Library/Homebrew/test/formula_spec.rb
index 6ba6af307..a9d09cb00 100644
--- a/Library/Homebrew/test/formula_spec.rb
+++ b/Library/Homebrew/test/formula_spec.rb
@@ -711,21 +711,21 @@ describe Formula do
     f1 = formula "f1" do
       url "f1-1"
 
-      depends_on :python
+      depends_on :java
       depends_on x11: :recommended
       depends_on xcode: ["1.0", :optional]
     end
     stub_formula_loader(f1)
 
-    python = PythonRequirement.new
+    java = JavaRequirement.new
     x11 = X11Requirement.new("x11", [:recommended])
     xcode = XcodeRequirement.new(["1.0", :optional])
 
-    expect(Set.new(f1.recursive_requirements)).to eq(Set[python, x11])
+    expect(Set.new(f1.recursive_requirements)).to eq(Set[java, x11])
 
     f1.build = BuildOptions.new(["--with-xcode", "--without-x11"], f1.options)
 
-    expect(Set.new(f1.recursive_requirements)).to eq(Set[python, xcode])
+    expect(Set.new(f1.recursive_requirements)).to eq(Set[java, xcode])
 
     f1.build = f1.stable.build
     f2 = formula "f2" do
@@ -734,11 +734,11 @@ describe Formula do
       depends_on "f1"
     end
 
-    expect(Set.new(f2.recursive_requirements)).to eq(Set[python, x11])
-    expect(Set.new(f2.recursive_requirements {})).to eq(Set[python, x11, xcode])
+    expect(Set.new(f2.recursive_requirements)).to eq(Set[java, x11])
+    expect(Set.new(f2.recursive_requirements {})).to eq(Set[java, x11, xcode])
 
     requirements = f2.recursive_requirements do |_dependent, requirement|
-      Requirement.prune if requirement.is_a?(PythonRequirement)
+      Requirement.prune if requirement.is_a?(JavaRequirement)
     end
 
     expect(Set.new(requirements)).to eq(Set[x11, xcode])
diff --git a/Library/Homebrew/test/mpi_requirement_spec.rb b/Library/Homebrew/test/mpi_requirement_spec.rb
index f32b27993..87f99eb3a 100644
--- a/Library/Homebrew/test/mpi_requirement_spec.rb
+++ b/Library/Homebrew/test/mpi_requirement_spec.rb
@@ -1,6 +1,6 @@
-require "requirements/mpi_requirement"
+require "compat/requirements/mpi_requirement"
 
-describe MPIRequirement do
+describe MPIRequirement, :needs_compat do
   describe "::new" do
     subject { described_class.new(*(wrappers + tags)) }
     let(:wrappers) { [:cc, :cxx, :f77] }
diff --git a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
index 688149021..357c35c2d 100644
--- a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
@@ -22,18 +22,6 @@ describe DependencyCollector do
     expect(subject.build(:ld64)).to be nil
   end
 
-  specify "ant Mavericks or newer dependency" do
-    allow(MacOS).to receive(:version).and_return(MacOS::Version.new("10.9"))
-    subject.add ant: :build
-    expect(subject.deps.find { |dep| dep.name == "ant" }).to eq(Dependency.new("ant", [:build]))
-  end
-
-  specify "ant pre-Mavericks dependency" do
-    allow(MacOS).to receive(:version).and_return(MacOS::Version.new("10.7"))
-    subject.add ant: :build
-    expect(subject.deps.find { |dep| dep.name == "ant" }).to be nil
-  end
-
   specify "Resource xz pre-Mavericks dependency" do
     allow(MacOS).to receive(:version).and_return(MacOS::Version.new("10.8"))
     resource = Resource.new
diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
index 0d2146339..19492c252 100644
--- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
@@ -717,29 +717,27 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
       RUBY
     end
 
-    it "deprecated ENV.fortran usage" do
+    it "deprecated ARGV.include? (--HEAD) usage" do
       expect_offense(<<~RUBY)
         class Foo < Formula
           desc "foo"
           url 'http://example.com/foo-1.0.tgz'
           test do
-            ENV.fortran
-            ^^^^^^^^^^^ Use `depends_on :fortran` instead of `ENV.fortran`
+            head = ARGV.include? "--HEAD"
+                                  ^^^^^^ Use "if build.head?" instead
+                   ^^^^ Use build instead of ARGV to check options
           end
         end
       RUBY
     end
 
-    it "deprecated ARGV.include? (--HEAD) usage" do
+    it "deprecated needs :openmp usage" do
       expect_offense(<<~RUBY)
         class Foo < Formula
           desc "foo"
           url 'http://example.com/foo-1.0.tgz'
-          test do
-            head = ARGV.include? "--HEAD"
-                                  ^^^^^^ Use "if build.head?" instead
-                   ^^^^ Use build instead of ARGV to check options
-          end
+          needs :openmp
+          ^^^^^^^^^^^^^ 'needs :openmp' should be replaced with 'depends_on \"gcc\"'
         end
       RUBY
     end