From ff2239509d53f86ca48330ddfc6f24fe03ba9768 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sat, 7 Oct 2017 21:32:40 +0200 Subject: Change behaviour of 'cask _stanza' command. Add tests for 'cask _stanza' command --- .../Homebrew/test/cask/cli/internal_stanza_spec.rb | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Library/Homebrew/test/cask/cli/internal_stanza_spec.rb (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb new file mode 100644 index 000000000..77b065567 --- /dev/null +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -0,0 +1,28 @@ +describe Hbc::CLI::InternalStanza, :cask do + + it "shows stanza of the Specified Cask" do + command = described_class.new("gpg", "with-gpg"); + command.run + # TODO check result + end + + it "raises an exception when stanza is invalid" do + expect { + described_class.new("invalid_stanza", "with-gpg"); + }.to raise_error(/Illegal stanza/); + end + + it "raises an exception when normal stanza is not present on cask" do + command = described_class.new("caveats", "with-gpg"); + expect { + command.run + }.to raise_error(/no such stanza/) + end + + it "raises an exception when artifact stanza is not present on cask" do + command = described_class.new("zap", "with-gpg"); + expect { + command.run + }.to raise_error(/no such stanza/) + end +end -- cgit v1.2.3 From 99b76360081ac92f75792ecea049b3dba496c659 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sat, 7 Oct 2017 23:07:31 +0200 Subject: Fix 'brew style' issues --- .../Homebrew/test/cask/cli/internal_stanza_spec.rb | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index 77b065567..1599ca843 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -1,28 +1,27 @@ describe Hbc::CLI::InternalStanza, :cask do - it "shows stanza of the Specified Cask" do - command = described_class.new("gpg", "with-gpg"); + command = described_class.new("gpg", "with-gpg") command.run - # TODO check result + # TODO: check result end it "raises an exception when stanza is invalid" do - expect { - described_class.new("invalid_stanza", "with-gpg"); - }.to raise_error(/Illegal stanza/); + expect do + described_class.new("invalid_stanza", "with-gpg") + end.to raise_error(/Illegal stanza/) end it "raises an exception when normal stanza is not present on cask" do - command = described_class.new("caveats", "with-gpg"); - expect { - command.run - }.to raise_error(/no such stanza/) + command = described_class.new("caveats", "with-gpg") + expect do + command.run + end.to raise_error(/no such stanza/) end it "raises an exception when artifact stanza is not present on cask" do - command = described_class.new("zap", "with-gpg"); - expect { - command.run - }.to raise_error(/no such stanza/) + command = described_class.new("zap", "with-gpg") + expect do + command.run + end.to raise_error(/no such stanza/) end end -- cgit v1.2.3 From dfe4e7641a71aef693831134c8db406e3252fa88 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sun, 8 Oct 2017 09:59:29 +0200 Subject: combine errors to a single if-statement. fix spec test --- Library/Homebrew/test/cask/cli/internal_stanza_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index 1599ca843..38fa1b840 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -1,8 +1,9 @@ describe Hbc::CLI::InternalStanza, :cask do it "shows stanza of the Specified Cask" do command = described_class.new("gpg", "with-gpg") - command.run - # TODO: check result + expect do + command.run + end.to output("http://example.com/gpg-signature.asc\n").to_stdout end it "raises an exception when stanza is invalid" do -- cgit v1.2.3 From 7f70080c94b6ef9b772b3464a0c0bb9420a407e0 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sun, 8 Oct 2017 12:34:15 +0200 Subject: Add another test to increase coverage. --- Library/Homebrew/test/cask/cli/internal_stanza_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index 38fa1b840..f3002e222 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -25,4 +25,11 @@ describe Hbc::CLI::InternalStanza, :cask do command.run end.to raise_error(/no such stanza/) end + + it "shows all artifact stanzas when using 'artifacts' keyword" do + command = described_class.new("artifacts", "with-gpg") + expect do + command.run + end.to output("{:app=>[[\"Caffeine.app\"]]}\n").to_stdout + end end -- cgit v1.2.3 From db2c86204b84e70ef6cef912ac410ea93551127f Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sun, 8 Oct 2017 17:41:03 +0200 Subject: internal_stanza.rb: Remove obsolete code. Improve detection of missing stanzas internal_stanza_spec.rb: change do ... end blocks to { } blocks --- .../Homebrew/test/cask/cli/internal_stanza_spec.rb | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index f3002e222..52bbf4ee0 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -1,35 +1,42 @@ describe Hbc::CLI::InternalStanza, :cask do it "shows stanza of the Specified Cask" do command = described_class.new("gpg", "with-gpg") - expect do + expect { command.run - end.to output("http://example.com/gpg-signature.asc\n").to_stdout + }.to output("http://example.com/gpg-signature.asc\n").to_stdout end it "raises an exception when stanza is invalid" do - expect do + expect { described_class.new("invalid_stanza", "with-gpg") - end.to raise_error(/Illegal stanza/) + }.to raise_error(/Illegal stanza/) end it "raises an exception when normal stanza is not present on cask" do command = described_class.new("caveats", "with-gpg") - expect do + expect { command.run - end.to raise_error(/no such stanza/) + }.to raise_error(/no such stanza/) end it "raises an exception when artifact stanza is not present on cask" do command = described_class.new("zap", "with-gpg") - expect do + expect { command.run - end.to raise_error(/no such stanza/) + }.to raise_error(/no such stanza/) + end + + it "raises an exception when 'depends_on' stanza is not present on cask" do + command = described_class.new("depends_on", "with-gpg") + expect { + command.run + }.to raise_error(/no such stanza/) end it "shows all artifact stanzas when using 'artifacts' keyword" do command = described_class.new("artifacts", "with-gpg") - expect do + expect { command.run - end.to output("{:app=>[[\"Caffeine.app\"]]}\n").to_stdout + }.to output("{:app=>[[\"Caffeine.app\"]]}\n").to_stdout end end -- cgit v1.2.3 From 2b261ad4a7d0e29f1708be5ae547c29e22635652 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sun, 22 Oct 2017 13:43:17 +0200 Subject: Refactor code to reduce characters per line --- Library/Homebrew/test/cask/cli/internal_stanza_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index 52bbf4ee0..a020b33d4 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -6,10 +6,10 @@ describe Hbc::CLI::InternalStanza, :cask do }.to output("http://example.com/gpg-signature.asc\n").to_stdout end - it "raises an exception when stanza is invalid" do + it "raises an exception when stanza is unknown/unsupported" do expect { - described_class.new("invalid_stanza", "with-gpg") - }.to raise_error(/Illegal stanza/) + described_class.new("this_stanza_does_not_exist", "with-gpg") + }.to raise_error(/Unknown\/unsupported stanza/) end it "raises an exception when normal stanza is not present on cask" do @@ -37,6 +37,6 @@ describe Hbc::CLI::InternalStanza, :cask do command = described_class.new("artifacts", "with-gpg") expect { command.run - }.to output("{:app=>[[\"Caffeine.app\"]]}\n").to_stdout + }.to output(/Caffeine\.app/).to_stdout end end -- cgit v1.2.3 From fea5350d52de54eca9d6f30c67bd2fa008ca8328 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Mon, 23 Oct 2017 06:49:12 +0200 Subject: Add line break to string --- Library/Homebrew/test/cask/cli/internal_stanza_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index a020b33d4..47b0fd8b3 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -9,7 +9,7 @@ describe Hbc::CLI::InternalStanza, :cask do it "raises an exception when stanza is unknown/unsupported" do expect { described_class.new("this_stanza_does_not_exist", "with-gpg") - }.to raise_error(/Unknown\/unsupported stanza/) + }.to raise_error(%r{Unknown/unsupported stanza}) end it "raises an exception when normal stanza is not present on cask" do -- cgit v1.2.3