From b9c9f0f6872fc3e83e4987559ee3b3c5fa2509a5 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 5 Mar 2017 05:30:45 +0100 Subject: [PATCH] Move Cask test helpers to `test/support`. --- Library/Homebrew/cask/spec/spec_helper.rb | 6 ++++-- .../support/helper/cask}/fake_system_command.rb | 0 .../support => test/support/helper/cask}/install_helper.rb | 0 .../support/helper/cask}/never_sudo_system_command.rb | 0 4 files changed, 4 insertions(+), 2 deletions(-) rename Library/Homebrew/{cask/spec/support => test/support/helper/cask}/fake_system_command.rb (100%) rename Library/Homebrew/{cask/spec/support => test/support/helper/cask}/install_helper.rb (100%) rename Library/Homebrew/{cask/spec/support => test/support/helper/cask}/never_sudo_system_command.rb (100%) diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb index ca0b69d33d..0b3a120cac 100644 --- a/Library/Homebrew/cask/spec/spec_helper.rb +++ b/Library/Homebrew/cask/spec/spec_helper.rb @@ -4,10 +4,12 @@ require "test/spec_helper" # add Homebrew-Cask to load path $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s) -Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "**", "*.rb")).each(&method(:require)) - require "hbc" +require "test/support/helper/cask/fake_system_command" +require "test/support/helper/cask/install_helper" +require "test/support/helper/cask/never_sudo_system_command" + HOMEBREW_CASK_DIRS = [ :appdir, :caskroom, diff --git a/Library/Homebrew/cask/spec/support/fake_system_command.rb b/Library/Homebrew/test/support/helper/cask/fake_system_command.rb similarity index 100% rename from Library/Homebrew/cask/spec/support/fake_system_command.rb rename to Library/Homebrew/test/support/helper/cask/fake_system_command.rb diff --git a/Library/Homebrew/cask/spec/support/install_helper.rb b/Library/Homebrew/test/support/helper/cask/install_helper.rb similarity index 100% rename from Library/Homebrew/cask/spec/support/install_helper.rb rename to Library/Homebrew/test/support/helper/cask/install_helper.rb diff --git a/Library/Homebrew/cask/spec/support/never_sudo_system_command.rb b/Library/Homebrew/test/support/helper/cask/never_sudo_system_command.rb similarity index 100% rename from Library/Homebrew/cask/spec/support/never_sudo_system_command.rb rename to Library/Homebrew/test/support/helper/cask/never_sudo_system_command.rb