AutoCommit Mon Aug 31 14:03:19 CEST 2015

2015-08-31 14:03:19 +02:00
parent cec9939144
commit f61231accc
4 changed files with 38 additions and 12 deletions
--- a/spec/support/controller_macros.rb
+++ b/spec/support/controller_macros.rb
@@ -1,13 +1,13 @@
 module ControllerMacros
-  include Devise::TestHelpers
+#  include Devise::TestHelpers, :type=>:controller
  def login_fet_user
    before(:each) do
      @request.env["devise.mapping"] = Devise.mappings[:user]
      user = FactoryGirl.build(:user)
      user = User.find_by_email(user.email) || user
-      user.add_role(:fetuser)
-      user.confirm! 
      user.save
+      user.add_role(:fetuser)
+     # user.confirm! 
      sign_in user
    end
  end