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

Remove ABS__FILE constant from test environment

Browse Source
This commit is contained in:
Jack Nagel 2014-06-10 21:45:10 -05:00
parent 9a0098dbec
commit dbe82909a3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/test/test_updater.rb
View File

@ -38,11 +38,7 @@ class UpdaterTests < Test::Unit::TestCase
end end
def self.fixture_data def self.fixture_data
@fixture_data ||= load_fixture_data @fixture_data ||= YAML.load_file("#{TEST_FOLDER}/fixtures/updater_fixture.yaml")
end
def self.load_fixture_data
YAML.load_file(Pathname.new(ABS__FILE__).parent.realpath + 'fixtures/updater_fixture.yaml')
end end
def setup def setup

3
Library/Homebrew/test/testing_env.rb
View File

@ -1,6 +1,5 @@
# Require this file to build a testing environment. # Require this file to build a testing environment.
ABS__FILE__ = File.expand_path(__FILE__)
$:.push(File.expand_path(__FILE__+'/../..')) $:.push(File.expand_path(__FILE__+'/../..'))
require 'extend/module' require 'extend/module'
@ -55,7 +54,7 @@ end
at_exit { HOMEBREW_PREFIX.parent.rmtree } at_exit { HOMEBREW_PREFIX.parent.rmtree }
# Test fixtures and files can be found relative to this path # Test fixtures and files can be found relative to this path
TEST_FOLDER = Pathname.new(ABS__FILE__).parent.realpath TEST_FOLDER = File.dirname(File.expand_path(__FILE__))
def shutup def shutup
if ARGV.verbose? if ARGV.verbose?