diff --git a/enju_inventory.gemspec b/enju_inventory.gemspec index a284b96..56ea275 100644 --- a/enju_inventory.gemspec +++ b/enju_inventory.gemspec @@ -16,9 +16,9 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/db/*.sqlite3"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids,default,development,test}/*"] - Dir["spec/dummy/tmp/*"] - Dir["spec/dummy/private/**/*"] - s.add_dependency "enju_biblio", "~> 0.3.0.beta.2" + s.add_dependency "enju_biblio", "~> 0.3.0.rc.1" - s.add_development_dependency "enju_leaf", "~> 1.3.0.beta.2" + s.add_development_dependency "enju_leaf", "~> 1.3.0.rc.1" s.add_development_dependency "sqlite3" s.add_development_dependency "mysql2" s.add_development_dependency "pg" diff --git a/lib/enju_inventory/version.rb b/lib/enju_inventory/version.rb index e5a1cca..87b8fa1 100644 --- a/lib/enju_inventory/version.rb +++ b/lib/enju_inventory/version.rb @@ -1,3 +1,3 @@ module EnjuInventory - VERSION = "0.3.0.beta.1" + VERSION = "0.3.0" end diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 54df5cb..ba99400 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -2,34 +2,40 @@ factory :admin, class: User do |f| f.sequence(:username){|n| "admin_#{n}"} f.sequence(:email){|n| "admin_#{n}@example.jp"} - f.role {Role.find_by_name('Administrator')} - f.password 'adminpassword' - f.password_confirmation 'adminpassword' - f.user_group {UserGroup.first} - f.required_role {Role.find_by_name('User')} - f.sequence(:user_number){|n| "user_number_#{n}"} + 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.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.role {Role.find_by_name('Librarian')} - f.password 'librarianpassword' - f.password_confirmation 'librarianpassword' - f.user_group {UserGroup.first} - f.required_role {Role.find_by_name('User')} - f.sequence(:user_number){|n| "user_number_#{n}"} + 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.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.role {Role.find_by_name('User')} - f.password 'userpassword' - f.password_confirmation 'userpassword' - f.user_group {UserGroup.first} - f.required_role {Role.find_by_name('User')} - f.sequence(:user_number){|n| "user_number_#{n}"} + 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.save + user.reload + end end factory :invalid_user, class: User do |f|