Skip to content

Commit

Permalink
update factory files
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Oct 29, 2018
1 parent fe9e396 commit d742ebd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions spec/factories/bookmark_stat.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :bookmark_stat do |f|
f.start_date 1.week.ago
f.end_date 1.day.ago
f.start_date { 1.week.ago }
f.end_date { 1.day.ago }
end
end
4 changes: 2 additions & 2 deletions spec/factories/profile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
f.user_group_id {UserGroup.first.id}
f.required_role_id {Role.where(name: 'User').first.id}
f.sequence(:user_number){|n| "user_number_#{n}"}
f.library_id 2
f.locale "ja"
f.library_id { 2 }
f.locale { 'ja' }
f.user_id {FactoryBot.create(:user).id}
end
end
26 changes: 13 additions & 13 deletions spec/factories/user.rb
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
FactoryBot.define do
factory :admin, :class => User do |f|
factory :admin, class: User do |f|
f.sequence(:username){|n| "admin_#{n}"}
f.sequence(:email){|n| "admin_#{n}@example.jp"}
f.password 'adminpassword'
f.password_confirmation 'adminpassword'
f.password { 'adminpassword' }
f.password_confirmation { 'adminpassword' }
f.after(:create) do |user|
user_has_role = UserHasRole.new
user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Administrator').id})
user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Administrator').id})
user_has_role.save
user.reload
end
end

factory :librarian, :class => User do |f|
factory :librarian, class: User do |f|
f.sequence(:username){|n| "librarian_#{n}"}
f.sequence(:email){|n| "librarian_#{n}@example.jp"}
f.password 'librarianpassword'
f.password_confirmation 'librarianpassword'
f.password { 'librarianpassword' }
f.password_confirmation { 'librarianpassword' }
f.after(:create) do |user|
user_has_role = UserHasRole.new
user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Librarian').id})
user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Librarian').id})
user_has_role.save
user.reload
end
end

factory :user, :class => User do |f|
factory :user, class: User do |f|
f.sequence(:username){|n| "user_#{n}"}
f.sequence(:email){|n| "user_#{n}@example.jp"}
f.password 'userpassword'
f.password_confirmation 'userpassword'
f.password { 'userpassword' }
f.password_confirmation { 'userpassword' }
f.after(:create) do |user|
user_has_role = UserHasRole.new
user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('User').id})
user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'User').id})
user_has_role.save
user.reload
end
end

factory :invalid_user, :class => User do |f|
factory :invalid_user, class: User do |f|
end
end

0 comments on commit d742ebd

Please sign in to comment.