diff options
Diffstat (limited to 'Library/Homebrew/test/dev-cmd')
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/audit_spec.rb | 34 | ||||
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/bottle_spec.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/create_spec.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/edit_spec.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/pull_spec.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/tap_spec.rb | 12 | ||||
| -rw-r--r-- | Library/Homebrew/test/dev-cmd/test_spec.rb | 8 |
7 files changed, 25 insertions, 49 deletions
diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb index 25a179342..f2d8a8e7c 100644 --- a/Library/Homebrew/test/dev-cmd/audit_spec.rb +++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb @@ -174,13 +174,11 @@ describe FormulaAuditor do specify "GithubGistFormula", :needs_compat do ENV.delete("HOMEBREW_DEVELOPER") - fa = shutup do - formula_auditor "foo", <<-EOS.undent - class Foo < GithubGistFormula - url "http://example.com/foo-1.0.tgz" - end - EOS - end + fa = formula_auditor "foo", <<-EOS.undent + class Foo < GithubGistFormula + url "http://example.com/foo-1.0.tgz" + end + EOS fa.audit_class expect(fa.problems) @@ -388,18 +386,14 @@ describe FormulaAuditor do origin_tap_path.mkpath origin_tap_path.cd do - shutup do - system "git", "init" - system "git", "add", "--all" - system "git", "commit", "-m", "init" - end + system "git", "init" + system "git", "add", "--all" + system "git", "commit", "-m", "init" end tap_path.mkpath tap_path.cd do - shutup do - system "git", "clone", origin_tap_path, "." - end + system "git", "clone", origin_tap_path, "." end end @@ -423,16 +417,12 @@ describe FormulaAuditor do origin_formula_path.write text origin_tap_path.cd do - shutup do - system "git", "commit", "-am", "commit" - end + system "git", "commit", "-am", "commit" end tap_path.cd do - shutup do - system "git", "fetch" - system "git", "reset", "--hard", "origin/master" - end + system "git", "fetch" + system "git", "reset", "--hard", "origin/master" end end diff --git a/Library/Homebrew/test/dev-cmd/bottle_spec.rb b/Library/Homebrew/test/dev-cmd/bottle_spec.rb index 468ef2e90..1cc72f95a 100644 --- a/Library/Homebrew/test/dev-cmd/bottle_spec.rb +++ b/Library/Homebrew/test/dev-cmd/bottle_spec.rb @@ -1,10 +1,8 @@ describe "brew bottle", :integration_test do it "builds a bottle for the given Formula" do begin - shutup do - expect { brew "install", "--build-bottle", testball } - .to be_a_success - end + expect { brew "install", "--build-bottle", testball } + .to be_a_success expect { brew "bottle", "--no-rebuild", testball } .to output(/Formula not from core or any taps/).to_stderr diff --git a/Library/Homebrew/test/dev-cmd/create_spec.rb b/Library/Homebrew/test/dev-cmd/create_spec.rb index b7f96ec7f..7c85a9f7d 100644 --- a/Library/Homebrew/test/dev-cmd/create_spec.rb +++ b/Library/Homebrew/test/dev-cmd/create_spec.rb @@ -3,9 +3,7 @@ describe "brew create", :integration_test do let(:formula_file) { CoreTap.new.formula_dir/"testball.rb" } it "creates a new Formula file for a given URL" do - shutup do - brew "create", url, "HOMEBREW_EDITOR" => "/bin/cat" - end + brew "create", url, "HOMEBREW_EDITOR" => "/bin/cat" expect(formula_file).to exist expect(formula_file.read).to match(%Q(sha256 "#{TESTBALL_SHA256}")) diff --git a/Library/Homebrew/test/dev-cmd/edit_spec.rb b/Library/Homebrew/test/dev-cmd/edit_spec.rb index 5cedb0524..3f557fcdf 100644 --- a/Library/Homebrew/test/dev-cmd/edit_spec.rb +++ b/Library/Homebrew/test/dev-cmd/edit_spec.rb @@ -1,9 +1,7 @@ describe "brew edit", :integration_test do it "opens a given Formula in an editor" do HOMEBREW_REPOSITORY.cd do - shutup do - system "git", "init" - end + system "git", "init" end setup_test_formula "testball" diff --git a/Library/Homebrew/test/dev-cmd/pull_spec.rb b/Library/Homebrew/test/dev-cmd/pull_spec.rb index 9037342b8..9815ef9a1 100644 --- a/Library/Homebrew/test/dev-cmd/pull_spec.rb +++ b/Library/Homebrew/test/dev-cmd/pull_spec.rb @@ -8,10 +8,8 @@ describe "brew pull", :integration_test do it "fetches a patch from a GitHub commit or pull request and applies it", :needs_network do CoreTap.instance.path.cd do - shutup do - system "git", "init" - system "git", "checkout", "-b", "new-branch" - end + system "git", "init" + system "git", "checkout", "-b", "new-branch" end expect { brew "pull", "https://jenkins.brew.sh/job/Homebrew\%20Testing/1028/" } diff --git a/Library/Homebrew/test/dev-cmd/tap_spec.rb b/Library/Homebrew/test/dev-cmd/tap_spec.rb index a24c67aae..93e9c0ed6 100644 --- a/Library/Homebrew/test/dev-cmd/tap_spec.rb +++ b/Library/Homebrew/test/dev-cmd/tap_spec.rb @@ -3,13 +3,11 @@ describe "brew tap", :integration_test do path = Tap::TAP_DIRECTORY/"homebrew/homebrew-foo" path.mkpath path.cd do - shutup do - system "git", "init" - system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew-foo" - FileUtils.touch "readme" - system "git", "add", "--all" - system "git", "commit", "-m", "init" - end + system "git", "init" + system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew-foo" + FileUtils.touch "readme" + system "git", "add", "--all" + system "git", "commit", "-m", "init" end expect { brew "tap" } diff --git a/Library/Homebrew/test/dev-cmd/test_spec.rb b/Library/Homebrew/test/dev-cmd/test_spec.rb index b73d042e4..9ff365bfb 100644 --- a/Library/Homebrew/test/dev-cmd/test_spec.rb +++ b/Library/Homebrew/test/dev-cmd/test_spec.rb @@ -14,9 +14,7 @@ describe "brew test", :integration_test do end it "fails when a Formula has no test" do - shutup do - expect { brew "install", testball }.to be_a_success - end + expect { brew "install", testball }.to be_a_success expect { brew "test", testball } .to output(/testball defines no test/).to_stderr @@ -39,9 +37,7 @@ describe "brew test", :integration_test do end EOS - shutup do - expect { brew "install", "testball" }.to be_a_success - end + expect { brew "install", "testball" }.to be_a_success expect { brew "test", "--HEAD", "testball" } .to output(/Testing testball/).to_stdout |
