diff options
| author | Max Howell | 2009-09-18 14:32:21 +0100 |
|---|---|---|
| committer | Max Howell | 2009-09-18 14:32:21 +0100 |
| commit | 3d421c864971bc86b1d7603e69d05f5fed79a60e (patch) | |
| tree | 32418f8276d31d442a5061947a456c04d77bab20 /Library/Homebrew/unittest.rb | |
| parent | a8d6a695bc248ad99bb74ce77b6e977f0715b8c0 (diff) | |
| download | brew-3d421c864971bc86b1d7603e69d05f5fed79a60e.tar.bz2 | |
Update references to masterbrew
I left update_from_masterbrew! as a historical reference.
Diffstat (limited to 'Library/Homebrew/unittest.rb')
| -rwxr-xr-x | Library/Homebrew/unittest.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb index 0a9c497d3..0b2d7df7f 100755 --- a/Library/Homebrew/unittest.rb +++ b/Library/Homebrew/unittest.rb @@ -514,8 +514,8 @@ class BeerTasting <Test::Unit::TestCase def test_updater_update_homebrew_without_any_changes outside_prefix do updater = RefreshBrewMock.new - updater.in_prefix_expect("git checkout masterbrew") - updater.in_prefix_expect("git pull origin masterbrew", "Already up-to-date.\n") + updater.in_prefix_expect("git checkout master") + updater.in_prefix_expect("git pull origin master", "Already up-to-date.\n") assert_equal false, updater.update_from_masterbrew! assert updater.expectations_met? @@ -526,9 +526,9 @@ class BeerTasting <Test::Unit::TestCase def test_updater_update_homebrew_without_formulae_changes outside_prefix do updater = RefreshBrewMock.new - updater.in_prefix_expect("git checkout masterbrew") + updater.in_prefix_expect("git checkout master") output = fixture('update_git_pull_output_without_formulae_changes') - updater.in_prefix_expect("git pull origin masterbrew", output) + updater.in_prefix_expect("git pull origin master", output) assert_equal true, updater.update_from_masterbrew! assert !updater.pending_formulae_changes? @@ -539,9 +539,9 @@ class BeerTasting <Test::Unit::TestCase def test_updater_update_homebrew_with_formulae_changes outside_prefix do updater = RefreshBrewMock.new - updater.in_prefix_expect("git checkout masterbrew") + updater.in_prefix_expect("git checkout master") output = fixture('update_git_pull_output_with_formulae_changes') - updater.in_prefix_expect("git pull origin masterbrew", output) + updater.in_prefix_expect("git pull origin master", output) assert_equal true, updater.update_from_masterbrew! assert updater.pending_formulae_changes? @@ -584,7 +584,7 @@ update_git_pull_output_without_formulae_changes: | remote: Total 39 (delta 20), reused 0 (delta 0) Unpacking objects: 100% (39/39), done. From git://github.com/mxcl/homebrew - * branch masterbrew -> FETCH_HEAD + * branch master -> FETCH_HEAD Updating 14ef7f9..f414bc8 Fast forward Library/Homebrew/ARGV+yeast.rb | 35 ++-- @@ -604,7 +604,7 @@ update_git_pull_output_with_formulae_changes: | remote: Total 39 (delta 20), reused 0 (delta 0) Unpacking objects: 100% (39/39), done. From git://github.com/mxcl/homebrew - * branch masterbrew -> FETCH_HEAD + * branch master -> FETCH_HEAD Updating 14ef7f9..f414bc8 Fast forward Library/Contributions/brew_bash_completion.sh | 6 +- |