forked from bofh/fetsite
Upgraded to Rails 4
This commit is contained in:
@@ -14,7 +14,7 @@ module ViewMacros
|
||||
def login_fet_user
|
||||
before(:each) do
|
||||
@request.env["devise.mapping"] = Devise.mappings[:user]
|
||||
user = FactoryGirl.build(:user)
|
||||
user = FactoryBot.build(:user)
|
||||
user = User.find_by_email(user.email) || user
|
||||
user.save
|
||||
user.add_role(:fetuser)
|
||||
@@ -29,7 +29,7 @@ module ViewMacros
|
||||
def login_fetadmin_user
|
||||
before(:each) do
|
||||
@request.env["devise.mapping"] = Devise.mappings[:user]
|
||||
user = FactoryGirl.build(:user)
|
||||
user = FactoryBot.build(:user)
|
||||
user = User.find_by_email(user.email) || user
|
||||
user.save
|
||||
user.add_role(:fetadmin)
|
||||
|
||||
Reference in New Issue
Block a user