From 44cf1041ac7ab412ecc4e98dadf61556b20503e5 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 11 Dec 2020 21:58:09 +0100 Subject: [PATCH] Fix tests. --- Library/Homebrew/cask/audit.rb | 2 +- Library/Homebrew/test/cask/audit_spec.rb | 32 +++++++++---------- Library/Homebrew/test/cask/cmd/cat_spec.rb | 4 +-- Library/Homebrew/test/cask/dsl_spec.rb | 4 +-- .../support/fixtures/cask/Casks/adobe-air.rb | 2 +- .../fixtures/cask/Casks/adobe-illustrator.rb | 2 +- .../support/fixtures/cask/Casks/basic-cask.rb | 2 +- .../fixtures/cask/Casks/no-dsl-version.rb | 2 +- .../fixtures/third-party/Casks/pharo.rb | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index 47226959bd..f0e39225a5 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -264,7 +264,7 @@ module Cask def check_sha256_no_check_if_unversioned return if cask.sha256 == :no_check - add_error "Use `sha256 :no_check` when URL is unversioned." if cask.url.unversioned? + add_error "Use `sha256 :no_check` when URL is unversioned." if cask.url&.unversioned? end def check_sha256_actually_256 diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb index 38a3630e32..ad50da4b00 100644 --- a/Library/Homebrew/test/cask/audit_spec.rb +++ b/Library/Homebrew/test/cask/audit_spec.rb @@ -232,14 +232,14 @@ describe Cask::Audit, :cask do let(:online) { false } let(:cask) do tmp_cask cask_token.to_s, <<~RUBY - cask '#{cask_token}' do - version '1.0' - sha256 '8dd95daa037ac02455435446ec7bc737b34567afe9156af7d20b2a83805c1d8a' - url "https://brew.sh/" - name 'Audit' - desc 'Cask for testing tokens' - homepage 'https://brew.sh/' - app 'Audit.app' + cask "#{cask_token}" do + version "1.0" + sha256 "8dd95daa037ac02455435446ec7bc737b34567afe9156af7d20b2a83805c1d8a" + url "https://brew.sh/v\#{version}.zip" + name "Audit" + desc "Cask for testing tokens" + homepage "https://brew.sh/" + app "Audit.app" end RUBY end @@ -877,14 +877,14 @@ describe Cask::Audit, :cask do let(:cask_token) { "with-description" } let(:cask) do tmp_cask cask_token.to_s, <<~RUBY - cask '#{cask_token}' do - version '1.0' - sha256 '8dd95daa037ac02455435446ec7bc737b34567afe9156af7d20b2a83805c1d8a' - url "https://brew.sh/" - name 'Audit' - desc 'Cask Auditor' - homepage 'https://brew.sh/' - app 'Audit.app' + cask "#{cask_token}" do + version "1.0" + sha256 "8dd95daa037ac02455435446ec7bc737b34567afe9156af7d20b2a83805c1d8a" + url "https://brew.sh/\#{version}.zip" + name "Audit" + desc "Cask Auditor" + homepage "https://brew.sh/" + app "Audit.app" end RUBY end diff --git a/Library/Homebrew/test/cask/cmd/cat_spec.rb b/Library/Homebrew/test/cask/cmd/cat_spec.rb index 6fab5cc170..ac28d70762 100644 --- a/Library/Homebrew/test/cask/cmd/cat_spec.rb +++ b/Library/Homebrew/test/cask/cmd/cat_spec.rb @@ -10,12 +10,12 @@ describe Cask::Cmd::Cat, :cask do describe "given a basic Cask" do let(:basic_cask_content) { - <<~RUBY + <<~'RUBY' cask "basic-cask" do version "1.2.3" sha256 "8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b" - url "https://brew.sh/TestCask.dmg" + url "https://brew.sh/TestCask-#{version}.dmg" name "Basic Cask" desc "Cask for testing basic functionality" homepage "https://brew.sh/" diff --git a/Library/Homebrew/test/cask/dsl_spec.rb b/Library/Homebrew/test/cask/dsl_spec.rb index 43f7dea992..2146621def 100644 --- a/Library/Homebrew/test/cask/dsl_spec.rb +++ b/Library/Homebrew/test/cask/dsl_spec.rb @@ -7,7 +7,7 @@ describe Cask::DSL, :cask do context "stanzas" do it "lets you set url, homepage, and version" do - expect(cask.url.to_s).to eq("https://brew.sh/TestCask.dmg") + expect(cask.url.to_s).to eq("https://brew.sh/TestCask-1.2.3.dmg") expect(cask.homepage).to eq("https://brew.sh/") expect(cask.version.to_s).to eq("1.2.3") end @@ -66,7 +66,7 @@ describe Cask::DSL, :cask do it "does not require a DSL version in the header" do expect(cask.token).to eq("no-dsl-version") - expect(cask.url.to_s).to eq("https://brew.sh/TestCask.dmg") + expect(cask.url.to_s).to eq("https://brew.sh/TestCask-1.2.3.dmg") expect(cask.homepage).to eq("https://brew.sh/") expect(cask.version.to_s).to eq("1.2.3") end diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-air.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-air.rb index 770817c5e4..7d2dcf3c23 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-air.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-air.rb @@ -2,7 +2,7 @@ cask "adobe-air" do version "1.2.3" sha256 "8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b" - url "https://brew.sh/TestCask.dmg" + url "https://brew.sh/TestCask-#{version}.dmg" name "Adobe AIR" desc "Cross-platform application runtime" homepage "https://brew.sh/" diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-illustrator.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-illustrator.rb index 982540f469..8cedf957f4 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-illustrator.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/adobe-illustrator.rb @@ -2,7 +2,7 @@ cask "adobe-illustrator" do version "1.2.3" sha256 "8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b" - url "https://brew.sh/TestCask.dmg" + url "https://brew.sh/TestCask-#{version}.dmg" name "Adobe Illustrator" homepage "https://brew.sh/" diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/basic-cask.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/basic-cask.rb index 36b7d02b27..56f8f27224 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/basic-cask.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/basic-cask.rb @@ -2,7 +2,7 @@ cask "basic-cask" do version "1.2.3" sha256 "8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b" - url "https://brew.sh/TestCask.dmg" + url "https://brew.sh/TestCask-#{version}.dmg" name "Basic Cask" desc "Cask for testing basic functionality" homepage "https://brew.sh/" diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/no-dsl-version.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/no-dsl-version.rb index 26a5e2f66e..e45bf760cc 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/no-dsl-version.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/no-dsl-version.rb @@ -2,7 +2,7 @@ cask "no-dsl-version" do version "1.2.3" sha256 "8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b" - url "https://brew.sh/TestCask.dmg" + url "https://brew.sh/TestCask-#{version}.dmg" homepage "https://brew.sh/" app "TestCask.app" diff --git a/Library/Homebrew/test/support/fixtures/third-party/Casks/pharo.rb b/Library/Homebrew/test/support/fixtures/third-party/Casks/pharo.rb index c37f700e92..0c16f1e8be 100644 --- a/Library/Homebrew/test/support/fixtures/third-party/Casks/pharo.rb +++ b/Library/Homebrew/test/support/fixtures/third-party/Casks/pharo.rb @@ -2,7 +2,7 @@ cask "pharo" do version "1.2.3" sha256 "8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b" - url "https://brew.sh/ThirdParty.dmg" + url "https://brew.sh/ThirdParty-#{version}.dmg" name "Pharo" desc "Cask from a third-party tap" homepage "https://brew.sh/"