From d998a3fcce579b087dee76c5aeb9956713e81b62 Mon Sep 17 00:00:00 2001
From: Alyssa Ross
Date: Fri, 30 Dec 2016 20:34:14 +0000
Subject: tab: remove #reliable_runtime_dependencies?

See https://github.com/Homebrew/brew/pull/1750#discussion_r94243825 for
discussion.

Removes Tab#reliable_runtime_dependencies? in favour of returning nil
from Tab#runtime_dependencies if the list is unreliable.

Because Homebrew 1.1.6 hasn't been tagged yet, tabs created in tests
aren't created with a homebrew_version that marks the
runtime_dependencies in the Tab as reliable, so there are some tests
that fail. To work around this, I've had to add a line to some tests
that explicitly overrides the homebrew_version in the Tab. This is
really ugly though, so they should be removed as soon as possible after
1.1.6 is released.
---
 Library/Homebrew/test/tab_test.rb | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'Library/Homebrew/test')

diff --git a/Library/Homebrew/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb
index 8ba36393b..526e1f79e 100644
--- a/Library/Homebrew/test/tab_test.rb
+++ b/Library/Homebrew/test/tab_test.rb
@@ -32,6 +32,11 @@ class TabTests < Homebrew::TestCase
 
   def test_defaults
     tab = Tab.empty
+
+    # FIXME: remove this line after Homebrew 1.1.6 is released.
+    # See https://github.com/Homebrew/brew/pull/1750#discussion_r94254622
+    tab.homebrew_version = "1.1.6"
+
     assert_empty tab.unused_options
     assert_empty tab.used_options
     assert_nil tab.changed_files
@@ -89,27 +94,27 @@ class TabTests < Homebrew::TestCase
     assert tab.parsed_homebrew_version < "2.0.0-135-g01789abdf"
   end
 
-  def test_reliable_runtime_dependencies?
+  def test_runtime_dependencies
     tab = Tab.new
-    refute_predicate tab, :reliable_runtime_dependencies?
+    assert_nil tab.runtime_dependencies
 
     tab.homebrew_version = "1.1.6"
-    refute_predicate tab, :reliable_runtime_dependencies?
+    assert_nil tab.runtime_dependencies
 
     tab.runtime_dependencies = []
-    assert_predicate tab, :reliable_runtime_dependencies?
+    refute_nil tab.runtime_dependencies
 
     tab.homebrew_version = "1.1.5"
-    refute_predicate tab, :reliable_runtime_dependencies?
+    assert_nil tab.runtime_dependencies
 
     tab.homebrew_version = "1.1.7"
-    assert_predicate tab, :reliable_runtime_dependencies?
+    refute_nil tab.runtime_dependencies
 
     tab.homebrew_version = "1.1.10"
-    assert_predicate tab, :reliable_runtime_dependencies?
+    refute_nil tab.runtime_dependencies
 
     tab.runtime_dependencies = [{ "full_name" => "foo", "version" => "1.0" }]
-    assert_predicate tab, :reliable_runtime_dependencies?
+    refute_nil tab.runtime_dependencies
   end
 
   def test_cxxstdlib
@@ -194,6 +199,10 @@ class TabTests < Homebrew::TestCase
     stdlib = :libcxx
     tab = Tab.create(f, compiler, stdlib)
 
+    # FIXME: remove this line after Homebrew 1.1.6 is released.
+    # See https://github.com/Homebrew/brew/pull/1750#discussion_r94254622
+    tab.homebrew_version = "1.1.6"
+
     runtime_dependencies = [
       { "full_name" => "bar", "version" => "2.0" },
       { "full_name" => "user/repo/from_tap", "version" => "1.0" },
-- 
cgit v1.2.3