Upgraded to Rails 4

This commit is contained in:
2019-02-24 15:47:27 +01:00
parent f52ec0411d
commit f809f36c06
86 changed files with 732 additions and 662 deletions

View File

@@ -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)