From deea4c82a4e64e746465cd74ea80e9afbedd9a91 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 26 Feb 2016 19:43:49 +0800 Subject: fix brew tests Fix the `brew tests` problem caused by core/formula separation. --- Library/Homebrew/test/test_integration_cmds.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew/test/test_integration_cmds.rb') diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb index 8a7c85551..d20d1c033 100644 --- a/Library/Homebrew/test/test_integration_cmds.rb +++ b/Library/Homebrew/test/test_integration_cmds.rb @@ -217,7 +217,7 @@ class IntegrationCommandTests < Homebrew::TestCase assert_match "homebrew/foo", cmd("tap") assert_match "homebrew/versions", cmd("tap", "--list-official") - assert_match "1 tap", cmd("tap-info") + assert_match "2 taps", cmd("tap-info") assert_match "https://github.com/Homebrew/homebrew-foo", cmd("tap-info", "homebrew/foo") assert_match "https://github.com/Homebrew/homebrew-foo", cmd("tap-info", "--json=v1", "--installed") assert_match "Pinned homebrew/foo", cmd("tap-pin", "homebrew/foo") @@ -228,7 +228,7 @@ class IntegrationCommandTests < Homebrew::TestCase assert_equal "", cmd("tap", "homebrew/bar", path/".git", "-q", "--full") assert_match "Untapped", cmd("untap", "homebrew/bar") ensure - Tap::TAP_DIRECTORY.rmtree + path.rmtree end def test_missing @@ -339,13 +339,12 @@ class IntegrationCommandTests < Homebrew::TestCase end def test_tap_readme - (HOMEBREW_LIBRARY/"Taps").mkpath assert_match "brew install homebrew/foo/", cmd("tap-readme", "foo", "--verbose") readme = HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-foo/README.md" assert readme.exist?, "The README should be created" ensure - (HOMEBREW_LIBRARY/"Taps").rmtree + (HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-foo").rmtree end def test_unpack -- cgit v1.2.3