From e6801b9c3250e47543648a59b8ea69ff5f5d85af Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 16 Dec 2015 14:09:04 -0300 Subject: [PATCH] cucumber: set rails_env to cucumber instead of test --- features/support/env.rb | 2 +- lib/noosfero/plugin.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/support/env.rb b/features/support/env.rb index d9dc355..db70813 100644 --- 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' diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb index e742361..fcf8e73 100644 --- 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 -- libgit2 0.21.2