enju_seed 0.2.3 → 0.3.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (209) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +17 -8
  3. data/app/assets/config/enju_seed_manifest.js +0 -0
  4. data/app/controllers/my_accounts_controller.rb +14 -13
  5. data/app/controllers/profiles_controller.rb +30 -29
  6. data/app/controllers/roles_controller.rb +2 -1
  7. data/app/models/concerns/enju_seed/enju_user.rb +22 -26
  8. data/app/models/concerns/master_model.rb +5 -6
  9. data/app/models/identity.rb +1 -1
  10. data/app/models/profile.rb +3 -3
  11. data/app/models/role.rb +2 -1
  12. data/app/models/user_has_role.rb +2 -2
  13. data/app/views/my_accounts/_edit_credential.html.slim +63 -0
  14. data/app/views/my_accounts/_form.html.slim +20 -0
  15. data/app/views/my_accounts/_show.html.slim +1 -0
  16. data/app/views/my_accounts/edit.html.slim +30 -0
  17. data/app/views/my_accounts/show.html+phone.slim +1 -0
  18. data/app/views/my_accounts/show.html.slim +57 -0
  19. data/app/views/profiles/_edit_credential.html.slim +67 -0
  20. data/app/views/profiles/_edit_profile.html.slim +40 -0
  21. data/app/views/profiles/_form.html.slim +12 -0
  22. data/app/views/profiles/_show.html.slim +1 -0
  23. data/app/views/profiles/edit.html.slim +30 -0
  24. data/app/views/profiles/index.html.slim +61 -0
  25. data/app/views/profiles/new.html.slim +65 -0
  26. data/app/views/profiles/show.html+phone.slim +1 -0
  27. data/app/views/profiles/show.html.slim +67 -0
  28. data/app/views/roles/_form.html.slim +16 -0
  29. data/app/views/roles/edit.html.slim +15 -0
  30. data/app/views/roles/index.html.slim +27 -0
  31. data/app/views/roles/new.html.slim +13 -0
  32. data/app/views/roles/show.html.slim +46 -0
  33. data/db/migrate/041_create_roles.rb +3 -3
  34. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +3 -3
  35. data/lib/enju_seed.rb +2 -3
  36. data/lib/enju_seed/engine.rb +1 -2
  37. data/lib/enju_seed/localized_name.rb +1 -3
  38. data/lib/enju_seed/version.rb +1 -1
  39. data/spec/controllers/my_accounts_controller_spec.rb +79 -79
  40. data/spec/controllers/profiles_controller_spec.rb +210 -210
  41. data/spec/controllers/roles_controller_spec.rb +47 -47
  42. data/spec/dummy/app/helpers/application_helper.rb +1 -1
  43. data/spec/dummy/app/models/user.rb +2 -2
  44. data/spec/dummy/bin/setup +8 -8
  45. data/spec/dummy/config/application.rb +2 -18
  46. data/spec/dummy/config/database.yml +70 -10
  47. data/spec/dummy/config/environment.rb +1 -1
  48. data/spec/dummy/config/environments/development.rb +24 -11
  49. data/spec/dummy/config/environments/production.rb +24 -17
  50. data/spec/dummy/config/environments/test.rb +6 -6
  51. data/spec/dummy/config/initializers/assets.rb +1 -1
  52. data/spec/dummy/config/initializers/friendly_id.rb +75 -75
  53. data/spec/dummy/db/migrate/001_create_agents.rb +6 -6
  54. data/spec/dummy/db/migrate/002_devise_create_users.rb +5 -6
  55. data/spec/dummy/db/migrate/005_create_manifestations.rb +12 -12
  56. data/spec/dummy/db/migrate/006_create_items.rb +5 -5
  57. data/spec/dummy/db/migrate/012_create_owns.rb +2 -2
  58. data/spec/dummy/db/migrate/015_create_creates.rb +2 -2
  59. data/spec/dummy/db/migrate/032_create_checkins.rb +1 -1
  60. data/spec/dummy/db/migrate/033_create_checkouts.rb +4 -4
  61. data/spec/dummy/db/migrate/035_create_reserves.rb +5 -5
  62. data/spec/dummy/db/migrate/047_create_produces.rb +2 -2
  63. data/spec/dummy/db/migrate/059_create_libraries.rb +6 -4
  64. data/spec/dummy/db/migrate/069_create_shelves.rb +2 -1
  65. data/spec/dummy/db/migrate/073_create_carrier_types.rb +1 -1
  66. data/spec/dummy/db/migrate/077_create_user_groups.rb +1 -1
  67. data/spec/dummy/db/migrate/080_create_library_groups.rb +2 -1
  68. data/spec/dummy/db/migrate/112_create_frequencies.rb +1 -1
  69. data/spec/dummy/db/migrate/117_create_form_of_works.rb +1 -1
  70. data/spec/dummy/db/migrate/120_create_baskets.rb +2 -1
  71. data/spec/dummy/db/migrate/121_create_checked_items.rb +3 -3
  72. data/spec/dummy/db/migrate/124_create_bookstores.rb +1 -1
  73. data/spec/dummy/db/migrate/125_create_donates.rb +2 -2
  74. data/spec/dummy/db/migrate/127_create_use_restrictions.rb +1 -1
  75. data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +2 -2
  76. data/spec/dummy/db/migrate/130_create_request_status_types.rb +1 -1
  77. data/spec/dummy/db/migrate/131_create_request_types.rb +1 -1
  78. data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +1 -1
  79. data/spec/dummy/db/migrate/133_create_agent_merges.rb +1 -1
  80. data/spec/dummy/db/migrate/149_create_message_templates.rb +5 -5
  81. data/spec/dummy/db/migrate/154_create_messages.rb +2 -2
  82. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +2 -2
  83. data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +13 -0
  84. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +1 -1
  85. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +5 -2
  86. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +2 -1
  87. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +5 -5
  88. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +8 -9
  89. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +5 -6
  90. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +1 -1
  91. data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +1 -1
  92. data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +8 -8
  93. data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +3 -3
  94. data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +4 -4
  95. data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +3 -3
  96. data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +3 -3
  97. data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +2 -2
  98. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +1 -1
  99. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +1 -1
  100. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +1 -1
  101. data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb +6 -6
  102. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +1 -1
  103. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +1 -1
  104. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +1 -1
  105. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +1 -1
  106. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  107. data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +3 -3
  108. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +0 -1
  109. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +0 -1
  110. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +0 -1
  111. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +1 -2
  112. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +6 -3
  113. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +1 -1
  114. data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +2 -2
  115. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +2 -2
  116. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +1 -1
  117. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +1 -1
  118. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +2 -2
  119. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +2 -2
  120. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +3 -3
  121. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +4 -4
  122. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +3 -3
  123. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +3 -3
  124. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +3 -3
  125. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +3 -3
  126. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +3 -3
  127. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +4 -4
  128. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +4 -4
  129. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +0 -1
  130. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +4 -4
  131. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +0 -1
  132. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +4 -4
  133. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +1 -1
  134. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +1 -1
  135. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +3 -1
  136. data/spec/dummy/db/migrate/20141029131633_create_periodicals.rb +11 -0
  137. data/spec/dummy/db/migrate/20150124152756_add_foreign_key_to_shelves_referencing_libraries.rb +6 -0
  138. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
  139. data/spec/dummy/db/migrate/20150302110310_add_attachment_id_to_manifestation.rb +7 -0
  140. data/spec/dummy/db/migrate/20150304183215_add_picture_id_to_picture_file.rb +7 -0
  141. data/spec/dummy/db/migrate/20150305025906_add_resource_import_id_to_resource_import_file.rb +7 -0
  142. data/spec/dummy/db/migrate/20150305030046_add_resource_export_id_to_resource_export_file.rb +8 -0
  143. data/spec/dummy/db/migrate/20150305031709_add_agent_import_id_to_agent_import_file.rb +7 -0
  144. data/spec/dummy/db/migrate/20150305105231_add_attachment_fingerprint_to_manifestation.rb +5 -0
  145. data/spec/dummy/db/migrate/20150420145354_add_attachment_to_carrier_type.rb +8 -0
  146. data/spec/dummy/db/migrate/20150420145420_add_attachment_to_content_type.rb +8 -0
  147. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +5 -3
  148. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +2 -4
  149. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +2 -19
  150. data/spec/dummy/db/migrate/20151216123621_create_doi_records.rb +12 -0
  151. data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb +12 -0
  152. data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb +12 -0
  153. data/spec/dummy/db/migrate/20160513000929_create_agent_names.rb +18 -0
  154. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +9 -0
  155. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +9 -0
  156. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +9 -0
  157. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +9 -0
  158. data/spec/dummy/db/migrate/20161111175127_add_attachment_data_to_manifestation.rb +5 -0
  159. data/spec/dummy/db/migrate/20161111193255_add_attachment_data_to_carrier_type.rb +5 -0
  160. data/spec/dummy/db/migrate/20161111193346_add_attachment_data_to_content_type.rb +5 -0
  161. data/spec/dummy/db/migrate/20161112122706_add_attachment_data_to_resource_import_file.rb +5 -0
  162. data/spec/dummy/db/migrate/20161112122750_add_attachment_data_to_resource_export_file.rb +5 -0
  163. data/spec/dummy/db/migrate/20161112122814_add_attachment_data_to_agent_import_file.rb +5 -0
  164. data/spec/dummy/db/schema.rb +1418 -1402
  165. data/spec/factories/profile.rb +10 -10
  166. data/spec/factories/user.rb +10 -10
  167. data/spec/factories/user_group.rb +2 -2
  168. data/spec/fixtures/library_groups.yml +1 -0
  169. data/spec/models/profile_spec.rb +20 -19
  170. data/spec/models/role_spec.rb +7 -7
  171. data/spec/models/user_has_role_spec.rb +1 -2
  172. data/spec/models/user_spec.rb +25 -26
  173. data/spec/rails_helper.rb +7 -6
  174. data/spec/requests/profiles_spec.rb +3 -3
  175. data/spec/routing/profiles_routing_spec.rb +16 -18
  176. data/spec/routing/roles_routing_spec.rb +16 -18
  177. data/spec/routing/users_spec.rb +6 -7
  178. data/spec/spec_helper.rb +47 -49
  179. data/spec/support/controller_macros.rb +9 -9
  180. data/spec/views/my_accounts/show.html.erb_spec.rb +6 -6
  181. data/spec/views/profiles/edit.html.erb_spec.rb +7 -7
  182. data/spec/views/profiles/index.html.erb_spec.rb +3 -3
  183. data/spec/views/profiles/new.html.erb_spec.rb +5 -6
  184. data/spec/views/profiles/show.html.erb_spec.rb +3 -3
  185. metadata +323 -323
  186. data/app/views/my_accounts/_edit_credential.html.erb +0 -99
  187. data/app/views/my_accounts/_form.html.erb +0 -24
  188. data/app/views/my_accounts/_show.html.erb +0 -1
  189. data/app/views/my_accounts/edit.html.erb +0 -32
  190. data/app/views/my_accounts/show.html.erb +0 -49
  191. data/app/views/profiles/_edit_profile.html.erb +0 -42
  192. data/app/views/profiles/_form.html.erb +0 -15
  193. data/app/views/profiles/_show.html.erb +0 -1
  194. data/app/views/profiles/edit.html.erb +0 -33
  195. data/app/views/profiles/index.html.erb +0 -70
  196. data/app/views/profiles/new.html.erb +0 -88
  197. data/app/views/profiles/show.html+phone.erb +0 -1
  198. data/app/views/profiles/show.html.erb +0 -67
  199. data/app/views/roles/_form.html.erb +0 -19
  200. data/app/views/roles/edit.html.erb +0 -13
  201. data/app/views/roles/index.html.erb +0 -32
  202. data/app/views/roles/new.html.erb +0 -12
  203. data/app/views/roles/show.html.erb +0 -46
  204. data/lib/generators/enju_seed/update/update_generator.rb +0 -9
  205. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +0 -5
  206. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +0 -5
  207. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +0 -5
  208. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +0 -5
  209. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +0 -5
@@ -1,16 +1,16 @@
1
- FactoryBot.define do
2
- factory :profile, :class => Profile do |f|
3
- f.user_group_id {UserGroup.first.id}
4
- f.required_role_id {Role.where(name: 'User').first.id}
5
- f.sequence(:user_number){|n| "user_number_#{n}"}
1
+ FactoryGirl.define do
2
+ factory :profile, class: Profile do |f|
3
+ f.user_group_id { UserGroup.first.id }
4
+ f.required_role_id { Role.where(name: 'User').first.id }
5
+ f.sequence(:user_number) { |n| "user_number_#{n}" }
6
6
  f.library_id 2
7
- f.locale "ja"
8
- factory :librarian_profile, :class => Profile do |profile|
9
- profile.required_role_id {Role.where(name: 'Librarian').first.id}
7
+ f.locale 'ja'
8
+ factory :librarian_profile, class: Profile do |profile|
9
+ profile.required_role_id { Role.where(name: 'Librarian').first.id }
10
10
  profile.association :user, factory: :librarian
11
11
  end
12
- factory :admin_profile, :class => Profile do |profile|
13
- profile.required_role_id {Role.where(name: 'Administrator').first.id}
12
+ factory :admin_profile, class: Profile do |profile|
13
+ profile.required_role_id { Role.where(name: 'Administrator').first.id }
14
14
  profile.association :user, factory: :admin
15
15
  end
16
16
  end
@@ -1,38 +1,38 @@
1
- FactoryBot.define do
1
+ FactoryGirl.define do
2
2
  factory :admin, class: User do |f|
3
- f.sequence(:username){|n| "admin_#{n}"}
4
- f.sequence(:email){|n| "admin_#{n}@example.jp"}
3
+ f.sequence(:username) { |n| "admin_#{n}" }
4
+ f.sequence(:email) { |n| "admin_#{n}@example.jp" }
5
5
  f.password 'adminpassword'
6
6
  f.password_confirmation 'adminpassword'
7
7
  f.after(:create) do |user|
8
8
  user_has_role = UserHasRole.new
9
- user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Administrator').id})
9
+ user_has_role.assign_attributes(user_id: user.id, role_id: Role.find_by(name: 'Administrator').id)
10
10
  user_has_role.save
11
11
  user.reload
12
12
  end
13
13
  end
14
14
 
15
15
  factory :librarian, class: User do |f|
16
- f.sequence(:username){|n| "librarian_#{n}"}
17
- f.sequence(:email){|n| "librarian_#{n}@example.jp"}
16
+ f.sequence(:username) { |n| "librarian_#{n}" }
17
+ f.sequence(:email) { |n| "librarian_#{n}@example.jp" }
18
18
  f.password 'librarianpassword'
19
19
  f.password_confirmation 'librarianpassword'
20
20
  f.after(:create) do |user|
21
21
  user_has_role = UserHasRole.new
22
- user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Librarian').id})
22
+ user_has_role.assign_attributes(user_id: user.id, role_id: Role.find_by(name: 'Librarian').id)
23
23
  user_has_role.save
24
24
  user.reload
25
25
  end
26
26
  end
27
27
 
28
28
  factory :user, class: User do |f|
29
- f.sequence(:username){|n| "user_#{n}"}
30
- f.sequence(:email){|n| "user_#{n}@example.jp"}
29
+ f.sequence(:username) { |n| "user_#{n}" }
30
+ f.sequence(:email) { |n| "user_#{n}@example.jp" }
31
31
  f.password 'userpassword'
32
32
  f.password_confirmation 'userpassword'
33
33
  f.after(:create) do |user|
34
34
  user_has_role = UserHasRole.new
35
- user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('User').id})
35
+ user_has_role.assign_attributes(user_id: user.id, role_id: Role.find_by(name: 'User').id)
36
36
  user_has_role.save
37
37
  user.reload
38
38
  end
@@ -1,5 +1,5 @@
1
- FactoryBot.define do
1
+ FactoryGirl.define do
2
2
  factory :user_group do |f|
3
- f.sequence(:name){|n| "user_group_#{n}"}
3
+ f.sequence(:name) { |n| "user_group_#{n}" }
4
4
  end
5
5
  end
@@ -9,6 +9,7 @@ one:
9
9
  ::/0"
10
10
  url: "http://localhost:3000/"
11
11
  position: 1
12
+ login_banner: "*Next-L Enju*"
12
13
  admin_networks: "0.0.0.0/0\r\n\
13
14
  ::/0"
14
15
  user_id: 1
@@ -1,70 +1,71 @@
1
- require 'rails_helper'
1
+ # -*- encoding: utf-8 -*-
2
+ require 'spec_helper'
2
3
 
3
4
  describe Profile do
4
- #pending "add some examples to (or delete) #{__FILE__}"
5
+ # pending "add some examples to (or delete) #{__FILE__}"
5
6
  fixtures :all
6
7
 
7
8
  it 'should create a profile' do
8
- FactoryBot.create(:profile)
9
+ FactoryGirl.create(:profile)
9
10
  end
10
11
 
11
12
  it 'should destroy a profile' do
12
- profile = FactoryBot.create(:profile)
13
+ profile = FactoryGirl.create(:profile)
13
14
  profile.destroy.should be_truthy
14
15
  end
15
16
 
16
17
  it 'should not set expired_at if its user group does not have valid period' do
17
- profile = FactoryBot.create(:profile)
18
+ profile = FactoryGirl.create(:profile)
18
19
  profile.expired_at.should be_nil
19
20
  end
20
21
 
21
22
  it 'should set expired_at if its user group has valid period' do
22
- profile = FactoryBot.build(:profile)
23
- user_group = FactoryBot.create(:user_group, :valid_period_for_new_user => 10)
23
+ profile = FactoryGirl.build(:profile)
24
+ user_group = FactoryGirl.create(:user_group, valid_period_for_new_user: 10)
24
25
  user_group.profiles << profile
25
26
  profile.user_group.valid_period_for_new_user.should eq 10
26
27
  profile.expired_at.should eq 10.days.from_now.end_of_day
27
28
  end
28
29
 
29
- it "should create profile" do
30
- profile = FactoryBot.create(:profile)
31
- assert !profile.new_record?, "#{profile.errors.full_messages.to_sentence}"
30
+ it 'should create profile' do
31
+ profile = FactoryGirl.create(:profile)
32
+ assert !profile.new_record?, profile.errors.full_messages.to_sentence.to_s
32
33
  end
33
34
 
34
- it "should create profile with empty user_number" do
35
- profile1 = FactoryBot.create(:profile, user_number: "")
36
- profile2 = FactoryBot.create(:profile, user_number: "")
35
+ it 'should create profile with empty user_number' do
36
+ profile1 = FactoryGirl.create(:profile, user_number: '')
37
+ profile2 = FactoryGirl.create(:profile, user_number: '')
37
38
  profile1.should be_valid
38
39
  profile2.should be_valid
39
40
  end
40
41
 
41
42
  if defined?(EnjuQuestion)
42
- it "should reset answer_feed_token" do
43
+ it 'should reset answer_feed_token' do
43
44
  profiles(:user1).reset_answer_feed_token
44
45
  profiles(:user1).answer_feed_token.should be_truthy
45
46
  end
46
47
 
47
- it "should delete answer_feed_token" do
48
+ it 'should delete answer_feed_token' do
48
49
  profiles(:user1).delete_answer_feed_token
49
50
  profiles(:user1).answer_feed_token.should be_nil
50
51
  end
51
52
  end
52
53
 
53
54
  if defined?(EnjuCirculation)
54
- it "should reset checkout_icalendar_token" do
55
+ it 'should reset checkout_icalendar_token' do
55
56
  profiles(:user1).reset_checkout_icalendar_token
56
57
  profiles(:user1).checkout_icalendar_token.should be_truthy
57
58
  end
58
59
 
59
- it "should delete checkout_icalendar_token" do
60
+ it 'should delete checkout_icalendar_token' do
60
61
  profiles(:user1).delete_checkout_icalendar_token
61
62
  profiles(:user1).checkout_icalendar_token.should be_nil
62
63
  end
63
64
  end
64
65
 
65
66
  if defined?(EnjuCirculation)
66
- it "should send_message" do
67
- assert profiles(:librarian1).user.send_message('reservation_expired_for_patron', :manifestations => profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.collect(&:manifestation))
67
+ it 'should send_message' do
68
+ assert profiles(:librarian1).user.send_message('reservation_expired_for_patron', manifestations: profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.collect(&:manifestation))
68
69
  profiles(:librarian1).reload
69
70
  profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.should be_empty
70
71
  end
@@ -2,25 +2,25 @@
2
2
  require 'spec_helper'
3
3
 
4
4
  describe Role do
5
- #pending "add some examples to (or delete) #{__FILE__}"
5
+ # pending "add some examples to (or delete) #{__FILE__}"
6
6
  fixtures :roles
7
7
 
8
- it "should not be saved if name is blank" do
8
+ it 'should not be saved if name is blank' do
9
9
  role = Role.first
10
10
  role.name = ''
11
- lambda{role.save!}.should raise_error(ActiveRecord::RecordInvalid)
11
+ -> { role.save! }.should raise_error(ActiveRecord::RecordInvalid)
12
12
  end
13
13
 
14
- it "should not be saved if name is not unique" do
14
+ it 'should not be saved if name is not unique' do
15
15
  role = Role.first
16
- lambda{Role.create!(:name => role.name)}.should raise_error(ActiveRecord::RecordInvalid)
16
+ -> { Role.create!(name: role.name) }.should raise_error(ActiveRecord::RecordInvalid)
17
17
  end
18
18
 
19
- it "should respond to localized_name" do
19
+ it 'should respond to localized_name' do
20
20
  roles(:role_00001).localized_name.should eq 'Guest'
21
21
  end
22
22
 
23
- it "should respond to default_role" do
23
+ it 'should respond to default_role' do
24
24
  Role.default_role.should eq roles(:role_00001)
25
25
  end
26
26
  end
@@ -2,8 +2,7 @@
2
2
  require 'spec_helper'
3
3
 
4
4
  describe UserHasRole do
5
- #pending "add some examples to (or delete) #{__FILE__}"
6
-
5
+ # pending "add some examples to (or delete) #{__FILE__}"
7
6
  end
8
7
 
9
8
  # == Schema Information
@@ -2,85 +2,85 @@
2
2
  require 'rails_helper'
3
3
 
4
4
  describe User do
5
- #pending "add some examples to (or delete) #{__FILE__}"
5
+ # pending "add some examples to (or delete) #{__FILE__}"
6
6
  fixtures :all
7
7
 
8
8
  it 'should create an user' do
9
- FactoryBot.create(:user)
9
+ FactoryGirl.create(:user)
10
10
  end
11
11
 
12
12
  it 'should destroy an user' do
13
- user = FactoryBot.create(:user)
13
+ user = FactoryGirl.create(:user)
14
14
  user.destroy.should be_truthy
15
15
  end
16
16
 
17
17
  it 'should respond to has_role(Administrator)' do
18
- admin = FactoryBot.create(:admin)
18
+ admin = FactoryGirl.create(:admin)
19
19
  admin.has_role?('Administrator').should be_truthy
20
20
  end
21
21
 
22
22
  it 'should respond to has_role(Librarian)' do
23
- librarian = FactoryBot.create(:librarian)
23
+ librarian = FactoryGirl.create(:librarian)
24
24
  librarian.has_role?('Administrator').should be_falsy
25
25
  librarian.has_role?('Librarian').should be_truthy
26
26
  librarian.has_role?('User').should be_truthy
27
27
  end
28
28
 
29
29
  it 'should respond to has_role(User)' do
30
- user = FactoryBot.create(:user)
30
+ user = FactoryGirl.create(:user)
31
31
  user.has_role?('Administrator').should be_falsy
32
32
  user.has_role?('Librarian').should be_falsy
33
33
  user.has_role?('User').should be_truthy
34
34
  end
35
35
 
36
36
  it 'should lock an user' do
37
- user = FactoryBot.create(:user)
37
+ user = FactoryGirl.create(:user)
38
38
  user.locked = '1'
39
39
  user.save
40
40
  user.active_for_authentication?.should be_falsy
41
41
  end
42
42
 
43
43
  it 'should unlock an user' do
44
- user = FactoryBot.create(:user)
44
+ user = FactoryGirl.create(:user)
45
45
  user.lock_access!
46
46
  user.locked = '0'
47
47
  user.save
48
48
  user.active_for_authentication?.should be_truthy
49
49
  end
50
50
 
51
- it "should create user" do
52
- user = FactoryBot.create(:user)
53
- assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
51
+ it 'should create user' do
52
+ user = FactoryGirl.create(:user)
53
+ assert !user.new_record?, user.errors.full_messages.to_sentence.to_s
54
54
  end
55
55
 
56
- it "should require username" do
56
+ it 'should require username' do
57
57
  old_count = User.count
58
- user = FactoryBot.build(:user, :username => nil)
58
+ user = FactoryGirl.build(:user, username: nil)
59
59
  user.save
60
60
  user.errors[:username].should be_truthy
61
61
  User.count.should eq old_count
62
62
  end
63
63
 
64
- it "should require password" do
65
- user = FactoryBot.build(:user, :password => nil)
64
+ it 'should require password' do
65
+ user = FactoryGirl.build(:user, password: nil)
66
66
  user.save
67
67
  user.errors[:password].should be_truthy
68
68
  end
69
69
 
70
- it "should not require password_confirmation on create" do
71
- user = FactoryBot.build(:user, :password => 'new_password', :password_confirmation => nil)
70
+ it 'should not require password_confirmation on create' do
71
+ user = FactoryGirl.build(:user, password: 'new_password', password_confirmation: nil)
72
72
  user.save
73
73
  user.errors[:email].should be_empty
74
74
  end
75
75
 
76
- it "should reset password" do
76
+ it 'should reset password' do
77
77
  users(:user1).password = 'new password'
78
78
  users(:user1).password_confirmation = 'new password'
79
79
  users(:user1).save
80
80
  users(:user1).valid_password?('new password').should be_truthy
81
81
  end
82
82
 
83
- it "should set temporary_password" do
83
+ it 'should set temporary_password' do
84
84
  user = users(:user1)
85
85
  old_password = user.encrypted_password
86
86
  user.set_auto_generated_password
@@ -89,16 +89,16 @@ describe User do
89
89
  user.valid_password?('user1password').should be_falsy
90
90
  end
91
91
 
92
- it "should get highest_role" do
92
+ it 'should get highest_role' do
93
93
  users(:admin).role.name.should eq 'Administrator'
94
94
  end
95
95
 
96
- it "should lock all expired users" do
96
+ it 'should lock all expired users' do
97
97
  User.lock_expired_users
98
98
  users(:user4).active_for_authentication?.should be_falsy
99
99
  end
100
100
 
101
- it "should lock_expired users" do
101
+ it 'should lock_expired users' do
102
102
  user = users(:user1)
103
103
  users(:user1).active_for_authentication?.should be_truthy
104
104
  user.expired_at = 1.day.ago
@@ -107,18 +107,18 @@ describe User do
107
107
  end
108
108
 
109
109
  if defined?(EnjuQuestion)
110
- it "should reset answer_feed_token" do
110
+ it 'should reset answer_feed_token' do
111
111
  users(:user1).reset_answer_feed_token
112
112
  users(:user1).answer_feed_token.should be_truthy
113
113
  end
114
114
 
115
- it "should delete answer_feed_token" do
115
+ it 'should delete answer_feed_token' do
116
116
  users(:user1).delete_answer_feed_token
117
117
  users(:user1).answer_feed_token.should be_nil
118
118
  end
119
119
  end
120
120
 
121
- describe ".export" do
121
+ describe '.export' do
122
122
  it "should export all user's information" do
123
123
  lines = User.export
124
124
  CSV.parse(lines, col_sep: "\t")
@@ -172,4 +172,3 @@ end
172
172
  # save_search_history :boolean default(FALSE), not null
173
173
  # answer_feed_token :string(255)
174
174
  #
175
-
@@ -1,13 +1,14 @@
1
- require 'coveralls'
2
- Coveralls.wear!
1
+ require 'simplecov'
2
+ SimpleCov.start
3
+
3
4
  # This file is copied to spec/ when you run 'rails generate rspec:install'
4
5
  ENV['RAILS_ENV'] ||= 'test'
5
6
  require File.expand_path('../../spec/dummy/config/environment', __FILE__)
6
7
  # Prevent database truncation if the environment is production
7
- abort("The Rails environment is running in production mode!") if Rails.env.production?
8
+ abort('The Rails environment is running in production mode!') if Rails.env.production?
8
9
  require 'spec_helper'
9
10
  require 'rspec/rails'
10
- require 'factory_bot'
11
+ require 'factory_girl'
11
12
  require 'rspec/active_model/mocks'
12
13
  require 'sunspot_matchers'
13
14
  require 'pundit/rspec'
@@ -69,5 +70,5 @@ RSpec.configure do |config|
69
70
  config.include SunspotMatchers
70
71
  end
71
72
 
72
- FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
73
- FactoryBot.find_definitions
73
+ FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
74
+ FactoryGirl.find_definitions
@@ -1,8 +1,8 @@
1
1
  require 'spec_helper'
2
2
 
3
- describe "Profiles" do
4
- describe "GET /profiles" do
5
- it "works! (now write some real specs)" do
3
+ describe 'Profiles' do
4
+ describe 'GET /profiles' do
5
+ it 'works! (now write some real specs)' do
6
6
  get profiles_path
7
7
  end
8
8
  end
@@ -1,35 +1,33 @@
1
- require "spec_helper"
1
+ require 'spec_helper'
2
2
 
3
3
  describe ProfilesController do
4
- describe "routing" do
5
-
6
- it "recognizes and generates #index" do
7
- { get: "/profiles" }.should route_to(controller: "profiles", action: "index")
4
+ describe 'routing' do
5
+ it 'recognizes and generates #index' do
6
+ { get: '/profiles' }.should route_to(controller: 'profiles', action: 'index')
8
7
  end
9
8
 
10
- it "recognizes and generates #new" do
11
- { get: "/profiles/new" }.should route_to(controller: "profiles", action: "new")
9
+ it 'recognizes and generates #new' do
10
+ { get: '/profiles/new' }.should route_to(controller: 'profiles', action: 'new')
12
11
  end
13
12
 
14
- it "recognizes and generates #show" do
15
- { get: "/profiles/1" }.should route_to(controller: "profiles", action: "show", id: "1")
13
+ it 'recognizes and generates #show' do
14
+ { get: '/profiles/1' }.should route_to(controller: 'profiles', action: 'show', id: '1')
16
15
  end
17
16
 
18
- it "recognizes and generates #edit" do
19
- { get: "/profiles/1/edit" }.should route_to(controller: "profiles", action: "edit", id: "1")
17
+ it 'recognizes and generates #edit' do
18
+ { get: '/profiles/1/edit' }.should route_to(controller: 'profiles', action: 'edit', id: '1')
20
19
  end
21
20
 
22
- it "recognizes and generates #create" do
23
- { post: "/profiles" }.should route_to(controller: "profiles", action: "create")
21
+ it 'recognizes and generates #create' do
22
+ { post: '/profiles' }.should route_to(controller: 'profiles', action: 'create')
24
23
  end
25
24
 
26
- it "recognizes and generates #update" do
27
- { put: "/profiles/1" }.should route_to(controller: "profiles", action: "update", id: "1")
25
+ it 'recognizes and generates #update' do
26
+ { put: '/profiles/1' }.should route_to(controller: 'profiles', action: 'update', id: '1')
28
27
  end
29
28
 
30
- it "recognizes and generates #destroy" do
31
- { delete: "/profiles/1" }.should route_to(controller: "profiles", action: "destroy", id: "1")
29
+ it 'recognizes and generates #destroy' do
30
+ { delete: '/profiles/1' }.should route_to(controller: 'profiles', action: 'destroy', id: '1')
32
31
  end
33
-
34
32
  end
35
33
  end