Merge pull request #3659 from MikeMcQuaid/deprecated-requirements-harder

Deprecate requirements harder

3 files changed, 4 insertions, 70 deletions

diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index 216bbf316..0f182a69e 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -66,11 +66,6 @@ describe DependencyCollector do
       expect(dep).to be_optional
     end
 
-    specify "ant dependency", :needs_compat do
-      subject.add ant: :build
-      expect(find_dependency("ant")).to eq(Dependency.new("ant", [:build]))
-    end
-
     it "doesn't mutate the dependency spec" do
       spec = { "foo" => :optional }
       copy = spec.dup
diff --git a/Library/Homebrew/test/formula_installer_spec.rb b/Library/Homebrew/test/formula_installer_spec.rb
index d3710a4cb..93f23b18f 100644
--- a/Library/Homebrew/test/formula_installer_spec.rb
+++ b/Library/Homebrew/test/formula_installer_spec.rb
@@ -132,64 +132,4 @@ describe FormulaInstaller do
       fi.check_install_sanity
     }.to raise_error(CannotInstallFormulaError)
   end
-
-  describe "#install_requirement_formula?", :needs_compat do
-    before do
-      @requirement = Python3Requirement.new
-      @requirement_dependency = @requirement.to_dependency
-      @install_bottle_for_dependent = false
-      allow(@requirement).to receive(:satisfied?).and_return(satisfied?)
-      allow(@requirement).to receive(:satisfied_by_formula?).and_return(satisfied_by_formula?)
-      allow(@requirement).to receive(:build?).and_return(build?)
-      @dependent = formula do
-        url "foo"
-        version "0.1"
-        depends_on :python3
-      end
-      allow(@dependent).to receive(:installed?).and_return(installed?)
-      @fi = FormulaInstaller.new(@dependent)
-    end
-
-    subject { @fi.install_requirement_formula?(@requirement_dependency, @requirement, @dependent, @install_bottle_for_dependent) }
-
-    context "it returns false when requirement is satisfied" do
-      let(:satisfied?) { true }
-      let(:satisfied_by_formula?) { false }
-      let(:build?) { false }
-      let(:installed?) { false }
-      it { is_expected.to be false }
-    end
-
-    context "it returns false when requirement is satisfied but default formula is installed" do
-      let(:satisfied?) { true }
-      let(:satisfied_by_formula?) { false }
-      let(:build?) { false }
-      let(:installed?) { false }
-      it { is_expected.to be false }
-    end
-
-    context "it returns false when requirement is :build and dependent is installed" do
-      let(:satisfied?) { false }
-      let(:satisfied_by_formula?) { false }
-      let(:build?) { true }
-      let(:installed?) { true }
-      it { is_expected.to be false }
-    end
-
-    context "it returns true when requirement isn't satisfied" do
-      let(:satisfied?) { false }
-      let(:satisfied_by_formula?) { false }
-      let(:build?) { false }
-      let(:installed?) { false }
-      it { is_expected.to be true }
-    end
-
-    context "it returns true when requirement is satisfied by a formula" do
-      let(:satisfied?) { true }
-      let(:satisfied_by_formula?) { true }
-      let(:build?) { false }
-      let(:installed?) { false }
-      it { is_expected.to be true }
-    end
-  end
 end
diff --git a/Library/Homebrew/test/mpi_requirement_spec.rb b/Library/Homebrew/test/mpi_requirement_spec.rb
index 87f99eb3a..aecdb1b66 100644
--- a/Library/Homebrew/test/mpi_requirement_spec.rb
+++ b/Library/Homebrew/test/mpi_requirement_spec.rb
@@ -1,14 +1,13 @@
-require "compat/requirements/mpi_requirement"
+require "compat/requirements"
 
 describe MPIRequirement, :needs_compat do
   describe "::new" do
-    subject { described_class.new(*(wrappers + tags)) }
+    subject { described_class.new(wrappers + tags) }
     let(:wrappers) { [:cc, :cxx, :f77] }
     let(:tags) { [:optional, "some-other-tag"] }
 
-    it "untangles wrappers and tags" do
-      expect(subject.lang_list).to eq(wrappers)
-      expect(subject.tags).to eq(tags)
+    it "stores wrappers as tags" do
+      expect(subject.tags).to eq(wrappers + tags)
     end
   end
 end