From f03336bb4077f5dd0c71f44088ed29ec638749e4 Mon Sep 17 00:00:00 2001 From: William Ma Date: Thu, 25 Jun 2020 09:13:02 -0400 Subject: [PATCH] uninstall: Clean up cask-appdir after tests --- Library/Homebrew/test/cmd/uninstall_spec.rb | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/test/cmd/uninstall_spec.rb b/Library/Homebrew/test/cmd/uninstall_spec.rb index 247f1df374..9d0e5590d7 100644 --- a/Library/Homebrew/test/cmd/uninstall_spec.rb +++ b/Library/Homebrew/test/cmd/uninstall_spec.rb @@ -29,14 +29,7 @@ describe "brew uninstall", :integration_test do expect(caffeine).not_to be_installed - # expect TEST_TMPDIR/cask-appdir to exist and be empty, then delete it - expect( - Find.find(TEST_TMPDIR) - .reject { |f| File.basename(f) == ".DS_Store" } - .filter { |f| File.path(f).start_with?("#{TEST_TMPDIR}/cask-appdir") }, - ).to eq(["#{TEST_TMPDIR}/cask-appdir"]) - - rm_r "#{TEST_TMPDIR}/cask-appdir" + rm_r(TEST_TMPDIR + "/cask-appdir") end it "uninstalls given Formulae and Casks" do @@ -55,14 +48,7 @@ describe "brew uninstall", :integration_test do expect(caffeine).not_to be_installed - # expect TEST_TMPDIR/cask-appdir to exist and be empty, then delete it - expect( - Find.find(TEST_TMPDIR) - .reject { |f| File.basename(f) == ".DS_Store" } - .filter { |f| File.path(f).start_with?("#{TEST_TMPDIR}/cask-appdir") }, - ).to eq(["#{TEST_TMPDIR}/cask-appdir"]) - - rm_r "#{TEST_TMPDIR}/cask-appdir" + rm_r(TEST_TMPDIR + "/cask-appdir") end end