Merge fc94af9 into 5166b95

spec/controllers/events_controller_spec.rb

@@ -586,10 +586,4 @@
       expect(page_analysis.pages.size).to be >= 3
     end
   end
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end

spec/features/email_spec.rb

@@ -97,11 +97,4 @@
     expect(page.find('#email_subject').value).to eq(@template.subject)
     expect(page.find('#email_content').value).to eq(@template.content)
   end
-
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end

spec/features/event_draft_spec.rb

@@ -65,10 +65,4 @@
     visit events_path
     expect(page).to_not have_text(@event.name)
   end
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end

spec/features/events_spec.rb

@@ -440,10 +440,4 @@
     expect(page).to have_every_text(not_accepted_names)
     expect(page).to have_no_text(accepted_names)
   end
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end

spec/features/participants_spec.rb

@@ -77,12 +77,6 @@
     expect(page.body).to contain_ordered(expected_order.reverse)
 
   end
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end
 
 RSpec.feature "Event participants overview", :type => :feature do
@@ -123,10 +117,4 @@ def login(role)
     expect{click_button I18n.t('emails.email_form.send')}.to change{ActionMailer::Base.deliveries.count}.by(0)
     expect(page).to have_text(I18n.t('emails.submit.sending_failed'))
   end
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end

spec/features/user_spec.rb

@@ -213,10 +213,4 @@
     expect(page).to have_text(max2.profile.last_name)
     expect(page).to_not have_text(user3.profile.last_name)
   end
-
-  def login(role)
-    @profile = FactoryGirl.create(:profile)
-    @profile.user.role = role
-    login_as(@profile.user, :scope => :user)
-  end
 end

spec/rails_helper.rb

@@ -51,6 +51,7 @@
   config.include Warden::Test::Helpers
   config.include Devise::Test::ControllerHelpers, :type => :controller
   config.include Devise::Test::ControllerHelpers, :type => :view
+  config.include LoginMacros, type: :feature
 
   # Reset warden after each test
   config.after :each do

spec/spec_helper.rb

@@ -29,8 +29,8 @@
   # Skip PhantomJS tests if PhantomJS is not installed.
   config.filter_run_excluding :js => (not Cliver::detect('phantomjs'))
 
-  # load custom matchers
-  Dir[File.dirname(__FILE__) + "/support/matchers/*.rb"].each {|f| require f}
+  # load custom matchers and helpers
+  Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
   # Use color not only in STDOUT but also in pagers and files
   # config.tty = true

spec/support/login_macros.rb

@@ -0,0 +1,7 @@
+module LoginMacros
+  def login(role)
+    @profile = FactoryGirl.create(:profile)
+    @profile.user.role = role
+    login_as(@profile.user, :scope => :user)
+  end
+end