From 5c185eaa4355810ccc6617cb078ee67d4fa0777c Mon Sep 17 00:00:00 2001 From: Michael Ledin Date: Sun, 19 Feb 2017 07:57:41 +0300 Subject: Expand glob patterns. --- .../Homebrew/test/support/fixtures/cask/Casks/with-installable.rb | 5 +++-- .../test/support/fixtures/cask/Casks/with-uninstall-delete.rb | 5 +++-- .../test/support/fixtures/cask/Casks/with-uninstall-trash.rb | 5 +++-- Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb | 5 +++-- Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) (limited to 'Library/Homebrew/test/support') diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb index b0ad0c626..706b85f6b 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb @@ -11,8 +11,9 @@ cask 'with-installable' do quit: 'my.fancy.package.app', login_item: 'Fancy', delete: [ - '/permissible/absolute/path', - '~/permissible/path/with/tilde', + "#{TEST_TMPDIR}/absolute_path", + '~/path_with_tilde', + "#{TEST_TMPDIR}/glob_path*", 'impermissible/relative/path', '/another/impermissible/../relative/path', ], diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb index cba51f18f..c7d2e4767 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb @@ -8,8 +8,9 @@ cask 'with-uninstall-delete' do pkg 'Fancy.pkg' uninstall delete: [ - '/permissible/absolute/path', - '~/permissible/path/with/tilde', + "#{TEST_TMPDIR}/absolute_path", + '~/path_with_tilde', + "#{TEST_TMPDIR}/glob_path*", 'impermissible/relative/path', '/another/impermissible/../relative/path', ] diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb index 171780bb7..b085b3e32 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb @@ -8,8 +8,9 @@ cask 'with-uninstall-trash' do pkg 'Fancy.pkg' uninstall trash: [ - '/permissible/absolute/path', - '~/permissible/path/with/tilde', + "#{TEST_TMPDIR}/absolute_path", + '~/path_with_tilde', + "#{TEST_TMPDIR}/glob_path*", 'impermissible/relative/path', '/another/impermissible/../relative/path', ] diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb index a0ab83fc2..d81a387f9 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb @@ -8,8 +8,9 @@ cask 'with-zap-delete' do pkg 'Fancy.pkg' zap delete: [ - '/permissible/absolute/path', - '~/permissible/path/with/tilde', + "#{TEST_TMPDIR}/absolute_path", + '~/path_with_tilde', + "#{TEST_TMPDIR}/glob_path*", 'impermissible/relative/path', '/another/impermissible/../relative/path', ] diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb index 8f4e91d67..ea2bc2a01 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb @@ -8,8 +8,9 @@ cask 'with-zap-trash' do pkg 'Fancy.pkg' zap trash: [ - '/permissible/absolute/path', - '~/permissible/path/with/tilde', + "#{TEST_TMPDIR}/absolute_path", + '~/path_with_tilde', + "#{TEST_TMPDIR}/glob_path*", 'impermissible/relative/path', '/another/impermissible/../relative/path', ] -- cgit v1.2.3 From 92fe130cbb1faef375c6cb86bae02551882fd72d Mon Sep 17 00:00:00 2001 From: Michael Ledin Date: Sun, 19 Feb 2017 07:59:57 +0300 Subject: Use TEST_TMPDIR in rmdir tests. --- Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb | 2 +- .../Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb | 2 +- Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb | 2 +- Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore | 0 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore (limited to 'Library/Homebrew/test/support') diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb index 706b85f6b..8416f3f88 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb @@ -17,5 +17,5 @@ cask 'with-installable' do 'impermissible/relative/path', '/another/impermissible/../relative/path', ], - rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory" + rmdir: "#{TEST_TMPDIR}/empty_directory_path" end diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb index 252d81994..8ded5b835 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb @@ -7,5 +7,5 @@ cask 'with-uninstall-rmdir' do pkg 'MyFancyPkg/Fancy.pkg' - uninstall rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory" + uninstall rmdir: "#{TEST_TMPDIR}/empty_directory_path" end diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb index 02139b3b0..a67c4ca9a 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb @@ -7,5 +7,5 @@ cask 'with-zap-rmdir' do pkg 'MyFancyPkg/Fancy.pkg' - zap rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory" + zap rmdir: "#{TEST_TMPDIR}/empty_directory_path" end diff --git a/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore b/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3