Merge pull request #3696 from alyssais/prepend1.5.0

`prepend` instead of alias hacks for deprecations

2 files changed, 17 insertions, 1 deletions

diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index 0f182a69e..46e859b2d 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -128,5 +128,15 @@ describe DependencyCollector do
       resource.download_strategy = Class.new
       expect { subject.add(resource) }.to raise_error(TypeError)
     end
+
+    it "is deprecated when called with a language module", :needs_compat do
+      expect(subject).to receive(:odeprecated)
+      subject.add("lpeg" => :lua)
+    end
+
+    it "is deprecated when called with deprecated requirements", :needs_compat do
+      expect(subject).to receive(:odeprecated)
+      subject.add(:python)
+    end
   end
 end
diff --git a/Library/Homebrew/test/formula_support_spec.rb b/Library/Homebrew/test/formula_support_spec.rb
index f42d61ba9..7239ef352 100644
--- a/Library/Homebrew/test/formula_support_spec.rb
+++ b/Library/Homebrew/test/formula_support_spec.rb
@@ -3,7 +3,7 @@ require "formula_support"
 describe KegOnlyReason do
   describe "#to_s" do
     it "returns the reason provided" do
-      r = KegOnlyReason.new :provided_by_osx, "test"
+      r = KegOnlyReason.new :provided_by_macos, "test"
       expect(r.to_s).to eq("test")
     end
 
@@ -11,6 +11,12 @@ describe KegOnlyReason do
       r = KegOnlyReason.new :provided_by_macos, ""
       expect(r.to_s).to match(/^macOS already provides/)
     end
+
+    it "is deprecated when reason mentions 'osx'", :needs_compat do
+      r = KegOnlyReason.new :provided_by_osx, "test"
+      expect(r).to receive(:odeprecated)
+      r.to_s
+    end
   end
 end