Commit 14b985eac8ccce6e09887a20907e2bfa3ccc1272
1 parent
58c3792d
Exists in
master
and in
28 other branches
Only override env. variable in test context
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
lib/tasks/test.rake
... | ... | @@ -20,9 +20,9 @@ namespace :test do |
20 | 20 | TestTasks.each do |test_task| |
21 | 21 | orig_name = test_task.to_s |
22 | 22 | test_task = test_task.to_s.gsub(/^test:/, '').to_sym #remove namespace :test |
23 | - ENV['RAILS_ENV'] = 'test' | |
24 | 23 | # force the solr tasks to run with each individual test task |
25 | 24 | override_task test_task do |
25 | + ENV['RAILS_ENV'] = 'test' | |
26 | 26 | Rake::Task['solr:start'].reenable |
27 | 27 | Rake::Task['solr:start'].invoke |
28 | 28 | Rake::Task["#{orig_name}:original"].invoke |
... | ... | @@ -32,8 +32,8 @@ namespace :test do |
32 | 32 | end |
33 | 33 | end |
34 | 34 | (CucumberTasks + NoosferoTasks).each do |test_task| |
35 | - ENV['RAILS_ENV'] = 'test' | |
36 | 35 | override_task test_task do |
36 | + ENV['RAILS_ENV'] = 'test' | |
37 | 37 | Rake::Task['solr:start'].reenable |
38 | 38 | Rake::Task['solr:start'].invoke |
39 | 39 | Rake::Task["#{test_task}:original"].invoke |
... | ... | @@ -43,9 +43,9 @@ end |
43 | 43 | end |
44 | 44 | |
45 | 45 | task :test do |
46 | - ENV['RAILS_ENV'] = 'test' | |
47 | 46 | errors = AllTasks.collect do |task| |
48 | 47 | begin |
48 | + ENV['RAILS_ENV'] = 'test' | |
49 | 49 | Rake::Task[task].invoke |
50 | 50 | nil |
51 | 51 | rescue => e | ... | ... |