From 3633384036fd28332a8fb4a6a9ab4e526f4b0c80 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Sat, 1 Feb 2014 12:47:05 -0500 Subject: [PATCH] add HOMEBREW_TAP_FORMULA_REGEX constant in tests because our code tries to use it when throwing exceptions also move HOMEBREW_BREW_FILE from doctor_test.rb to test_helper.rb --- test/cask/cli/doctor_test.rb | 2 -- test/test_helper.rb | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/cask/cli/doctor_test.rb b/test/cask/cli/doctor_test.rb index 26719d6b4a..e193edc7b0 100644 --- a/test/cask/cli/doctor_test.rb +++ b/test/cask/cli/doctor_test.rb @@ -1,8 +1,6 @@ require 'test_helper' require 'cask/version' -HOMEBREW_BREW_FILE = '/usr/local/bin/brew' - describe Cask::CLI::Doctor do it 'displays some nice info about the environment' do out, err = capture_io do diff --git a/test/test_helper.rb b/test/test_helper.rb index 8ed5f3f22a..26389a38b0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,9 @@ require 'bundler' require 'bundler/setup' +# set some Homebrew constants used in our code +HOMEBREW_TAP_FORMULA_REGEX = %r{^(\w+)/(\w+)/([^/]+)$} +HOMEBREW_BREW_FILE = '/usr/local/bin/brew' # add cask lib to load path brew_cask_path = Pathname.new(File.expand_path(__FILE__+'/../../'))