Download as
Browse Code »

Commit 14b985eac8ccce6e09887a20907e2bfa3ccc1272

Authored by Rafael Martins
1 parent 58c3792d
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Only override env. variable in test context

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