From 88a4a95e69d05010e16920b9e339421ff434754c Mon Sep 17 00:00:00 2001 From: Joshua Liu Date: Tue, 21 Feb 2017 20:14:21 -0500 Subject: Convert deps test to spec --- Library/Homebrew/test/deps_spec.rb | 14 ++++++++++++++ Library/Homebrew/test/deps_test.rb | 16 ---------------- 2 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 Library/Homebrew/test/deps_spec.rb delete mode 100644 Library/Homebrew/test/deps_test.rb (limited to 'Library') diff --git a/Library/Homebrew/test/deps_spec.rb b/Library/Homebrew/test/deps_spec.rb new file mode 100644 index 000000000..7d7fe13c3 --- /dev/null +++ b/Library/Homebrew/test/deps_spec.rb @@ -0,0 +1,14 @@ +describe Homebrew do + describe "#deps" do + setup_test_formula "foo" + setup_test_formula "bar" + setup_test_formula "baz", <<-EOS.undent + url "https://example.com/baz-1.0" + depends_on "bar" + EOS + + expect(cmd("deps", "foo")).to eq("") + expect(cmd("deps", "bar")).to eq("foo") + expect(cmd("deps", "baz")).to eq("bar\nfoo") + end +end diff --git a/Library/Homebrew/test/deps_test.rb b/Library/Homebrew/test/deps_test.rb deleted file mode 100644 index 01639857c..000000000 --- a/Library/Homebrew/test/deps_test.rb +++ /dev/null @@ -1,16 +0,0 @@ -require "testing_env" - -class IntegrationCommandTestDeps < IntegrationCommandTestCase - def test_deps - setup_test_formula "foo" - setup_test_formula "bar" - setup_test_formula "baz", <<-EOS.undent - url "https://example.com/baz-1.0" - depends_on "bar" - EOS - - assert_equal "", cmd("deps", "foo") - assert_equal "foo", cmd("deps", "bar") - assert_equal "bar\nfoo", cmd("deps", "baz") - end -end -- cgit v1.2.3 From 4063f4159dfa36132db4045e8ec4f7f722cdf9bb Mon Sep 17 00:00:00 2001 From: Joshua Liu Date: Thu, 23 Feb 2017 01:54:44 -0500 Subject: Updated deps_spec to match style --- Library/Homebrew/test/deps_spec.rb | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/test/deps_spec.rb b/Library/Homebrew/test/deps_spec.rb index 7d7fe13c3..61a0d1174 100644 --- a/Library/Homebrew/test/deps_spec.rb +++ b/Library/Homebrew/test/deps_spec.rb @@ -1,14 +1,28 @@ -describe Homebrew do - describe "#deps" do +describe "brew deps", :integration_test do + before(:each) do setup_test_formula "foo" setup_test_formula "bar" setup_test_formula "baz", <<-EOS.undent url "https://example.com/baz-1.0" depends_on "bar" EOS + end + + it "outputs nothing for formula foo" do + expect { brew "deps", "foo" }.to output("").to_stdout + .and not_to_output.to_stderr + .and be_a_success + end + + it "outputs foo for formula bar" do + expect { brew "deps", "bar" }.to output("foo\n").to_stdout + .and not_to_output.to_stderr + .and be_a_success + end - expect(cmd("deps", "foo")).to eq("") - expect(cmd("deps", "bar")).to eq("foo") - expect(cmd("deps", "baz")).to eq("bar\nfoo") + it "outputs formulae bar and foo for formula baz" do + expect { brew "deps", "baz" }.to output("bar\nfoo\n").to_stdout + .and not_to_output.to_stderr + .and be_a_success end end -- cgit v1.2.3 From 1d7fde515b9cce2e3fc4dddce1c34f5e410bca87 Mon Sep 17 00:00:00 2001 From: Joshua Liu Date: Thu, 23 Feb 2017 05:02:41 -0500 Subject: Update deps_spec descriptions --- Library/Homebrew/test/deps_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/test/deps_spec.rb b/Library/Homebrew/test/deps_spec.rb index 61a0d1174..ec7964b76 100644 --- a/Library/Homebrew/test/deps_spec.rb +++ b/Library/Homebrew/test/deps_spec.rb @@ -8,19 +8,19 @@ describe "brew deps", :integration_test do EOS end - it "outputs nothing for formula foo" do + it "outputs no dependencies for a Formula that has no dependencies" do expect { brew "deps", "foo" }.to output("").to_stdout .and not_to_output.to_stderr .and be_a_success end - it "outputs foo for formula bar" do + it "outputs a dependency for a Formula that has one dependency" do expect { brew "deps", "bar" }.to output("foo\n").to_stdout .and not_to_output.to_stderr .and be_a_success end - it "outputs formulae bar and foo for formula baz" do + it "outputs dependencies on separate lines for a Formula that has multiple dependencies" do expect { brew "deps", "baz" }.to output("bar\nfoo\n").to_stdout .and not_to_output.to_stderr .and be_a_success -- cgit v1.2.3 From b2795bc90239fc94dffdc0d1995bf0e8c844f28d Mon Sep 17 00:00:00 2001 From: Joshua Liu Date: Thu, 23 Feb 2017 05:25:24 -0500 Subject: Corrected deps_spec descriptions and small formatting changes --- Library/Homebrew/test/deps_spec.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/test/deps_spec.rb b/Library/Homebrew/test/deps_spec.rb index ec7964b76..c83577716 100644 --- a/Library/Homebrew/test/deps_spec.rb +++ b/Library/Homebrew/test/deps_spec.rb @@ -9,19 +9,22 @@ describe "brew deps", :integration_test do end it "outputs no dependencies for a Formula that has no dependencies" do - expect { brew "deps", "foo" }.to output("").to_stdout + expect { brew "deps", "foo" } + .to output("").to_stdout .and not_to_output.to_stderr .and be_a_success end it "outputs a dependency for a Formula that has one dependency" do - expect { brew "deps", "bar" }.to output("foo\n").to_stdout + expect { brew "deps", "bar" } + .to output("foo\n").to_stdout .and not_to_output.to_stderr .and be_a_success end - it "outputs dependencies on separate lines for a Formula that has multiple dependencies" do - expect { brew "deps", "baz" }.to output("bar\nfoo\n").to_stdout + it "outputs all of a Formula's dependencies and their dependencies on separate lines" do + expect { brew "deps", "baz" } + .to output("bar\nfoo\n").to_stdout .and not_to_output.to_stderr .and be_a_success end -- cgit v1.2.3 From ed72e02bbadaf2164bf359bf7e8eac9ffcbd0b9e Mon Sep 17 00:00:00 2001 From: Joshua Liu Date: Fri, 24 Feb 2017 17:21:50 -0500 Subject: Change deps_spec expect ordering --- Library/Homebrew/test/deps_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/test/deps_spec.rb b/Library/Homebrew/test/deps_spec.rb index c83577716..4c892c93d 100644 --- a/Library/Homebrew/test/deps_spec.rb +++ b/Library/Homebrew/test/deps_spec.rb @@ -10,22 +10,22 @@ describe "brew deps", :integration_test do it "outputs no dependencies for a Formula that has no dependencies" do expect { brew "deps", "foo" } - .to output("").to_stdout + .to be_a_success + .and not_to_output.to_stdout .and not_to_output.to_stderr - .and be_a_success end it "outputs a dependency for a Formula that has one dependency" do expect { brew "deps", "bar" } - .to output("foo\n").to_stdout + .to be_a_success + .and output("foo\n").to_stdout .and not_to_output.to_stderr - .and be_a_success end it "outputs all of a Formula's dependencies and their dependencies on separate lines" do expect { brew "deps", "baz" } - .to output("bar\nfoo\n").to_stdout + .to be_a_success + .and output("bar\nfoo\n").to_stdout .and not_to_output.to_stderr - .and be_a_success end end -- cgit v1.2.3