From cd4b801749985930771d3472c9276c33d6fe6848 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 10 Jun 2014 18:04:48 -0500 Subject: [PATCH] Simplify test setup --- Library/Homebrew/test/Rakefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/test/Rakefile b/Library/Homebrew/test/Rakefile index eea45f85ea..6720cf2f50 100644 --- a/Library/Homebrew/test/Rakefile +++ b/Library/Homebrew/test/Rakefile @@ -1,13 +1,10 @@ require 'rake' require 'rake/testtask' -require 'pathname' -TEST_DIRECTORY = Pathname.new(File.expand_path(__FILE__)).parent.realpath -TEST_FILES = FileList["#{TEST_DIRECTORY}/test_*.rb"] +TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__)) +TEST_FILES = Dir["#{TEST_DIRECTORY}/test_*.rb"] GEM_DEPS = ['mocha'] -Dir.chdir(TEST_DIRECTORY) - task :default => :test task :deps do @@ -19,16 +16,16 @@ task :deps do end Rake::TestTask.new(:test) do |t| - t.libs << Dir.pwd + t.libs << TEST_DIRECTORY t.test_files = TEST_FILES end namespace :test do TEST_FILES.each do |file| - task = /test_(.+)\.rb/.match(file) - Rake::TestTask.new(task[1]) do |t| - t.libs << Dir.pwd - t.pattern = task[0] + name = file[/test_(.+)\.rb/, 1] + Rake::TestTask.new(name) do |t| + t.libs << TEST_DIRECTORY + t.test_files = [file] end end end