From 99b76360081ac92f75792ecea049b3dba496c659 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Sat, 7 Oct 2017 23:07:31 +0200 Subject: [PATCH] Fix 'brew style' issues --- .../cask/lib/hbc/cli/internal_stanza.rb | 2 +- .../test/cask/cli/internal_stanza_spec.rb | 27 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb b/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb index 411170010c..05d939a4b5 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb +++ b/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb @@ -71,7 +71,7 @@ module Hbc next end - if value == nil || (value.kind_of?(Array) && value.empty?) + if value.nil? || (value.is_a?(Array) && value.empty?) opoo "no such stanza '#{stanza}' on Cask '#{cask}'" unless quiet? puts "" raise ArgumentError, "no such stanza '#{stanza}' on Cask '#{cask}'" diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index 77b065567e..1599ca8437 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