admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix flaw in Cask test helper

Browse Source 
This commit fixes a flaw in the Cask test helper, causing the broken `Cask::Config` test to actually fail.

The flaw occurred while patching the `Cask::Config::DEFAULT_DIRS` hash.
While the original hash uses strings as values, the patched one used
`Pathname` values, masking a broken `Cask::Config::from_json` test.

Now the broken test fails like it should.
This commit is contained in:
Claudia 2020-04-27 15:04:54 +02:00
parent cad8be3278
commit c85df70757
No known key found for this signature in database
GPG Key ID: 246AC3C0F10BE51F
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
View File

@ -10,7 +10,7 @@ module Cask
class Config class Config
remove_const :DEFAULT_DIRS remove_const :DEFAULT_DIRS
DEFAULT_DIRS = { DEFAULT_DIRS_PATHNAMES = {
appdir: Pathname(TEST_TMPDIR)/"cask-appdir", appdir: Pathname(TEST_TMPDIR)/"cask-appdir",
prefpanedir: Pathname(TEST_TMPDIR)/"cask-prefpanedir", prefpanedir: Pathname(TEST_TMPDIR)/"cask-prefpanedir",
qlplugindir: Pathname(TEST_TMPDIR)/"cask-qlplugindir", qlplugindir: Pathname(TEST_TMPDIR)/"cask-qlplugindir",
@ -26,6 +26,8 @@ module Cask
vst3_plugindir: Pathname(TEST_TMPDIR)/"cask-vst3_plugindir", vst3_plugindir: Pathname(TEST_TMPDIR)/"cask-vst3_plugindir",
screen_saverdir: Pathname(TEST_TMPDIR)/"cask-screen_saverdir", screen_saverdir: Pathname(TEST_TMPDIR)/"cask-screen_saverdir",
}.freeze }.freeze
DEFAULT_DIRS = DEFAULT_DIRS_PATHNAMES.transform_values(&:to_s).freeze
end end
end end
@ -34,7 +36,7 @@ RSpec.shared_context "Homebrew Cask", :needs_macos do
third_party_tap = Tap.fetch("third-party", "tap") third_party_tap = Tap.fetch("third-party", "tap")
begin begin
Cask::Config::DEFAULT_DIRS.values.each(&:mkpath) Cask::Config::DEFAULT_DIRS_PATHNAMES.values.each(&:mkpath)
Cask::Config.global.binarydir.mkpath Cask::Config.global.binarydir.mkpath
Tap.default_cask_tap.tap do |tap| Tap.default_cask_tap.tap do |tap|