Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Oct 29, 2018
1 parent db4eb40 commit 038d249
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 21 deletions.
4 changes: 2 additions & 2 deletions enju_inventory.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/enju_inventory/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module EnjuInventory
VERSION = "0.3.0.beta.1"
VERSION = "0.3.0"
end
42 changes: 24 additions & 18 deletions spec/factories/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down

0 comments on commit 038d249

Please sign in to comment.