[Git][noosfero/noosfero][master] cucumber: set rails_env to cucumber instead of test

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
e6801b9c by Rodrigo Souto at 2015-12-16T14:09:04Z
cucumber: set rails_env to cucumber instead of test

- - - - -


2 changed files:

- features/support/env.rb
- lib/noosfero/plugin.rb


Changes:

=====================================
features/support/env.rb
=====================================
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -4,7 +4,7 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ENV"] ||= "test"
+ENV["RAILS_ENV"] ||= "cucumber"
 
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails'


=====================================
lib/noosfero/plugin.rb
=====================================
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -157,7 +157,7 @@ class Noosfero::Plugin
       unless @available_plugins
         path = File.join(Rails.root, '{baseplugins,config/plugins}', '*')
         @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) }
-        if Rails.env.test? && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
+        if (Rails.env.test? || Rails.env.cucumber?) && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
           @available_plugins << File.join(Rails.root, 'plugins', 'foo')
         end
       end



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/e6801b9c3250e47543648a59b8ea69ff5f5d85af
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151216/6e8cade5/attachment-0001.html>