diff options
| author | Mike McQuaid | 2017-01-03 17:50:09 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2017-01-03 17:50:09 +0000 |
| commit | cd1579a51a0455f0e7dee1eeddc2191f67780ce6 (patch) | |
| tree | 2e9d981f81c3eae50299fb33b359f7b31ae7e3a2 | |
| parent | 2eed2ba43448e7233f5c9fa40eefb2540da6361e (diff) | |
| download | brew-cd1579a51a0455f0e7dee1eeddc2191f67780ce6.tar.bz2 | |
Deprecate Homebrew/versions, Homebrew/devel-only.
Don't use Homebrew/versions in a test and remove them both from the
OFFICIAL_TAPS list (i.e. `brew search`).
| -rw-r--r-- | Library/Homebrew/official_taps.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/tap_test.rb | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb index a220c9239..c1ef431b6 100644 --- a/Library/Homebrew/official_taps.rb +++ b/Library/Homebrew/official_taps.rb @@ -1,7 +1,6 @@ OFFICIAL_TAPS = %w[ apache completions - devel-only dupes emacs fuse @@ -12,7 +11,6 @@ OFFICIAL_TAPS = %w[ python science tex - versions x11 ].freeze diff --git a/Library/Homebrew/test/tap_test.rb b/Library/Homebrew/test/tap_test.rb index b950cd166..7114cdf22 100644 --- a/Library/Homebrew/test/tap_test.rb +++ b/Library/Homebrew/test/tap_test.rb @@ -16,7 +16,7 @@ class IntegrationCommandTestTap < IntegrationCommandTestCase end assert_match "homebrew/foo", cmd("tap") - assert_match "homebrew/versions", cmd("tap", "--list-official") + assert_match "homebrew/science", cmd("tap", "--list-official") 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") @@ -162,17 +162,17 @@ class TapTest < Homebrew::TestCase assert_raises(TapUnavailableError) { Tap.new("Homebrew", "bar").remote } refute_predicate @tap, :custom_remote? - version_tap = Tap.new("Homebrew", "versions") - version_tap.path.mkpath - version_tap.path.cd do + services_tap = Tap.new("Homebrew", "services") + services_tap.path.mkpath + services_tap.path.cd do shutup do system "git", "init" - system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew-versions" + system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew-services" end end - refute_predicate version_tap, :private? + refute_predicate services_tap, :private? ensure - version_tap.path.rmtree if version_tap + services_tap.path.rmtree if services_tap end def test_remote_not_git_repo |