diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index f66261d14b..ec38eb9292 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -134,7 +134,7 @@ class Tap sig { returns(T::Set[Tap]) } def self.allowed_taps - cache_key = "allowed_taps_#{Homebrew::EnvConfig.allowed_taps.to_s.gsub(" ", "_")}".to_sym + cache_key = :"allowed_taps_#{Homebrew::EnvConfig.allowed_taps.to_s.tr(" ", "_")}" cache[cache_key] ||= begin allowed_tap_list = Homebrew::EnvConfig.allowed_taps.to_s.split @@ -149,7 +149,7 @@ class Tap sig { returns(T::Set[Tap]) } def self.forbidden_taps - cache_key = "forbidden_taps_#{Homebrew::EnvConfig.forbidden_taps.to_s.gsub(" ", "_")}".to_sym + cache_key = :"forbidden_taps_#{Homebrew::EnvConfig.forbidden_taps.to_s.tr(" ", "_")}" cache[cache_key] ||= begin forbidden_tap_list = Homebrew::EnvConfig.forbidden_taps.to_s.split diff --git a/Library/Homebrew/test/cask/installer_spec.rb b/Library/Homebrew/test/cask/installer_spec.rb index b0e22b9b92..568d848909 100644 --- a/Library/Homebrew/test/cask/installer_spec.rb +++ b/Library/Homebrew/test/cask/installer_spec.rb @@ -327,8 +327,7 @@ RSpec.describe Cask::Installer, :cask do describe "#forbidden_tap_check" do before do - allow(Tap).to receive(:allowed_taps).and_return(allowed_taps_set) - allow(Tap).to receive(:forbidden_taps).and_return(forbidden_taps_set) + allow(Tap).to receive_messages(allowed_taps: allowed_taps_set, forbidden_taps: forbidden_taps_set) end let(:homebrew_forbidden) { Tap.fetch("homebrew/forbidden") } diff --git a/Library/Homebrew/test/formula_installer_spec.rb b/Library/Homebrew/test/formula_installer_spec.rb index d0878a3e3c..e2655cd0c5 100644 --- a/Library/Homebrew/test/formula_installer_spec.rb +++ b/Library/Homebrew/test/formula_installer_spec.rb @@ -259,8 +259,7 @@ RSpec.describe FormulaInstaller do describe "#forbidden_tap_check" do before do - allow(Tap).to receive(:allowed_taps).and_return(allowed_taps_set) - allow(Tap).to receive(:forbidden_taps).and_return(forbidden_taps_set) + allow(Tap).to receive_messages(allowed_taps: allowed_taps_set, forbidden_taps: forbidden_taps_set) end let(:homebrew_forbidden) { Tap.fetch("homebrew/forbidden") }