From c6c84925284f0da450b6ee9be0494b1de4be627a Mon Sep 17 00:00:00 2001 From: Cjay Date: Thu, 9 Jul 2015 01:59:34 +0800 Subject: [PATCH] Fix changes in spec/support --- spec/support/controller_macros.rb | 4 +++- spec/support/elasticsearch_helpers.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/support/controller_macros.rb b/spec/support/controller_macros.rb index eb5be2dd4..2e8162705 100644 --- a/spec/support/controller_macros.rb +++ b/spec/support/controller_macros.rb @@ -1,9 +1,11 @@ # Taken unashamedly from https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29 module ControllerMacros def login_member(member_factory=:member) + + let(:member) { member = FactoryGirl.create(member_factory || :member) } + before(:each) do @request.env["devise.mapping"] = Devise.mappings[:member] - member = FactoryGirl.create(member_factory || :member) sign_in member end end diff --git a/spec/support/elasticsearch_helpers.rb b/spec/support/elasticsearch_helpers.rb index 0d89eb33b..94cf447ff 100644 --- a/spec/support/elasticsearch_helpers.rb +++ b/spec/support/elasticsearch_helpers.rb @@ -10,7 +10,7 @@ end RSpec.configure do |config| config.include ElasticsearchHelpers - config.before(:each) do + config.before(:all) do if ENV['GROWSTUFF_ELASTICSEARCH'] == "true" Crop.__elasticsearch__.create_index! force: true end