Download as
Browse Code »

Commit e6801b9c3250e47543648a59b8ea69ff5f5d85af

Authored by Rodrigo Souto
1 parent f79ff688
Exists in master and in 18 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements

cucumber: set rails_env to cucumber instead of test

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
features/support/env.rb
  Diff comments   View file @e6801b9
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 # instead of editing this one. Cucumber will automatically load all features/**/*.rb 4 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
5 # files. 5 # files.
6 6
7 -ENV["RAILS_ENV"] ||= "test" 7 +ENV["RAILS_ENV"] ||= "cucumber"
8 8
9 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') 9 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
10 require 'cucumber/rails' 10 require 'cucumber/rails'
lib/noosfero/plugin.rb
  Diff comments   View file @e6801b9
@@ -157,7 +157,7 @@ class Noosfero::Plugin @@ -157,7 +157,7 @@ class Noosfero::Plugin
157 unless @available_plugins 157 unless @available_plugins
158 path = File.join(Rails.root, '{baseplugins,config/plugins}', '*') 158 path = File.join(Rails.root, '{baseplugins,config/plugins}', '*')
159 @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) } 159 @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) }
160 - if Rails.env.test? && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo')) 160 + if (Rails.env.test? || Rails.env.cucumber?) && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
161 @available_plugins << File.join(Rails.root, 'plugins', 'foo') 161 @available_plugins << File.join(Rails.root, 'plugins', 'foo')
162 end 162 end
163 end 163 end