From 93ea8b6350f5979a84cd08c23d5f7ebb8767ce25 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 15 Jun 2021 20:35:21 -0700 Subject: [PATCH 1/2] Analytics spec: avoid ARM-specific strings --- Library/Homebrew/test/utils/analytics_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/test/utils/analytics_spec.rb b/Library/Homebrew/test/utils/analytics_spec.rb index df359a9f52..431d8a2448 100644 --- a/Library/Homebrew/test/utils/analytics_spec.rb +++ b/Library/Homebrew/test/utils/analytics_spec.rb @@ -12,6 +12,7 @@ describe Utils::Analytics do end it "returns OS_VERSION and prefix when HOMEBREW_PREFIX is a custom prefix" do + allow(Hardware::CPU).to receive(:type).and_return(:intel) allow(Homebrew).to receive(:default_prefix?).and_return(false) expect(described_class.os_arch_prefix_ci).to include("#{OS_VERSION}, #{described_class.custom_prefix_label}") end From 5d5fb944d2e252ba730ec8fc8b1b2cc686f694a2 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 15 Jun 2021 20:47:20 -0700 Subject: [PATCH 2/2] List spec: fix hardcoded library path --- Library/Homebrew/test/cask/cmd/list_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/test/cask/cmd/list_spec.rb b/Library/Homebrew/test/cask/cmd/list_spec.rb index 3ab174f02d..4d8f9a958b 100644 --- a/Library/Homebrew/test/cask/cmd/list_spec.rb +++ b/Library/Homebrew/test/cask/cmd/list_spec.rb @@ -97,7 +97,7 @@ describe Cask::Cmd::List, :cask do ], "desc": null, "homepage": "https://brew.sh/", - "url": "file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip", + "url": "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip", "appcast": null, "version": "1.2.3", "installed": "1.2.3", @@ -124,7 +124,7 @@ describe Cask::Cmd::List, :cask do ], "desc": "BitTorrent client", "homepage": "https://transmissionbt.com/", - "url": "file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg", + "url": "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg", "appcast": null, "version": "2.61", "installed": "2.61",