aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-01-04 11:37:48 +0000
committerGitHub2017-01-04 11:37:48 +0000
commit98dadd907e31bb5f9a16bfb6aa2138b1852c4db5 (patch)
tree71d619322abf68a8d014ed7db97126a8bc23041c
parent3568cf3a40e489959666fde7e75d71e5bf698b47 (diff)
parent56d6695bf36805bb32a960e377a564fc4df5d716 (diff)
downloadbrew-98dadd907e31bb5f9a16bfb6aa2138b1852c4db5.tar.bz2
Merge pull request #1777 from alyssais/tests_tab_version
tests: remove temporary tab homebrew_version override
-rw-r--r--Library/Homebrew/tab.rb1
-rw-r--r--Library/Homebrew/test/tab_test.rb9
2 files changed, 2 insertions, 8 deletions
diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb
index 669846dfc..746c3dd92 100644
--- a/Library/Homebrew/tab.rb
+++ b/Library/Homebrew/tab.rb
@@ -168,6 +168,7 @@ class Tab < OpenStruct
def self.empty
attributes = {
+ "homebrew_version" => HOMEBREW_VERSION,
"used_options" => [],
"unused_options" => [],
"built_as_bottle" => false,
diff --git a/Library/Homebrew/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb
index 526e1f79e..f9824ba2a 100644
--- a/Library/Homebrew/test/tab_test.rb
+++ b/Library/Homebrew/test/tab_test.rb
@@ -33,10 +33,7 @@ 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_equal HOMEBREW_VERSION, tab.homebrew_version
assert_empty tab.unused_options
assert_empty tab.used_options
assert_nil tab.changed_files
@@ -199,10 +196,6 @@ 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" },