From 14b985eac8ccce6e09887a20907e2bfa3ccc1272 Mon Sep 17 00:00:00 2001 From: Rafael Martins Date: Wed, 14 Mar 2012 10:03:52 -0300 Subject: [PATCH] Only override env. variable in test context --- lib/tasks/test.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index f84bbed..d6efe97 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -20,9 +20,9 @@ namespace :test do TestTasks.each do |test_task| orig_name = test_task.to_s test_task = test_task.to_s.gsub(/^test:/, '').to_sym #remove namespace :test - ENV['RAILS_ENV'] = 'test' # force the solr tasks to run with each individual test task override_task test_task do + ENV['RAILS_ENV'] = 'test' Rake::Task['solr:start'].reenable Rake::Task['solr:start'].invoke Rake::Task["#{orig_name}:original"].invoke @@ -32,8 +32,8 @@ namespace :test do end end (CucumberTasks + NoosferoTasks).each do |test_task| - ENV['RAILS_ENV'] = 'test' override_task test_task do + ENV['RAILS_ENV'] = 'test' Rake::Task['solr:start'].reenable Rake::Task['solr:start'].invoke Rake::Task["#{test_task}:original"].invoke @@ -43,9 +43,9 @@ end end task :test do - ENV['RAILS_ENV'] = 'test' errors = AllTasks.collect do |task| begin + ENV['RAILS_ENV'] = 'test' Rake::Task[task].invoke nil rescue => e -- libgit2 0.21.2