enju_seed 0.4.0.beta.1 → 0.4.0.beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (331) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +6 -9
  3. data/Rakefile +7 -16
  4. data/app/controllers/profiles_controller.rb +30 -30
  5. data/app/controllers/roles_controller.rb +1 -2
  6. data/app/models/concerns/enju_seed/enju_user.rb +27 -23
  7. data/app/models/concerns/master_model.rb +3 -3
  8. data/app/models/profile.rb +13 -12
  9. data/app/models/role.rb +4 -4
  10. data/app/models/user_has_role.rb +2 -5
  11. data/app/views/my_accounts/_edit_credential.html.erb +9 -9
  12. data/app/views/profiles/_edit_credential.html.erb +6 -6
  13. data/app/views/profiles/new.html.erb +3 -3
  14. data/app/views/profiles/show.html.erb +1 -1
  15. data/app/views/roles/index.html.erb +1 -1
  16. data/app/views/roles/show.html.erb +2 -7
  17. data/db/migrate/041_create_roles.rb +7 -6
  18. data/db/migrate/20100606065209_create_user_has_roles.rb +3 -3
  19. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +2 -2
  20. data/db/migrate/20140122054321_create_profiles.rb +8 -5
  21. data/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +11 -0
  22. data/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
  23. data/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
  24. data/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
  25. data/db/migrate/20190630151446_add_display_name_translations_to_role.rb +5 -0
  26. data/db/migrate/20190713114940_add_profile_id_to_user.rb +5 -0
  27. data/db/migrate/20190713115451_add_full_name_translations_to_profile.rb +5 -0
  28. data/lib/enju_seed.rb +2 -2
  29. data/lib/enju_seed/engine.rb +2 -2
  30. data/lib/enju_seed/version.rb +1 -1
  31. data/lib/generators/enju_seed/setup/setup_generator.rb +9 -0
  32. data/lib/generators/enju_seed/setup/templates/db/fixtures/roles.yml +38 -0
  33. data/lib/generators/enju_seed/update/update_generator.rb +9 -0
  34. data/lib/tasks/enju_seed_tasks.rake +8 -4
  35. data/spec/controllers/my_accounts_controller_spec.rb +56 -45
  36. data/spec/controllers/profiles_controller_spec.rb +144 -147
  37. data/spec/controllers/roles_controller_spec.rb +35 -35
  38. data/spec/dummy/Rakefile +1 -1
  39. data/spec/dummy/app/models/application_record.rb +3 -0
  40. data/spec/dummy/app/models/user.rb +2 -2
  41. data/spec/dummy/bin/bundle +1 -1
  42. data/spec/dummy/bin/rails +1 -1
  43. data/spec/dummy/bin/setup +19 -12
  44. data/spec/dummy/bin/update +31 -0
  45. data/spec/dummy/bin/yarn +11 -0
  46. data/spec/dummy/config.ru +2 -1
  47. data/spec/dummy/config/application.rb +6 -1
  48. data/spec/dummy/config/cable.yml +10 -0
  49. data/spec/dummy/config/database.yml +3 -2
  50. data/spec/dummy/config/environments/development.rb +1 -1
  51. data/spec/dummy/config/environments/production.rb +8 -3
  52. data/spec/dummy/config/environments/test.rb +1 -1
  53. data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
  54. data/spec/dummy/config/initializers/assets.rb +7 -4
  55. data/spec/dummy/config/initializers/cookies_serializer.rb +2 -0
  56. data/spec/dummy/config/initializers/friendly_id.rb +75 -75
  57. data/spec/dummy/config/initializers/wrap_parameters.rb +2 -2
  58. data/spec/dummy/config/puma.rb +56 -0
  59. data/spec/dummy/config/routes.rb +4 -0
  60. data/spec/dummy/config/secrets.yml +15 -5
  61. data/spec/dummy/config/spring.rb +6 -0
  62. data/spec/dummy/db/migrate/001_create_agents.rb +7 -7
  63. data/spec/dummy/db/migrate/002_devise_create_users.rb +4 -3
  64. data/spec/dummy/db/migrate/005_create_manifestations.rb +5 -4
  65. data/spec/dummy/db/migrate/006_create_items.rb +4 -3
  66. data/spec/dummy/db/migrate/012_create_owns.rb +5 -3
  67. data/spec/dummy/db/migrate/015_create_creates.rb +5 -3
  68. data/spec/dummy/db/migrate/032_create_checkins.rb +1 -1
  69. data/spec/dummy/db/migrate/033_create_checkouts.rb +1 -1
  70. data/spec/dummy/db/migrate/035_create_reserves.rb +1 -1
  71. data/spec/dummy/db/migrate/047_create_produces.rb +5 -3
  72. data/spec/dummy/db/migrate/059_create_libraries.rb +7 -8
  73. data/spec/dummy/db/migrate/069_create_shelves.rb +3 -3
  74. data/spec/dummy/db/migrate/073_create_carrier_types.rb +2 -2
  75. data/spec/dummy/db/migrate/077_create_user_groups.rb +4 -4
  76. data/spec/dummy/db/migrate/080_create_library_groups.rb +6 -6
  77. data/spec/dummy/db/migrate/112_create_frequencies.rb +2 -2
  78. data/spec/dummy/db/migrate/117_create_form_of_works.rb +2 -2
  79. data/spec/dummy/db/migrate/120_create_baskets.rb +2 -2
  80. data/spec/dummy/db/migrate/121_create_checked_items.rb +1 -1
  81. data/spec/dummy/db/migrate/124_create_bookstores.rb +3 -3
  82. data/spec/dummy/db/migrate/125_create_donates.rb +3 -3
  83. data/spec/dummy/db/migrate/127_create_use_restrictions.rb +1 -1
  84. data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +1 -1
  85. data/spec/dummy/db/migrate/130_create_request_status_types.rb +3 -3
  86. data/spec/dummy/db/migrate/131_create_request_types.rb +3 -3
  87. data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +1 -1
  88. data/spec/dummy/db/migrate/133_create_agent_merges.rb +2 -2
  89. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
  90. data/spec/dummy/db/migrate/149_create_message_templates.rb +18 -0
  91. data/spec/dummy/db/migrate/154_create_messages.rb +23 -0
  92. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +18 -0
  93. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +5 -3
  94. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +2 -2
  95. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +3 -5
  96. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +4 -3
  97. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +6 -6
  98. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +5 -5
  99. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +6 -6
  100. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +2 -2
  101. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
  102. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
  103. data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +1 -1
  104. data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +1 -1
  105. data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +1 -1
  106. data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +1 -1
  107. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +1 -1
  108. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +1 -1
  109. data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +1 -1
  110. data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +1 -1
  111. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +1 -1
  112. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +1 -1
  113. data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +1 -1
  114. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +1 -1
  115. data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
  116. data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
  117. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +2 -2
  118. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +2 -2
  119. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +2 -2
  120. data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb +21 -0
  121. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
  122. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +2 -2
  123. data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
  124. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +7 -4
  125. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +2 -2
  126. data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
  127. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
  128. data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
  129. data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +6 -4
  130. data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
  131. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +2 -2
  132. data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
  133. data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
  134. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
  135. data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
  136. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +2 -2
  137. data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
  138. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
  139. data/spec/dummy/db/migrate/20110301134521_add_expire_date_to_reserve.rb +1 -1
  140. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +2 -2
  141. data/spec/dummy/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb +1 -1
  142. data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
  143. data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
  144. data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
  145. data/spec/dummy/db/migrate/20110621093332_remove_expire_date_from_reserve.rb +1 -1
  146. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
  147. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  148. data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +1 -1
  149. data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +11 -0
  150. data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
  151. data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
  152. data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
  153. data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
  154. data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
  155. data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
  156. data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
  157. data/spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb +1 -1
  158. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
  159. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +6 -0
  160. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
  161. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
  162. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
  163. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +2 -2
  164. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +4 -4
  165. data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
  166. data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
  167. data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
  168. data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
  169. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
  170. data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +5 -0
  171. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
  172. data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
  173. data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
  174. data/spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb +1 -1
  175. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +2 -2
  176. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
  177. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
  178. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
  179. data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb +1 -1
  180. data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +1 -1
  181. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
  182. data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +1 -1
  183. data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
  184. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
  185. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
  186. data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
  187. data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
  188. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +3 -2
  189. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
  190. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +1 -1
  191. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +1 -1
  192. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +3 -3
  193. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +3 -3
  194. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +3 -3
  195. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +18 -0
  196. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +18 -0
  197. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +3 -3
  198. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +3 -3
  199. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +3 -3
  200. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +2 -3
  201. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +4 -4
  202. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +4 -4
  203. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +5 -5
  204. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +5 -5
  205. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +2 -1
  206. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +3 -3
  207. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
  208. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
  209. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
  210. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +3 -2
  211. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +2 -2
  212. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
  213. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +2 -2
  214. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +2 -2
  215. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
  216. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +3 -2
  217. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +1 -1
  218. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +1 -1
  219. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +1 -1
  220. data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
  221. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +2 -4
  222. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
  223. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
  224. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
  225. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
  226. data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +1 -1
  227. data/spec/dummy/db/migrate/20141020120523_add_library_id_to_checkout.rb +1 -1
  228. data/spec/dummy/db/migrate/20150106001709_create_demands.rb +1 -1
  229. data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +5 -0
  230. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +2 -2
  231. data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +5 -0
  232. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +4 -4
  233. data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
  234. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +5 -3
  235. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +20 -3
  236. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
  237. data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
  238. data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
  239. data/spec/dummy/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +1 -1
  240. data/spec/dummy/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +1 -1
  241. data/spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +1 -1
  242. data/spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +1 -1
  243. data/spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +1 -1
  244. data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +9 -0
  245. data/spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +5 -0
  246. data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
  247. data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
  248. data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
  249. data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
  250. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +5 -0
  251. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +5 -0
  252. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +5 -0
  253. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +5 -0
  254. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +5 -0
  255. data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb +13 -0
  256. data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb +13 -0
  257. data/spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb +12 -0
  258. data/spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb +6 -0
  259. data/spec/dummy/db/schema.rb +454 -492
  260. data/spec/dummy/db/test.sqlite3 +0 -0
  261. data/spec/dummy/package.json +5 -0
  262. data/spec/factories/profile.rb +8 -8
  263. data/spec/factories/user.rb +22 -25
  264. data/spec/factories/user_group.rb +1 -1
  265. data/spec/fixtures/libraries.yml +34 -33
  266. data/spec/fixtures/library_groups.yml +27 -14
  267. data/spec/fixtures/profiles.yml +36 -27
  268. data/spec/fixtures/roles.yml +8 -7
  269. data/spec/fixtures/user_groups.yml +11 -10
  270. data/spec/fixtures/user_has_roles.yml +2 -2
  271. data/spec/fixtures/users.yml +0 -7
  272. data/spec/models/profile_spec.rb +19 -17
  273. data/spec/models/role_spec.rb +13 -11
  274. data/spec/models/user_has_role_spec.rb +5 -4
  275. data/spec/models/user_spec.rb +16 -14
  276. data/spec/rails_helper.rb +14 -2
  277. data/spec/requests/profiles_spec.rb +3 -3
  278. data/spec/routing/profiles_routing_spec.rb +18 -16
  279. data/spec/routing/roles_routing_spec.rb +18 -16
  280. data/spec/routing/users_spec.rb +7 -6
  281. data/spec/spec_helper.rb +49 -47
  282. data/spec/support/controller_macros.rb +6 -6
  283. data/spec/system/profiles_spec.rb +39 -0
  284. data/spec/views/my_accounts/show.html.erb_spec.rb +6 -6
  285. data/spec/views/profiles/edit.html.erb_spec.rb +7 -7
  286. data/spec/views/profiles/index.html.erb_spec.rb +3 -3
  287. data/spec/views/profiles/new.html.erb_spec.rb +6 -5
  288. data/spec/views/profiles/show.html.erb_spec.rb +4 -4
  289. data/spec/views/roles/edit.html.erb_spec.rb +18 -0
  290. data/spec/views/roles/index.html.erb_spec.rb +14 -0
  291. data/spec/views/roles/new.html.erb_spec.rb +18 -0
  292. data/spec/views/roles/show.html.erb_spec.rb +14 -0
  293. metadata +148 -92
  294. data/app/models/identity.rb +0 -23
  295. data/app/policies/user_export_file_policy.rb +0 -21
  296. data/app/policies/user_import_file_policy.rb +0 -21
  297. data/app/policies/user_import_result_policy.rb +0 -21
  298. data/db/migrate/20150421023923_create_identities.rb +0 -12
  299. data/db/migrate/20151126005552_add_provider_to_identity.rb +0 -5
  300. data/db/migrate/20170114174536_add_profile_id_to_user.rb +0 -5
  301. data/lib/enju_seed/localized_name.rb +0 -13
  302. data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +0 -11
  303. data/spec/dummy/db/migrate/20140529014410_create_item_transitions.rb +0 -15
  304. data/spec/dummy/db/migrate/20141029131633_create_periodicals.rb +0 -11
  305. data/spec/dummy/db/migrate/20150302110310_add_attachment_id_to_manifestation.rb +0 -7
  306. data/spec/dummy/db/migrate/20150304183215_add_picture_id_to_picture_file.rb +0 -7
  307. data/spec/dummy/db/migrate/20150305025906_add_resource_import_id_to_resource_import_file.rb +0 -7
  308. data/spec/dummy/db/migrate/20150305030046_add_resource_export_id_to_resource_export_file.rb +0 -8
  309. data/spec/dummy/db/migrate/20150305031709_add_agent_import_id_to_agent_import_file.rb +0 -7
  310. data/spec/dummy/db/migrate/20150305105231_add_attachment_fingerprint_to_manifestation.rb +0 -5
  311. data/spec/dummy/db/migrate/20150420145354_add_attachment_to_carrier_type.rb +0 -8
  312. data/spec/dummy/db/migrate/20150420145420_add_attachment_to_content_type.rb +0 -8
  313. data/spec/dummy/db/migrate/20151216123621_create_doi_records.rb +0 -12
  314. data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb +0 -12
  315. data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb +0 -12
  316. data/spec/dummy/db/migrate/20160513000929_create_agent_names.rb +0 -18
  317. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +0 -9
  318. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +0 -9
  319. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +0 -9
  320. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +0 -9
  321. data/spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb +0 -5
  322. data/spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb +0 -5
  323. data/spec/dummy/db/migrate/20161111175127_add_attachment_data_to_manifestation.rb +0 -5
  324. data/spec/dummy/db/migrate/20161111193255_add_attachment_data_to_carrier_type.rb +0 -5
  325. data/spec/dummy/db/migrate/20161111193346_add_attachment_data_to_content_type.rb +0 -5
  326. data/spec/dummy/db/migrate/20161112122706_add_attachment_data_to_resource_import_file.rb +0 -5
  327. data/spec/dummy/db/migrate/20161112122750_add_attachment_data_to_resource_export_file.rb +0 -5
  328. data/spec/dummy/db/migrate/20161112122814_add_attachment_data_to_agent_import_file.rb +0 -5
  329. data/spec/dummy/db/migrate/20161114083857_add_image_data_to_picture_file.rb +0 -5
  330. data/spec/dummy/db/migrate/20161115184747_add_attachment_data_to_user_import_file.rb +0 -5
  331. data/spec/dummy/db/migrate/20161115184756_add_attachment_data_to_user_export_file.rb +0 -5
@@ -2,9 +2,6 @@ class UserHasRole < ActiveRecord::Base
2
2
  belongs_to :user
3
3
  belongs_to :role
4
4
  accepts_nested_attributes_for :role
5
-
6
- # validates_uniqueness_of :role_id, scope: :user_id
7
- # validates_presence_of :role_id, :user_id
8
5
  end
9
6
 
10
7
  # == Schema Information
@@ -14,6 +11,6 @@ end
14
11
  # id :integer not null, primary key
15
12
  # user_id :integer not null
16
13
  # role_id :integer not null
17
- # created_at :datetime not null
18
- # updated_at :datetime not null
14
+ # created_at :datetime
15
+ # updated_at :datetime
19
16
  #
@@ -36,9 +36,9 @@
36
36
  <%= user_form.label t('activerecord.models.role') -%><br />
37
37
  <%= user_form.fields_for :user_has_role do |u| %>
38
38
  <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
39
- <%= u.select :role_id, @roles.collect{|r| [r.display_name.localize, r.id]} %>
39
+ <%= u.select :role_id, @roles.collect{|r| [r.display_name, r.id]} %>
40
40
  <% else %>
41
- <%= current_user.role.display_name.localize -%>
41
+ <%= current_user.role.display_name -%>
42
42
  <% end %>
43
43
  <% end %>
44
44
  </div>
@@ -58,9 +58,9 @@
58
58
  <div class="field">
59
59
  <%= f.label t('activerecord.models.user_group') -%><br />
60
60
  <%- if current_user.has_role?('Librarian') -%>
61
- <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
61
+ <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%>
62
62
  <%- else -%>
63
- <%= current_user.profile.user_group.display_name.localize if current_user.profile.user_group -%>
63
+ <%= current_user.profile.user_group.display_name if current_user.profile.user_group -%>
64
64
  <%- end -%>
65
65
  </div>
66
66
 
@@ -76,24 +76,24 @@
76
76
  <div class="field">
77
77
  <%= f.label t('activerecord.models.library') -%><br />
78
78
  <%- if current_user.has_role?('Librarian') -%>
79
- <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
79
+ <%= f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]}) -%>
80
80
  <% else %>
81
- <%= current_user.profile.library.display_name.localize if current_user.profile.library %>
81
+ <%= current_user.profile.library.display_name if current_user.profile.library %>
82
82
  <% end %>
83
83
  </div>
84
84
 
85
85
  <div class="field">
86
86
  <%= f.label t('role.required_role') -%><br />
87
87
  <%- if current_user.has_role?('Librarian') -%>
88
- <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
88
+ <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
89
89
  <%- else -%>
90
- <%= current_user.role.display_name.localize -%>
90
+ <%= current_user.role.display_name -%>
91
91
  <%- end -%>
92
92
  </div>
93
93
 
94
94
  <div class="field">
95
95
  <%= f.label :locale -%><br />
96
- <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
96
+ <%= f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}) -%>
97
97
  </div>
98
98
  </div>
99
99
  <% end %>
@@ -34,9 +34,9 @@
34
34
  <%= user_form.label t('activerecord.models.role') -%><br />
35
35
  <%= user_form.fields_for :user_has_role do |u| %>
36
36
  <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
37
- <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name.localize, r.id]} %>
37
+ <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name, r.id]} %>
38
38
  <% else %>
39
- <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name.localize, r.id]}, {}, {disabled: 'disabled'} %>
39
+ <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name, r.id]}, {}, {disabled: 'disabled'} %>
40
40
  <% end %>
41
41
  <% end %>
42
42
  </div>
@@ -56,7 +56,7 @@
56
56
  <%- if current_user.has_role?('Librarian') -%>
57
57
  <div class="field">
58
58
  <%= f.label t('activerecord.models.user_group') -%><br />
59
- <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
59
+ <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%>
60
60
  </div>
61
61
  <%- end -%>
62
62
 
@@ -72,17 +72,17 @@
72
72
  <%- if current_user.has_role?('Librarian') -%>
73
73
  <div class="field">
74
74
  <%= f.label t('activerecord.models.library') -%><br />
75
- <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
75
+ <%= f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]}) -%>
76
76
  </div>
77
77
 
78
78
  <div class="field">
79
79
  <%= f.label t('role.required_role') -%><br />
80
- <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
80
+ <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
81
81
  </div>
82
82
  <%- end -%>
83
83
  <div class="field">
84
84
  <%= f.label :locale -%><br />
85
- <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
85
+ <%= f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}) -%>
86
86
  </div>
87
87
  </div>
88
88
  <% end %>
@@ -34,17 +34,17 @@
34
34
 
35
35
  <div class="field">
36
36
  <%= f.label :user_group_id -%>
37
- <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
37
+ <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%>
38
38
  </div>
39
39
 
40
40
  <div class="field">
41
41
  <%= f.label t('activerecord.models.library') -%>
42
- <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
42
+ <%= f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]}) -%>
43
43
  </div>
44
44
 
45
45
  <div class="field">
46
46
  <%= f.label :locale -%>
47
- <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
47
+ <%= f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}) -%>
48
48
  </div>
49
49
 
50
50
  <% if defined?(EnjuSearchLog) %>
@@ -28,7 +28,7 @@
28
28
  <%= render 'submenu_checkout', profile: @profile %>
29
29
  <% end %>
30
30
  <ul>
31
- <li><%= link_to t('page.back'), :back %></li>
31
+ <li><%= back_to_index(flash[:page_info]) -%></li>
32
32
  <% if user_signed_in? %>
33
33
  <% if policy(@profile).update? %>
34
34
  <li><%= link_to t('page.edit'), edit_profile_path(@profile) -%></li>
@@ -12,7 +12,7 @@
12
12
  <%- @roles.each do |role| -%>
13
13
  <tr class="line<%= cycle("0", "1") -%>">
14
14
  <td><%= link_to role.name, role -%></td>
15
- <td><%= link_to role.display_name.localize, role -%></td>
15
+ <td><%= link_to role.display_name, role -%></td>
16
16
  <td>
17
17
  <%- if policy(role).update? -%>
18
18
  <%= link_to t('page.edit'), edit_role_path(role) -%>
@@ -10,12 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.role.display_name') -%>:</strong>
13
- <%= @role.display_name.localize -%>
14
- </p>
15
-
16
- <p>
17
- <strong><%= t('activerecord.attributes.role.score') -%>:</strong>
18
- <%= @role.score -%>
13
+ <%= @role.display_name -%>
19
14
  </p>
20
15
 
21
16
  <p>
@@ -41,6 +36,6 @@
41
36
  <%- if policy(@role).update? -%>
42
37
  <li><%= link_to t('page.edit'), edit_role_path(@role) -%></li>
43
38
  <%- end -%>
44
- <li><%= link_to t('page.back'), roles_path -%></li>
39
+ <li><%= back_to_index(flash[:page_info]) -%></li>
45
40
  </ul>
46
41
  </div>
@@ -1,10 +1,11 @@
1
- class CreateRoles < ActiveRecord::Migration[5.1]
1
+ class CreateRoles < ActiveRecord::Migration[4.2]
2
2
  def change
3
- create_table 'roles' do |t|
4
- t.string :name, null: false
5
- t.jsonb :display_name_translations
6
- t.text :note
7
- t.timestamps
3
+ create_table "roles" do |t|
4
+ t.column :name, :string, null: false
5
+ t.column :display_name, :string
6
+ t.column :note, :text
7
+ t.column :created_at, :datetime
8
+ t.column :updated_at, :datetime
8
9
  t.integer :score, default: 0, null: false
9
10
  t.integer :position
10
11
  end
@@ -1,8 +1,8 @@
1
- class CreateUserHasRoles < ActiveRecord::Migration[5.1]
1
+ class CreateUserHasRoles < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  create_table :user_has_roles do |t|
4
- t.references :user, foreign_key: {on_delete: :cascade}, null: false
5
- t.references :role, foreign_key: true, null: false
4
+ t.references :user, index: true, foreign_key: true, null: false
5
+ t.references :role, index: true, foreign_key: true, null: false
6
6
 
7
7
  t.timestamps
8
8
  end
@@ -1,4 +1,4 @@
1
- class AddAdditionalAttributesToUser < ActiveRecord::Migration[5.1]
1
+ class AddAdditionalAttributesToUser < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  add_column :users, :username, :string
4
4
  add_column :users, :deleted_at, :datetime
@@ -11,6 +11,6 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration[5.1]
11
11
  add_column :users, :confirmed_at, :datetime
12
12
 
13
13
  add_index :users, :username, unique: true
14
- add_index :users, :unlock_token, unique: true
14
+ add_index :users, :unlock_token, unique: true
15
15
  end
16
16
  end
@@ -1,10 +1,11 @@
1
- class CreateProfiles < ActiveRecord::Migration[5.1]
1
+ class CreateProfiles < ActiveRecord::Migration[4.2]
2
2
  def change
3
- create_table :profiles, id: :uuid, default: 'gen_random_uuid()' do |t|
4
- t.references :user_group, type: :uuid
5
- t.references :library, type: :uuid
3
+ create_table :profiles do |t|
4
+ t.references :user, index: true, foreign_key: true
5
+ t.references :user_group, index: true
6
+ t.references :library, index: true
6
7
  t.string :locale
7
- t.string :user_number, index: {unique: true}
8
+ t.string :user_number
8
9
  t.text :full_name
9
10
  t.text :note
10
11
  t.text :keyword_list
@@ -12,5 +13,7 @@ class CreateProfiles < ActiveRecord::Migration[5.1]
12
13
 
13
14
  t.timestamps
14
15
  end
16
+
17
+ add_index :profiles, :user_number, unique: true
15
18
  end
16
19
  end
@@ -0,0 +1,11 @@
1
+ class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration[4.2]
2
+ def up
3
+ remove_index :users, :email
4
+ add_index :users, :email
5
+ end
6
+
7
+ def down
8
+ remove_index :users, :email
9
+ add_index :users, :email, unique: true
10
+ end
11
+ end
@@ -1,4 +1,4 @@
1
- class AddExpiredAtToProfile < ActiveRecord::Migration[5.1]
1
+ class AddExpiredAtToProfile < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  add_column :profiles, :expired_at, :datetime
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[5.1]
1
+ class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  add_column :profiles, :full_name_transcription, :text
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddDateOfBirthToProfile < ActiveRecord::Migration[5.1]
1
+ class AddDateOfBirthToProfile < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  add_column :profiles, :date_of_birth, :datetime
4
4
  end
@@ -0,0 +1,5 @@
1
+ class AddDisplayNameTranslationsToRole < ActiveRecord::Migration[5.2]
2
+ def change
3
+ add_column :roles, :display_name_translations, :jsonb, default: {}, null: false
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddProfileIdToUser < ActiveRecord::Migration[5.2]
2
+ def change
3
+ add_reference :users, :profile, foreign_key: true
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddFullNameTranslationsToProfile < ActiveRecord::Migration[5.2]
2
+ def change
3
+ add_column :profiles, :full_name_translations, :jsonb, default: {}, null: false
4
+ end
5
+ end
@@ -1,5 +1,5 @@
1
- require 'enju_seed/engine'
1
+ require "enju_seed/engine"
2
+ require "enju_seed/version"
2
3
 
3
4
  module EnjuSeed
4
- # Your code goes here...
5
5
  end
@@ -6,15 +6,15 @@ require 'strip_attributes'
6
6
  require 'friendly_id'
7
7
  require 'addressable/uri'
8
8
  require 'sunspot_rails'
9
+ require 'sitemap_generator'
9
10
  require 'cocoon'
10
11
  require 'kramdown'
11
12
  require 'rails_autolink'
12
- require 'sitemap_generator'
13
13
  require 'browser'
14
14
  require 'simple_form'
15
15
  require 'validates_timeliness'
16
+ require 'paperclip'
16
17
  require 'json_translate'
17
- require 'statesman'
18
18
 
19
19
  module EnjuSeed
20
20
  class Engine < ::Rails::Engine
@@ -1,3 +1,3 @@
1
1
  module EnjuSeed
2
- VERSION = '0.4.0.beta.1'.freeze
2
+ VERSION = "0.4.0.beta.2"
3
3
  end
@@ -0,0 +1,9 @@
1
+ class EnjuSeed::SetupGenerator < Rails::Generators::Base
2
+ source_root File.expand_path('../templates', __FILE__)
3
+ desc "Create a setup file for Next-L Enju"
4
+
5
+ def copy_setup_files
6
+ directory("db/fixtures", "db/fixtures/enju_seed")
7
+ rake("enju_seed_engine:install:migrations")
8
+ end
9
+ end
@@ -0,0 +1,38 @@
1
+ ---
2
+ role_00001:
3
+ name: Guest
4
+ display_name_translations: {"en": "Guest", "ja": "ゲスト"}
5
+ id: 1
6
+ note:
7
+ position: 1
8
+ role_00002:
9
+ name: User
10
+ display_name_translations: {"en": "User", "ja": "一般利用者"}
11
+ id: 2
12
+ note:
13
+ position: 2
14
+ role_00003:
15
+ name: Librarian
16
+ display_name_translations: {"en": "Librarian", "ja": "図書館員"}
17
+ id: 3
18
+ note:
19
+ position: 3
20
+ role_00004:
21
+ name: Administrator
22
+ display_name_translations: {"en": "Administrator", "ja": "管理者"}
23
+ id: 4
24
+ note:
25
+ position: 4
26
+
27
+ # == Schema Information
28
+ #
29
+ # Table name: roles
30
+ #
31
+ # id :bigint not null, primary key
32
+ # name :string not null
33
+ # display_name_translations :jsonb not null
34
+ # note :text
35
+ # position :integer default(1), not null
36
+ # created_at :datetime not null
37
+ # updated_at :datetime not null
38
+ #
@@ -0,0 +1,9 @@
1
+ class EnjuSeed::UpdateGenerator < Rails::Generators::Base
2
+ source_root File.expand_path('../templates', __FILE__)
3
+ desc "Create files for updating Next-L Enju"
4
+
5
+ def copy_migration_files
6
+ generate('statesman:add_constraints_to_most_recent', 'UserImportFile', 'UserImportFileTransition')
7
+ generate('statesman:add_constraints_to_most_recent', 'UserExportFile', 'UserExportFileTransition')
8
+ end
9
+ end
@@ -1,4 +1,8 @@
1
- # desc "Explaining what the task does"
2
- # task :enju_seed do
3
- # # Task goes here
4
- # end
1
+ namespace :enju_seed do
2
+ desc "create initial records for enju_seed"
3
+ task setup: :environment do
4
+ Dir.glob(Rails.root.to_s + '/db/fixtures/enju_seed/*.yml').each do |file|
5
+ ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_seed', File.basename(file, '.*'))
6
+ end
7
+ end
8
+ end
@@ -3,20 +3,20 @@ require 'rails_helper'
3
3
  describe MyAccountsController do
4
4
  fixtures :all
5
5
 
6
- describe 'GET show' do
7
- describe 'When logged in as Administrator' do
6
+ describe "GET show" do
7
+ describe "When logged in as Administrator" do
8
8
  before(:each) do
9
9
  sign_in User.friendly.find('enjuadmin')
10
10
  end
11
11
 
12
- it 'assigns the requested user as @user' do
12
+ it "assigns the requested user as @user" do
13
13
  get :show, params: { id: 'admin' }
14
14
  expect(response).to be_successful
15
15
  end
16
16
  end
17
17
 
18
- describe 'When not logged in' do
19
- it 'assigns the requested user as @user' do
18
+ describe "When not logged in" do
19
+ it "assigns the requested user as @user" do
20
20
  get :show, params: { id: 'admin' }
21
21
  expect(assigns(:user)).to be_nil
22
22
  expect(response).to redirect_to(new_user_session_url)
@@ -24,46 +24,52 @@ describe MyAccountsController do
24
24
  end
25
25
  end
26
26
 
27
- describe 'GET edit' do
28
- describe 'When logged in as Administrator' do
27
+ describe "GET edit" do
28
+ describe "When logged in as Administrator" do
29
29
  before(:each) do
30
+ profile = FactoryBot.create(:profile)
30
31
  @user = FactoryBot.create(:admin)
32
+ @user.profile = profile
31
33
  sign_in @user
32
34
  end
33
35
 
34
- it 'assigns the requested user as @user' do
36
+ it "assigns the requested user as @user" do
35
37
  get :edit
36
38
  expect(assigns(:profile)).to eq(@user.profile)
37
39
  end
38
40
  end
39
41
 
40
- describe 'When logged in as Librarian' do
42
+ describe "When logged in as Librarian" do
41
43
  before(:each) do
44
+ profile = FactoryBot.create(:profile)
42
45
  @user = FactoryBot.create(:librarian)
46
+ @user.profile = profile
43
47
  sign_in @user
44
48
  end
45
49
 
46
- it 'should assign the requested user as @user' do
50
+ it "should assign the requested user as @user" do
47
51
  get :edit
48
52
  expect(assigns(:profile)).to eq(@user.profile)
49
53
  end
50
54
  end
51
55
 
52
- describe 'When logged in as User' do
56
+ describe "When logged in as User" do
53
57
  before(:each) do
58
+ profile = FactoryBot.create(:profile)
54
59
  @user = FactoryBot.create(:user)
60
+ @user.profile = profile
55
61
  sign_in @user
56
62
  end
57
63
 
58
- it 'should assign the requested user as @user' do
64
+ it "should assign the requested user as @user" do
59
65
  get :edit
60
66
  expect(assigns(:profile)).to eq(@user.profile)
61
67
  expect(response).to be_successful
62
68
  end
63
69
  end
64
70
 
65
- describe 'When not logged in' do
66
- it 'should not assign the requested user as @user' do
71
+ describe "When not logged in" do
72
+ it "should not assign the requested user as @user" do
67
73
  get :edit
68
74
  expect(assigns(:user)).to be_nil
69
75
  expect(response).to redirect_to(new_user_session_url)
@@ -71,32 +77,34 @@ describe MyAccountsController do
71
77
  end
72
78
  end
73
79
 
74
- describe 'PUT update' do
80
+ describe "PUT update" do
75
81
  before(:each) do
76
82
  @attrs = { user_attributes: { email: 'newaddress@example.jp', current_password: 'password' }, locale: 'en' }
77
83
  @invalid_attrs = { user_attributes: { username: '' }, user_number: '日本語' }
78
84
  @invalid_passwd_attrs = { user_attributes: { current_password: '' } }
79
85
  end
80
86
 
81
- describe 'When logged in as Administrator' do
87
+ describe "When logged in as Administrator" do
82
88
  before(:each) do
89
+ profile = FactoryBot.create(:profile)
83
90
  @user = FactoryBot.create(:admin, password: 'password', password_confirmation: 'password')
91
+ @user.profile = profile
84
92
  sign_in @user
85
93
  end
86
94
 
87
- describe 'with valid params' do
88
- it 'updates the requested user' do
95
+ describe "with valid params" do
96
+ it "updates the requested user" do
89
97
  @attrs[:user_attributes][:id] = @user.id
90
98
  put :update, params: { profile: @attrs }
91
99
  end
92
100
 
93
- it 'assigns the requested user as @user' do
101
+ it "assigns the requested user as @user" do
94
102
  @attrs[:user_attributes][:id] = @user.id
95
103
  put :update, params: { profile: @attrs }
96
104
  expect(assigns(:profile)).to eq(@user.profile)
97
105
  end
98
106
 
99
- it 'redirects to the user' do
107
+ it "redirects to the user" do
100
108
  @attrs[:user_attributes][:id] = @user.id
101
109
  put :update, params: { profile: @attrs }
102
110
  expect(assigns(:profile)).to eq(@user.profile)
@@ -104,15 +112,15 @@ describe MyAccountsController do
104
112
  end
105
113
  end
106
114
 
107
- describe 'with invalid params' do
108
- it 'assigns the requested user as @user' do
115
+ describe "with invalid params" do
116
+ it "assigns the requested user as @user" do
109
117
  put :update, params: { profile: @invalid_attrs }
110
118
  expect(assigns(:profile)).to eq(@user.profile)
111
119
  end
112
120
 
113
121
  it "re-renders the 'edit' template" do
114
122
  put :update, params: { profile: @invalid_attrs }
115
- expect(response).to render_template('edit')
123
+ expect(response).to render_template("edit")
116
124
  end
117
125
  end
118
126
 
@@ -124,25 +132,27 @@ describe MyAccountsController do
124
132
  # end
125
133
  end
126
134
 
127
- describe 'When logged in as Librarian' do
135
+ describe "When logged in as Librarian" do
128
136
  before(:each) do
137
+ profile = FactoryBot.create(:profile)
129
138
  @user = FactoryBot.create(:librarian, password: 'password', password_confirmation: 'password')
139
+ @user.profile = profile
130
140
  sign_in @user
131
141
  end
132
142
 
133
- describe 'with valid params' do
134
- it 'updates the requested user' do
143
+ describe "with valid params" do
144
+ it "updates the requested user" do
135
145
  @attrs[:user_attributes][:id] = @user.id
136
146
  put :update, params: { profile: @attrs }
137
147
  end
138
148
 
139
- it 'assigns the requested user as @user' do
149
+ it "assigns the requested user as @user" do
140
150
  @attrs[:user_attributes][:id] = @user.id
141
151
  put :update, params: { profile: @attrs }
142
152
  expect(assigns(:profile)).to eq(@user.profile)
143
153
  end
144
154
 
145
- it 'redirects to the user' do
155
+ it "redirects to the user" do
146
156
  @attrs[:user_attributes][:id] = @user.id
147
157
  put :update, params: { profile: @attrs }
148
158
  expect(assigns(:profile)).to eq(@user.profile)
@@ -150,34 +160,36 @@ describe MyAccountsController do
150
160
  end
151
161
  end
152
162
 
153
- describe 'with invalid params' do
154
- it 'assigns the user as @user' do
163
+ describe "with invalid params" do
164
+ it "assigns the user as @user" do
155
165
  put :update, params: { profile: @invalid_attrs }
156
166
  expect(assigns(:profile)).to_not be_valid
157
167
  expect(response).to be_successful
158
168
  end
159
169
 
160
- it 'should ignore username' do
170
+ it "should ignore username" do
161
171
  put :update, params: { profile: @invalid_attrs }
162
- expect(response).to render_template('edit')
172
+ expect(response).to render_template("edit")
163
173
  expect(assigns(:profile).changed?).to be_truthy
164
174
  end
165
175
  end
166
176
  end
167
177
 
168
- describe 'When logged in as User' do
178
+ describe "When logged in as User" do
169
179
  before(:each) do
180
+ profile = FactoryBot.create(:profile)
170
181
  @user = FactoryBot.create(:user, password: 'password', password_confirmation: 'password')
182
+ @user.profile = profile
171
183
  sign_in @user
172
184
  end
173
185
 
174
- describe 'with valid params' do
175
- it 'updates the requested user' do
186
+ describe "with valid params" do
187
+ it "updates the requested user" do
176
188
  @attrs[:user_attributes][:id] = @user.id
177
189
  put :update, params: { profile: @attrs }
178
190
  end
179
191
 
180
- it 'assigns the requested user as @user' do
192
+ it "assigns the requested user as @user" do
181
193
  @attrs[:user_attributes][:id] = @user.id
182
194
  put :update, params: { profile: @attrs }
183
195
  expect(assigns(:profile)).to eq(@user.profile)
@@ -185,30 +197,29 @@ describe MyAccountsController do
185
197
  end
186
198
  end
187
199
 
188
- describe 'with invalid params' do
189
- it 'assigns the requested user as @user' do
200
+ describe "with invalid params" do
201
+ it "assigns the requested user as @user" do
190
202
  put :update, params: { profile: @invalid_attrs }
191
- #expect(response).to be_successful
192
203
  expect(assigns(:profile).user.username).to eq(@user.username)
193
204
  expect(response).to redirect_to(my_account_url)
194
205
  end
195
206
  end
196
207
  end
197
208
 
198
- describe 'When not logged in' do
199
- describe 'with valid params' do
200
- it 'updates the requested user' do
209
+ describe "When not logged in" do
210
+ describe "with valid params" do
211
+ it "updates the requested user" do
201
212
  put :update, params: { profile: @attrs }
202
213
  end
203
214
 
204
- it 'should be forbidden' do
215
+ it "should be forbidden" do
205
216
  put :update, params: { profile: @attrs }
206
217
  expect(response).to redirect_to(new_user_session_url)
207
218
  end
208
219
  end
209
220
 
210
- describe 'with invalid params' do
211
- it 'assigns the requested user as @user' do
221
+ describe "with invalid params" do
222
+ it "assigns the requested user as @user" do
212
223
  put :update, params: { profile: @invalid_attrs }
213
224
  expect(response).to redirect_to(new_user_session_url)
214
225
  end