Download as
Browse Code »

Commit 2e18fad81995a02d28e3a3b3e0cfe60839d98330

Authored by Rafael Martins
1 parent 9b251ccc
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

Fix to start/stop Solr with cucumber

Showing 2 changed files with 10 additions and 2 deletions   Show diff stats
features/support/env.rb
  Diff comments   View file @2e18fad
@@ -5,6 +5,14 @@ @@ -5,6 +5,14 @@
5 5
6 # Sets up the Rails environment for Cucumber 6 # Sets up the Rails environment for Cucumber
7 ENV["RAILS_ENV"] ||= "cucumber" 7 ENV["RAILS_ENV"] ||= "cucumber"
  8 +
  9 +# Start/stop Solr
  10 +if not $cucumber_env_loaded
  11 + abort unless system 'rake solr:start'
  12 + at_exit { system 'rake solr:stop' }
  13 + $cucumber_env_loaded = true
  14 +end
  15 +
8 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') 16 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
9 require 'cucumber/rails/world' 17 require 'cucumber/rails/world'
10 18
test/test_helper.rb
  Diff comments   View file @2e18fad
1 ENV["RAILS_ENV"] = "test" 1 ENV["RAILS_ENV"] = "test"
2 2
3 # Start/stop Solr 3 # Start/stop Solr
4 -if not $loaded 4 +if not $test_helper_loaded
5 abort unless system 'rake solr:start' 5 abort unless system 'rake solr:start'
6 at_exit { system 'rake solr:stop' } 6 at_exit { system 'rake solr:stop' }
7 - $loaded = true 7 + $test_helper_loaded = true
8 end 8 end
9 9
10 require File.expand_path(File.dirname(__FILE__) + "/../config/environment") 10 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")