From d371547d5a04dbe0a6a496b1636add688797e46a Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Wed, 12 Jan 2022 10:39:38 +1100 Subject: [PATCH] fix tests --- .../cask/url_legacy_comma_separators.rb | 2 +- .../cask/url_legacy_comma_separators_spec.rb | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Library/Homebrew/rubocops/cask/url_legacy_comma_separators.rb b/Library/Homebrew/rubocops/cask/url_legacy_comma_separators.rb index 5425999f20..7dadc4bd07 100644 --- a/Library/Homebrew/rubocops/cask/url_legacy_comma_separators.rb +++ b/Library/Homebrew/rubocops/cask/url_legacy_comma_separators.rb @@ -13,7 +13,7 @@ module RuboCop extend AutoCorrector MSG_CSV = "Use 'version.csv.first' instead of 'version.before_comma' " \ - "and 'version.csv.second' instead of 'version.after_comma'." + "and 'version.csv.second' instead of 'version.after_comma'" def on_url_stanza(stanza) return if stanza.stanza_node.type == :block diff --git a/Library/Homebrew/test/rubocops/cask/url_legacy_comma_separators_spec.rb b/Library/Homebrew/test/rubocops/cask/url_legacy_comma_separators_spec.rb index 8a4606f1a5..9573f927a4 100644 --- a/Library/Homebrew/test/rubocops/cask/url_legacy_comma_separators_spec.rb +++ b/Library/Homebrew/test/rubocops/cask/url_legacy_comma_separators_spec.rb @@ -14,7 +14,7 @@ describe RuboCop::Cop::Cask::UrlLegacyCommaSeparators do <<-CASK.undent cask 'foo' do version '1.1' - url 'https://foo.brew.sh/foo-#{version}.dmg' + url 'https://foo.brew.sh/foo-\#{version}.dmg' end CASK end @@ -27,7 +27,7 @@ describe RuboCop::Cop::Cask::UrlLegacyCommaSeparators do <<-CASK.undent cask 'foo' do version '1.1,111' - url 'https://foo.brew.sh/foo-#{version.csv.first}.dmg' + url 'https://foo.brew.sh/foo-\#{version.csv.first}.dmg' end CASK end @@ -40,7 +40,7 @@ describe RuboCop::Cop::Cask::UrlLegacyCommaSeparators do <<-CASK.undent cask 'foo' do version '1.1,111' - url 'https://foo.brew.sh/foo-#{version.before_comma}.dmg' + url 'https://foo.brew.sh/foo-\#{version.before_comma}.dmg' end CASK end @@ -48,18 +48,18 @@ describe RuboCop::Cop::Cask::UrlLegacyCommaSeparators do <<-CASK.undent cask 'foo' do version '1.1,111' - url 'https://foo.brew.sh/foo-#{version.csv.first}.dmg' + url 'https://foo.brew.sh/foo-\#{version.csv.first}.dmg' end CASK end let(:expected_offenses) do [{ - message: "'https://foo.brew.sh/foo-#{version.before_comma}.dmg' should use "\ - "#{version.csv.first} instead of #{version.before_comma}.'", + message: "Use 'version.csv.first' instead of 'version.before_comma' "\ + "and 'version.csv.second' instead of 'version.after_comma'", severity: :convention, - line: 2, - column: 11, - source: "'https://foo.brew.sh/foo-#{version.before_comma}.dmg'", + line: 3, + column: 6, + source: "'https://foo.brew.sh/foo-\#{version.before_comma}.dmg'", }] end @@ -73,7 +73,7 @@ describe RuboCop::Cop::Cask::UrlLegacyCommaSeparators do <<-CASK.undent cask 'foo' do version '1.1,111' - url 'https://foo.brew.sh/foo-#{version.after_comma}.dmg' + url 'https://foo.brew.sh/foo-\#{version.after_comma}.dmg' end CASK end @@ -81,18 +81,18 @@ describe RuboCop::Cop::Cask::UrlLegacyCommaSeparators do <<-CASK.undent cask 'foo' do version '1.1,111' - url 'https://foo.brew.sh/foo-#{version.csv.second}.dmg' + url 'https://foo.brew.sh/foo-\#{version.csv.second}.dmg' end CASK end let(:expected_offenses) do [{ - message: "'https://foo.brew.sh/foo-#{version.after_comma}.dmg' should use "\ - "#{version.csv.second} instead of #{version.after_comma}.'", + message: "Use 'version.csv.first' instead of 'version.before_comma' "\ + "and 'version.csv.second' instead of 'version.after_comma'", severity: :convention, - line: 2, - column: 11, - source: "'https://foo.brew.sh/foo-#{version.after_comma}.dmg'", + line: 3, + column: 6, + source: "'https://foo.brew.sh/foo-\#{version.after_comma}.dmg'", }] end