andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Upgraded to Rails 4

Browse Source
This commit is contained in:
Andreas Stephanides
2019-02-24 15:47:27 +01:00
parent f52ec0411d
commit f809f36c06
86 changed files with 732 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/support/controller_macros.rb
View File

@@ -2,7 +2,7 @@ module ControllerMacros
# include Devise::TestHelpers, :type=>:controller
def with_fet_user
let(:fet_user) {FactoryGirl.create(:other_user, :fetuser)}
let(:fet_user) {FactoryBot.create(:other_user, :fetuser)}
before(:each) do
allow(@controller).to receive(:current_user).and_return(fet_user)
@@ -12,7 +12,7 @@ module ControllerMacros
def with_fet_admin
let(:fet_user)do
fet_user=FactoryGirl.create(:other_user)
fet_user=FactoryBot.create(:other_user)
fet_user.add_role("fetadmin")
fet_user
end
@@ -25,7 +25,7 @@ module ControllerMacros
def login_fet_user
before(:each) do
@request.env["devise.mapping"] = Devise.mappings[:user]
user = FactoryGirl.build(:other_user)
user = FactoryBot.build(:other_user)
user = User.find_by_email(user.email) || user
user.save
user.add_role(:fetuser)
@@ -36,7 +36,7 @@ module ControllerMacros
def login_user
before(:each) do
@request.env["devise.mapping"] = Devise.mappings[:user]
user = FactoryGirl.build(:other_user)
user = FactoryBot.build(:other_user)
user = User.find_by_email(user.email) || user
user.save
# user.confirm!