From b7e10ba23972e3ebfdc4a75da1b6e2016d3e99c9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 4 Jan 2017 00:46:44 +0000 Subject: [PATCH 1/2] tests: remove temp tab homebrew_version override This had to be added in #1750 to work around special-casing for tabs generated with Homebrew versions < 1.1.6. Now that 1.1.6 is the current version, we can remove this hack. --- Library/Homebrew/test/tab_test.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Library/Homebrew/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb index 526e1f79e3..baa1dec84e 100644 --- a/Library/Homebrew/test/tab_test.rb +++ b/Library/Homebrew/test/tab_test.rb @@ -33,10 +33,6 @@ 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 @@ -199,10 +195,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" }, From 56d6695bf36805bb32a960e377a564fc4df5d716 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 4 Jan 2017 00:56:06 +0000 Subject: [PATCH 2/2] tab: set homebrew_version in Tab.empty --- Library/Homebrew/tab.rb | 1 + Library/Homebrew/test/tab_test.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index 669846dfc9..746c3dd928 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 baa1dec84e..f9824ba2a8 100644 --- a/Library/Homebrew/test/tab_test.rb +++ b/Library/Homebrew/test/tab_test.rb @@ -33,6 +33,7 @@ class TabTests < Homebrew::TestCase def test_defaults tab = Tab.empty + assert_equal HOMEBREW_VERSION, tab.homebrew_version assert_empty tab.unused_options assert_empty tab.used_options assert_nil tab.changed_files