Deprecate more requirements.

These are ones that were either already deprecated due to audit rules
or are just a simple `which` with a `default_formula` so should just
be a dependency.

3 files changed, 3 insertions, 22 deletions

diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index 3905717ad..5ba3c20bd 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -87,7 +87,7 @@ describe DependencyCollector do
     it "creates a resource dependency from a CVS URL" do
       resource = Resource.new
       resource.url(":pserver:anonymous:@example.com:/cvsroot/foo/bar", using: :cvs)
-      expect(subject.add(resource)).to be_an_instance_of(CVSRequirement)
+      expect(subject.add(resource)).to eq(Dependency.new("cvs", [:build]))
     end
 
     it "creates a resource dependency from a Subversion URL" do
diff --git a/Library/Homebrew/test/gpg2_requirement_spec.rb b/Library/Homebrew/test/gpg2_requirement_spec.rb
deleted file mode 100644
index 8b9040b82..000000000
--- a/Library/Homebrew/test/gpg2_requirement_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "requirements/gpg2_requirement"
-require "fileutils"
-
-describe GPG2Requirement do
-  let(:dir) { mktmpdir }
-
-  describe "#satisfied?" do
-    it "returns true if GPG2 is installed" do
-      ENV["PATH"] = dir/"bin"
-      (dir/"bin/gpg").write <<~EOS
-        #!/bin/bash
-        echo 2.1.20
-      EOS
-      FileUtils.chmod 0755, dir/"bin/gpg"
-
-      expect(subject).to be_satisfied
-    end
-  end
-end
diff --git a/Library/Homebrew/test/language_module_requirement_spec.rb b/Library/Homebrew/test/language_module_requirement_spec.rb
index 7f2666855..6ca8cbd0e 100644
--- a/Library/Homebrew/test/language_module_requirement_spec.rb
+++ b/Library/Homebrew/test/language_module_requirement_spec.rb
@@ -1,6 +1,6 @@
-require "requirements/language_module_requirement"
+require "compat/requirements/language_module_requirement"
 
-describe LanguageModuleRequirement do
+describe LanguageModuleRequirement, :needs_compat do
   specify "unique dependencies are not equal" do
     x = described_class.new(:node, "less")
     y = described_class.new(:node, "coffee-script")