spec/factories/user.rb in enju_event-0.3.0 vs spec/factories/user.rb in enju_event-0.3.1

@@ -1,39 +1,39 @@
 FactoryBot.define do
   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|
     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|
     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