enju_seed 0.3.0.beta.4 → 0.3.0.beta.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (313) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +1 -9
  3. data/Rakefile +8 -17
  4. data/app/controllers/profiles_controller.rb +29 -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 +13 -2
  8. data/app/models/identity.rb +2 -2
  9. data/app/models/profile.rb +12 -10
  10. data/app/models/role.rb +27 -11
  11. data/app/models/user_has_role.rb +4 -4
  12. data/app/views/profiles/show.html.erb +1 -1
  13. data/app/views/roles/show.html.erb +1 -1
  14. data/db/migrate/041_create_roles.rb +7 -6
  15. data/db/migrate/20100606065209_create_user_has_roles.rb +3 -3
  16. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +2 -2
  17. data/db/migrate/20140122054321_create_profiles.rb +8 -5
  18. data/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +11 -0
  19. data/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
  20. data/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
  21. data/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
  22. data/db/migrate/20150421023923_create_identities.rb +6 -4
  23. data/db/migrate/20151126005552_add_provider_to_identity.rb +2 -2
  24. data/lib/enju_seed/engine.rb +2 -3
  25. data/lib/enju_seed/localized_name.rb +3 -1
  26. data/lib/enju_seed/version.rb +1 -1
  27. data/lib/enju_seed.rb +3 -2
  28. data/lib/generators/enju_seed/update/update_generator.rb +9 -0
  29. data/spec/controllers/my_accounts_controller_spec.rb +62 -51
  30. data/spec/controllers/profiles_controller_spec.rb +153 -156
  31. data/spec/controllers/roles_controller_spec.rb +35 -35
  32. data/spec/dummy/Rakefile +1 -1
  33. data/spec/dummy/app/controllers/application_controller.rb +1 -0
  34. data/spec/dummy/app/models/user.rb +2 -2
  35. data/spec/dummy/bin/rails +1 -1
  36. data/spec/dummy/bin/setup +19 -10
  37. data/spec/dummy/bin/update +29 -0
  38. data/spec/dummy/bin/yarn +11 -0
  39. data/spec/dummy/config/application.rb +5 -1
  40. data/spec/dummy/config/cable.yml +10 -0
  41. data/spec/dummy/config/database.yml +10 -70
  42. data/spec/dummy/config/environments/development.rb +1 -1
  43. data/spec/dummy/config/environments/production.rb +8 -3
  44. data/spec/dummy/config/environments/test.rb +1 -1
  45. data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
  46. data/spec/dummy/config/initializers/assets.rb +7 -4
  47. data/spec/dummy/config/initializers/cookies_serializer.rb +2 -0
  48. data/spec/dummy/config/initializers/friendly_id.rb +75 -75
  49. data/spec/dummy/config/initializers/wrap_parameters.rb +2 -2
  50. data/spec/dummy/config/puma.rb +56 -0
  51. data/spec/dummy/config/routes.rb +4 -0
  52. data/spec/dummy/config/secrets.yml +15 -5
  53. data/spec/dummy/config/spring.rb +6 -0
  54. data/spec/dummy/config.ru +2 -1
  55. data/spec/dummy/db/migrate/001_create_agents.rb +7 -7
  56. data/spec/dummy/db/migrate/002_devise_create_users.rb +4 -3
  57. data/spec/dummy/db/migrate/005_create_manifestations.rb +5 -4
  58. data/spec/dummy/db/migrate/006_create_items.rb +4 -3
  59. data/spec/dummy/db/migrate/012_create_owns.rb +5 -3
  60. data/spec/dummy/db/migrate/015_create_creates.rb +5 -3
  61. data/spec/dummy/db/migrate/032_create_checkins.rb +1 -1
  62. data/spec/dummy/db/migrate/033_create_checkouts.rb +1 -1
  63. data/spec/dummy/db/migrate/035_create_reserves.rb +1 -1
  64. data/spec/dummy/db/migrate/047_create_produces.rb +5 -3
  65. data/spec/dummy/db/migrate/059_create_libraries.rb +7 -8
  66. data/spec/dummy/db/migrate/069_create_shelves.rb +3 -3
  67. data/spec/dummy/db/migrate/073_create_carrier_types.rb +2 -2
  68. data/spec/dummy/db/migrate/077_create_user_groups.rb +4 -4
  69. data/spec/dummy/db/migrate/080_create_library_groups.rb +6 -6
  70. data/spec/dummy/db/migrate/112_create_frequencies.rb +2 -2
  71. data/spec/dummy/db/migrate/117_create_form_of_works.rb +2 -2
  72. data/spec/dummy/db/migrate/120_create_baskets.rb +2 -2
  73. data/spec/dummy/db/migrate/121_create_checked_items.rb +1 -1
  74. data/spec/dummy/db/migrate/124_create_bookstores.rb +3 -3
  75. data/spec/dummy/db/migrate/125_create_donates.rb +3 -3
  76. data/spec/dummy/db/migrate/127_create_use_restrictions.rb +1 -1
  77. data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +1 -1
  78. data/spec/dummy/db/migrate/130_create_request_status_types.rb +3 -3
  79. data/spec/dummy/db/migrate/131_create_request_types.rb +3 -3
  80. data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +1 -1
  81. data/spec/dummy/db/migrate/133_create_agent_merges.rb +2 -2
  82. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
  83. data/spec/dummy/db/migrate/149_create_message_templates.rb +18 -0
  84. data/spec/dummy/db/migrate/154_create_messages.rb +23 -0
  85. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +18 -0
  86. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +5 -3
  87. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +2 -2
  88. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +3 -5
  89. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +4 -3
  90. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +6 -6
  91. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +5 -5
  92. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +6 -6
  93. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +2 -2
  94. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
  95. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
  96. data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +1 -1
  97. data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +1 -1
  98. data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +1 -1
  99. data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +1 -1
  100. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +1 -1
  101. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +1 -1
  102. data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +1 -1
  103. data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +1 -1
  104. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +1 -1
  105. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +1 -1
  106. data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +1 -1
  107. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +1 -1
  108. data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
  109. data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
  110. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +2 -2
  111. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +2 -2
  112. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +2 -2
  113. data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb +1 -1
  114. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
  115. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +2 -2
  116. data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
  117. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +7 -4
  118. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +2 -2
  119. data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
  120. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
  121. data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
  122. data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +6 -4
  123. data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
  124. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +2 -2
  125. data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
  126. data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
  127. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
  128. data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
  129. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +2 -2
  130. data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
  131. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
  132. data/spec/dummy/db/migrate/20110301134521_add_expire_date_to_reserve.rb +1 -1
  133. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +2 -2
  134. data/spec/dummy/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb +1 -1
  135. data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
  136. data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
  137. data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
  138. data/spec/dummy/db/migrate/20110621093332_remove_expire_date_from_reserve.rb +1 -1
  139. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
  140. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  141. data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +1 -1
  142. data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +11 -0
  143. data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
  144. data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
  145. data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
  146. data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
  147. data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
  148. data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
  149. data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
  150. data/spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb +1 -1
  151. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
  152. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +6 -0
  153. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
  154. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
  155. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
  156. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +2 -2
  157. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +4 -4
  158. data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
  159. data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
  160. data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
  161. data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
  162. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
  163. data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +5 -0
  164. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
  165. data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
  166. data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
  167. data/spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb +1 -1
  168. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +2 -2
  169. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
  170. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
  171. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
  172. data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb +1 -1
  173. data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +1 -1
  174. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
  175. data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +1 -1
  176. data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
  177. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
  178. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
  179. data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
  180. data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
  181. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +3 -2
  182. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
  183. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +1 -1
  184. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +1 -1
  185. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +3 -3
  186. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +3 -3
  187. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +3 -3
  188. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +18 -0
  189. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +18 -0
  190. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +3 -3
  191. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +3 -3
  192. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +3 -3
  193. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +2 -3
  194. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +4 -4
  195. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +4 -4
  196. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +5 -5
  197. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +5 -5
  198. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +2 -1
  199. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +3 -3
  200. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
  201. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
  202. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
  203. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +3 -2
  204. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +2 -2
  205. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
  206. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +2 -2
  207. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +2 -2
  208. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
  209. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +3 -2
  210. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +1 -1
  211. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +1 -1
  212. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +1 -1
  213. data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
  214. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +2 -4
  215. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
  216. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
  217. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
  218. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
  219. data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +1 -1
  220. data/spec/dummy/db/migrate/20141020120523_add_library_id_to_checkout.rb +1 -1
  221. data/spec/dummy/db/migrate/20150106001709_create_demands.rb +1 -1
  222. data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +5 -0
  223. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +2 -2
  224. data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +5 -0
  225. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +4 -4
  226. data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
  227. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +5 -3
  228. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +20 -3
  229. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
  230. data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
  231. data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
  232. data/spec/dummy/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +1 -1
  233. data/spec/dummy/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +1 -1
  234. data/spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +1 -1
  235. data/spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +1 -1
  236. data/spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +1 -1
  237. data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +9 -0
  238. data/spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +5 -0
  239. data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
  240. data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
  241. data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
  242. data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
  243. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +5 -0
  244. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +5 -0
  245. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +5 -0
  246. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +5 -0
  247. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +5 -0
  248. data/spec/dummy/db/schema.rb +420 -476
  249. data/spec/dummy/package.json +5 -0
  250. data/spec/factories/profile.rb +8 -8
  251. data/spec/factories/user.rb +10 -13
  252. data/spec/factories/user_group.rb +2 -2
  253. data/spec/fixtures/libraries.yml +37 -37
  254. data/spec/fixtures/library_groups.yml +19 -27
  255. data/spec/fixtures/message_requests.yml +26 -0
  256. data/spec/fixtures/message_templates.yml +98 -0
  257. data/spec/fixtures/messages.yml +56 -0
  258. data/spec/fixtures/profiles.yml +35 -27
  259. data/spec/fixtures/roles.yml +12 -12
  260. data/spec/fixtures/user_groups.yml +10 -20
  261. data/spec/fixtures/user_has_roles.yml +2 -2
  262. data/spec/fixtures/users.yml +0 -7
  263. data/spec/models/profile_spec.rb +23 -22
  264. data/spec/models/role_spec.rb +18 -17
  265. data/spec/models/user_has_role_spec.rb +6 -4
  266. data/spec/models/user_spec.rb +27 -25
  267. data/spec/rails_helper.rb +6 -7
  268. data/spec/requests/profiles_spec.rb +3 -3
  269. data/spec/routing/profiles_routing_spec.rb +18 -16
  270. data/spec/routing/roles_routing_spec.rb +18 -16
  271. data/spec/routing/users_spec.rb +7 -6
  272. data/spec/spec_helper.rb +49 -47
  273. data/spec/support/controller_macros.rb +9 -9
  274. data/spec/views/my_accounts/show.html.erb_spec.rb +6 -6
  275. data/spec/views/profiles/edit.html.erb_spec.rb +7 -7
  276. data/spec/views/profiles/index.html.erb_spec.rb +3 -3
  277. data/spec/views/profiles/new.html.erb_spec.rb +6 -5
  278. data/spec/views/profiles/show.html.erb_spec.rb +3 -3
  279. metadata +91 -109
  280. data/app/policies/user_export_file_policy.rb +0 -21
  281. data/app/policies/user_import_file_policy.rb +0 -21
  282. data/app/policies/user_import_result_policy.rb +0 -21
  283. data/db/migrate/20170114174536_add_profile_id_to_user.rb +0 -5
  284. data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +0 -11
  285. data/spec/dummy/db/migrate/20140529014410_create_item_transitions.rb +0 -15
  286. data/spec/dummy/db/migrate/20141029131633_create_periodicals.rb +0 -11
  287. data/spec/dummy/db/migrate/20150302110310_add_attachment_id_to_manifestation.rb +0 -7
  288. data/spec/dummy/db/migrate/20150304183215_add_picture_id_to_picture_file.rb +0 -7
  289. data/spec/dummy/db/migrate/20150305025906_add_resource_import_id_to_resource_import_file.rb +0 -7
  290. data/spec/dummy/db/migrate/20150305030046_add_resource_export_id_to_resource_export_file.rb +0 -8
  291. data/spec/dummy/db/migrate/20150305031709_add_agent_import_id_to_agent_import_file.rb +0 -7
  292. data/spec/dummy/db/migrate/20150305105231_add_attachment_fingerprint_to_manifestation.rb +0 -5
  293. data/spec/dummy/db/migrate/20150420145354_add_attachment_to_carrier_type.rb +0 -8
  294. data/spec/dummy/db/migrate/20150420145420_add_attachment_to_content_type.rb +0 -8
  295. data/spec/dummy/db/migrate/20151216123621_create_doi_records.rb +0 -12
  296. data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb +0 -12
  297. data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb +0 -12
  298. data/spec/dummy/db/migrate/20160513000929_create_agent_names.rb +0 -18
  299. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +0 -9
  300. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +0 -9
  301. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +0 -9
  302. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +0 -9
  303. data/spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb +0 -5
  304. data/spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb +0 -5
  305. data/spec/dummy/db/migrate/20161111175127_add_attachment_data_to_manifestation.rb +0 -5
  306. data/spec/dummy/db/migrate/20161111193255_add_attachment_data_to_carrier_type.rb +0 -5
  307. data/spec/dummy/db/migrate/20161111193346_add_attachment_data_to_content_type.rb +0 -5
  308. data/spec/dummy/db/migrate/20161112122706_add_attachment_data_to_resource_import_file.rb +0 -5
  309. data/spec/dummy/db/migrate/20161112122750_add_attachment_data_to_resource_export_file.rb +0 -5
  310. data/spec/dummy/db/migrate/20161112122814_add_attachment_data_to_agent_import_file.rb +0 -5
  311. data/spec/dummy/db/migrate/20161114083857_add_image_data_to_picture_file.rb +0 -5
  312. data/spec/dummy/db/migrate/20161115184747_add_attachment_data_to_user_import_file.rb +0 -5
  313. data/spec/dummy/db/migrate/20161115184756_add_attachment_data_to_user_export_file.rb +0 -5
@@ -3,11 +3,11 @@ require 'rails_helper'
3
3
  describe ProfilesController do
4
4
  fixtures :all
5
5
 
6
- describe 'GET index' do
7
- describe 'When logged in as Administrator' do
6
+ describe "GET index" do
7
+ describe "When logged in as Administrator" do
8
8
  login_fixture_admin
9
9
 
10
- it 'assigns all profiles as @profiles' do
10
+ it "assigns all profiles as @profiles" do
11
11
  get :index
12
12
  Sunspot.session.should be_a_search_for(Profile)
13
13
  Sunspot.session.should have_search_params(:fulltext, '')
@@ -15,17 +15,17 @@ describe ProfilesController do
15
15
  end
16
16
  end
17
17
 
18
- describe 'When logged in as Librarian' do
18
+ describe "When logged in as Librarian" do
19
19
  login_fixture_librarian
20
20
 
21
- it 'assigns all profiles as @profiles' do
21
+ it "assigns all profiles as @profiles" do
22
22
  get :index
23
23
  Sunspot.session.should be_a_search_for(Profile)
24
24
  Sunspot.session.should have_search_params(:fulltext, '')
25
25
  assigns(:profiles).should_not be_nil
26
26
  end
27
27
 
28
- it 'should get index with query' do
28
+ it "should get index with query" do
29
29
  get :index, params: { query: 'user1' }
30
30
  response.should be_success
31
31
  Sunspot.session.should be_a_search_for(Profile)
@@ -33,7 +33,7 @@ describe ProfilesController do
33
33
  assigns(:profiles).should_not be_nil
34
34
  end
35
35
 
36
- it 'should get sorted index' do
36
+ it "should get sorted index" do
37
37
  get :index, params: { query: 'user1', sort_by: 'username', order: 'desc' }
38
38
  response.should be_success
39
39
  Sunspot.session.should be_a_search_for(Profile)
@@ -43,18 +43,18 @@ describe ProfilesController do
43
43
  end
44
44
  end
45
45
 
46
- describe 'When logged in as User' do
46
+ describe "When logged in as User" do
47
47
  login_fixture_user
48
48
 
49
- it 'assigns all profiles as @profiles' do
49
+ it "assigns all profiles as @profiles" do
50
50
  get :index
51
51
  assigns(:profiles).should be_nil
52
52
  response.should be_forbidden
53
53
  end
54
54
  end
55
55
 
56
- describe 'When not logged in' do
57
- it 'assigns all profiles as @profiles' do
56
+ describe "When not logged in" do
57
+ it "assigns all profiles as @profiles" do
58
58
  get :index
59
59
  assigns(:profiles).should be_nil
60
60
  response.should redirect_to(new_user_session_url)
@@ -62,51 +62,51 @@ describe ProfilesController do
62
62
  end
63
63
  end
64
64
 
65
- describe 'GET show' do
66
- describe 'When logged in as Administrator' do
65
+ describe "GET show" do
66
+ describe "When logged in as Administrator" do
67
67
  login_fixture_admin
68
68
 
69
- it 'assigns the requested user as @profile' do
69
+ it "assigns the requested user as @profile" do
70
70
  get :show, params: { id: profiles(:admin).id }
71
71
  assigns(:profile).should eq(profiles(:admin))
72
72
  end
73
- it 'assigns the another requested user as @profile' do
74
- admin_profile = FactoryGirl.create :admin_profile
73
+ it "assigns the another requested user as @profile" do
74
+ admin_profile = FactoryBot.create :admin_profile
75
75
  get :show, params: { id: admin_profile.id }
76
76
  expect(response).not_to be_forbidden
77
77
  expect(assigns(:profile)).to eq admin_profile
78
78
  end
79
79
  end
80
80
 
81
- describe 'When logged in as Librarian' do
81
+ describe "When logged in as Librarian" do
82
82
  login_fixture_librarian
83
83
 
84
- it 'assigns the requested user as @profile' do
84
+ it "assigns the requested user as @profile" do
85
85
  get :show, params: { id: profiles(:librarian1).id }
86
86
  assigns(:profile).should eq(profiles(:librarian1))
87
87
  end
88
- it 'should not assign the requested user as @admin' do
89
- admin = FactoryGirl.create(:admin_profile)
88
+ it "should not assign the requested user as @admin" do
89
+ admin = FactoryBot.create(:admin_profile)
90
90
  get :show, params: { id: admin.id }
91
91
  response.should be_forbidden
92
92
  end
93
- it 'should assign the requested user as @librarian' do
94
- librarian = FactoryGirl.create(:librarian_profile)
93
+ it "should assign the requested user as @librarian" do
94
+ librarian = FactoryBot.create(:librarian_profile)
95
95
  get :show, params: { id: librarian.id }
96
96
  response.should_not be_forbidden
97
97
  assigns(:profile).should eq librarian
98
98
  end
99
99
  end
100
100
 
101
- describe 'When logged in as User' do
101
+ describe "When logged in as User" do
102
102
  login_fixture_user
103
103
 
104
- it 'assigns the requested user as @profile' do
104
+ it "assigns the requested user as @profile" do
105
105
  get :show, params: { id: profiles(:user1).id }
106
106
  assigns(:profile).should eq(profiles(:user1))
107
107
  end
108
108
 
109
- it 'should redirect to my user account' do
109
+ it "should redirect to my user account" do
110
110
  get :show, params: { id: profiles(:user1).id }
111
111
  assert_redirected_to my_account_url
112
112
  end
@@ -118,8 +118,8 @@ describe ProfilesController do
118
118
  end
119
119
  end
120
120
 
121
- describe 'When not logged in' do
122
- it 'assigns the requested user as @profile' do
121
+ describe "When not logged in" do
122
+ it "assigns the requested user as @profile" do
123
123
  get :show, params: { id: profiles(:admin).id }
124
124
  assigns(:profile).should eq(profiles(:admin))
125
125
  response.should redirect_to(new_user_session_url)
@@ -127,37 +127,37 @@ describe ProfilesController do
127
127
  end
128
128
  end
129
129
 
130
- describe 'GET new' do
131
- describe 'When logged in as Administrator' do
130
+ describe "GET new" do
131
+ describe "When logged in as Administrator" do
132
132
  login_fixture_admin
133
133
 
134
- it 'assigns the requested user as @profile' do
134
+ it "assigns the requested user as @profile" do
135
135
  get :new
136
136
  assigns(:profile).should_not be_valid
137
137
  end
138
138
  end
139
139
 
140
- describe 'When logged in as Librarian' do
140
+ describe "When logged in as Librarian" do
141
141
  login_fixture_librarian
142
142
 
143
- it 'should not assign the requested user as @profile' do
143
+ it "should not assign the requested user as @profile" do
144
144
  get :new
145
145
  assigns(:profile).should_not be_valid
146
146
  end
147
147
  end
148
148
 
149
- describe 'When logged in as User' do
149
+ describe "When logged in as User" do
150
150
  login_fixture_user
151
151
 
152
- it 'should not assign the requested user as @profile' do
152
+ it "should not assign the requested user as @profile" do
153
153
  get :new
154
154
  assigns(:profile).should be_nil
155
155
  response.should be_forbidden
156
156
  end
157
157
  end
158
158
 
159
- describe 'When not logged in' do
160
- it 'should not assign the requested user as @profile' do
159
+ describe "When not logged in" do
160
+ it "should not assign the requested user as @profile" do
161
161
  get :new
162
162
  assigns(:profile).should be_nil
163
163
  response.should redirect_to(new_user_session_url)
@@ -165,65 +165,65 @@ describe ProfilesController do
165
165
  end
166
166
  end
167
167
 
168
- describe 'GET edit' do
169
- describe 'When logged in as Administrator' do
168
+ describe "GET edit" do
169
+ describe "When logged in as Administrator" do
170
170
  login_fixture_admin
171
171
 
172
- it 'assigns the requested user as @profile' do
173
- profile = FactoryGirl.create(:profile)
172
+ it "assigns the requested user as @profile" do
173
+ profile = FactoryBot.create(:profile)
174
174
  get :edit, params: { id: profile.id }
175
175
  assigns(:profile).should eq(profile)
176
176
  end
177
177
  end
178
178
 
179
- describe 'When logged in as Librarian' do
179
+ describe "When logged in as Librarian" do
180
180
  login_fixture_librarian
181
181
 
182
- it 'should assign the requested user as @profile' do
183
- profile = FactoryGirl.create(:profile)
182
+ it "should assign the requested user as @profile" do
183
+ profile = FactoryBot.create(:profile)
184
184
  get :edit, params: { id: profile.id }
185
185
  assigns(:profile).should eq(profile)
186
186
  end
187
- it 'should not get edit page for admin required user' do
188
- admin = FactoryGirl.create(:admin_profile)
187
+ it "should not get edit page for admin required user" do
188
+ admin = FactoryBot.create(:admin_profile)
189
189
  get :edit, params: { id: admin.id }
190
190
  response.should be_forbidden
191
191
  # assigns(:profile).should_not eq(admin)
192
192
  end
193
- it 'should get edit page for other librarian user' do
194
- librarian = FactoryGirl.create(:librarian_profile)
193
+ it "should get edit page for other librarian user" do
194
+ librarian = FactoryBot.create(:librarian_profile)
195
195
  get :edit, params: { id: librarian.id }
196
196
  response.should_not be_forbidden
197
197
  assigns(:profile).should eq librarian
198
198
  end
199
199
 
200
- it 'should get edit page for other librarian user' do
201
- admin = FactoryGirl.create(:admin_profile, required_role_id: Role.where(name: 'Librarian').first.id)
200
+ it "should get edit page for other librarian user" do
201
+ admin = FactoryBot.create(:admin_profile, required_role_id: Role.where(name: 'Librarian').first.id)
202
202
  get :edit, params: { id: admin.id }
203
203
  response.should be_forbidden
204
204
  assigns(:profile).should eq admin
205
205
  end
206
206
  end
207
207
 
208
- describe 'When logged in as User' do
208
+ describe "When logged in as User" do
209
209
  login_fixture_user
210
210
 
211
- it 'should not assign the requested user as @profile' do
212
- profile = FactoryGirl.create(:profile)
211
+ it "should not assign the requested user as @profile" do
212
+ profile = FactoryBot.create(:profile)
213
213
  get :edit, params: { id: profile.id }
214
214
  assigns(:profile).should eq(profile)
215
215
  response.should be_forbidden
216
216
  end
217
217
 
218
- it 'should edit myself' do
218
+ it "should edit myself" do
219
219
  get :edit, params: { id: profiles(:user1).id }
220
220
  response.should redirect_to edit_my_account_url
221
221
  end
222
222
  end
223
223
 
224
- describe 'When not logged in' do
225
- it 'should not assign the requested user as @profile' do
226
- profile = FactoryGirl.create(:profile)
224
+ describe "When not logged in" do
225
+ it "should not assign the requested user as @profile" do
226
+ profile = FactoryBot.create(:profile)
227
227
  get :edit, params: { id: profile.id }
228
228
  assigns(:profile).should eq(profile)
229
229
  response.should redirect_to(new_user_session_url)
@@ -231,122 +231,122 @@ describe ProfilesController do
231
231
  end
232
232
  end
233
233
 
234
- describe 'POST create' do
234
+ describe "POST create" do
235
235
  before(:each) do
236
- @attrs = FactoryGirl.attributes_for(:profile)
236
+ @attrs = FactoryBot.attributes_for(:profile)
237
237
  @invalid_attrs = { user_group_id: '', user_number: '日本語' }
238
238
  end
239
239
 
240
- describe 'When logged in as Administrator' do
240
+ describe "When logged in as Administrator" do
241
241
  login_fixture_admin
242
242
 
243
- describe 'with valid params' do
244
- it 'assigns a newly created user as @profile' do
243
+ describe "with valid params" do
244
+ it "assigns a newly created user as @profile" do
245
245
  post :create, params: { profile: @attrs }
246
246
  assigns(:profile).should be_valid
247
247
  end
248
248
 
249
- it 'redirects to the created user' do
249
+ it "redirects to the created user" do
250
250
  post :create, params: { profile: @attrs }
251
251
  response.should redirect_to(profile_url(assigns(:profile)))
252
252
  end
253
253
  end
254
254
 
255
- describe 'with invalid params' do
256
- it 'assigns a newly created but unsaved user as @profile' do
255
+ describe "with invalid params" do
256
+ it "assigns a newly created but unsaved user as @profile" do
257
257
  post :create, params: { profile: @invalid_attrs }
258
258
  assigns(:profile).should_not be_valid
259
259
  end
260
260
 
261
261
  it "re-renders the 'new' template" do
262
262
  post :create, params: { profile: @invalid_attrs }
263
- response.should render_template('new')
263
+ response.should render_template("new")
264
264
  end
265
265
  end
266
266
  end
267
267
 
268
- describe 'When logged in as Librarian' do
268
+ describe "When logged in as Librarian" do
269
269
  login_fixture_librarian
270
270
 
271
- describe 'with valid params' do
272
- it 'assigns a newly created user as @profile' do
271
+ describe "with valid params" do
272
+ it "assigns a newly created user as @profile" do
273
273
  post :create, params: { profile: @attrs }
274
274
  assigns(:profile).should be_valid
275
275
  end
276
276
 
277
- it 'redirects to the created user' do
277
+ it "redirects to the created user" do
278
278
  post :create, params: { profile: @attrs }
279
279
  response.should redirect_to(profile_url(assigns(:profile)))
280
280
  end
281
281
  end
282
282
 
283
- describe 'with invalid params' do
284
- it 'assigns a newly created but unsaved user as @profile' do
283
+ describe "with invalid params" do
284
+ it "assigns a newly created but unsaved user as @profile" do
285
285
  post :create, params: { profile: @invalid_attrs }
286
286
  assigns(:profile).should_not be_valid
287
287
  end
288
288
 
289
289
  it "re-renders the 'new' template" do
290
290
  post :create, params: { profile: @invalid_attrs }
291
- response.should render_template('new')
291
+ response.should render_template("new")
292
292
  end
293
293
  end
294
294
  end
295
295
 
296
- describe 'When logged in as User' do
296
+ describe "When logged in as User" do
297
297
  login_fixture_user
298
298
 
299
- it 'should not create user' do
299
+ it "should not create user" do
300
300
  post :create, params: { profile: { username: 'test10' } }
301
301
  assigns(:profile).should be_nil
302
302
  response.should be_forbidden
303
303
  end
304
304
  end
305
305
 
306
- describe 'When not logged in' do
307
- it 'should not create user' do
306
+ describe "When not logged in" do
307
+ it "should not create user" do
308
308
  post :create, params: { profile: { username: 'test10' } }
309
309
  response.should redirect_to new_user_session_url
310
310
  end
311
311
  end
312
312
  end
313
313
 
314
- describe 'PUT update' do
314
+ describe "PUT update" do
315
315
  before(:each) do
316
316
  @profile = profiles(:user1)
317
- @attrs = { user_group_id: user_groups(:user_group_00003).id, locale: 'en' }
317
+ @attrs = { user_group_id: '3', locale: 'en' }
318
318
  @invalid_attrs = { user_group_id: '', user_number: '日本語' }
319
319
  end
320
320
 
321
- describe 'When logged in as Administrator' do
321
+ describe "When logged in as Administrator" do
322
322
  login_fixture_admin
323
323
 
324
- describe 'with valid params' do
325
- it 'updates the requested user' do
324
+ describe "with valid params" do
325
+ it "updates the requested user" do
326
326
  put :update, params: { id: @profile.id, profile: @attrs }
327
327
  end
328
328
 
329
- it 'assigns the requested user as @profile' do
329
+ it "assigns the requested user as @profile" do
330
330
  put :update, params: { id: @profile.id, profile: @attrs }
331
331
  assigns(:profile).should eq(@profile)
332
332
  end
333
333
 
334
- it 'redirects to the user' do
334
+ it "redirects to the user" do
335
335
  put :update, params: { id: @profile.id, profile: @attrs }
336
336
  assigns(:profile).should eq(@profile)
337
337
  response.should redirect_to(@profile)
338
338
  end
339
339
  end
340
340
 
341
- describe 'with invalid params' do
342
- it 'assigns the requested user as @profile' do
341
+ describe "with invalid params" do
342
+ it "assigns the requested user as @profile" do
343
343
  put :update, params: { id: @profile.id, profile: @invalid_attrs }
344
344
  assigns(:profile).should eq(@profile)
345
345
  end
346
346
 
347
347
  it "re-renders the 'edit' template" do
348
348
  put :update, params: { id: @profile, profile: @invalid_attrs }
349
- response.should render_template('edit')
349
+ response.should render_template("edit")
350
350
  end
351
351
  end
352
352
 
@@ -358,56 +358,56 @@ describe ProfilesController do
358
358
  end
359
359
  end
360
360
 
361
- describe 'When logged in as Librarian' do
361
+ describe "When logged in as Librarian" do
362
362
  login_fixture_librarian
363
363
 
364
- describe 'with valid params' do
365
- it 'updates the requested user' do
364
+ describe "with valid params" do
365
+ it "updates the requested user" do
366
366
  put :update, params: { id: @profile.id, profile: @attrs }
367
367
  end
368
368
 
369
- it 'assigns the requested user as @profile' do
369
+ it "assigns the requested user as @profile" do
370
370
  put :update, params: { id: @profile.id, profile: @attrs }
371
371
  assigns(:profile).should eq(@profile)
372
372
  end
373
373
 
374
- it 'redirects to the user' do
374
+ it "redirects to the user" do
375
375
  put :update, params: { id: @profile.id, profile: @attrs }
376
376
  assigns(:profile).should eq(@profile)
377
377
  response.should redirect_to(@profile)
378
378
  end
379
379
  end
380
380
 
381
- describe 'with invalid params' do
382
- it 'assigns the user as @profile' do
381
+ describe "with invalid params" do
382
+ it "assigns the user as @profile" do
383
383
  put :update, params: { id: @profile, profile: @invalid_attrs }
384
384
  assigns(:profile).should_not be_valid
385
385
  end
386
386
 
387
387
  it "re-renders the 'edit' template" do
388
388
  put :update, params: { id: @profile, profile: @invalid_attrs }
389
- response.should render_template('edit')
389
+ response.should render_template("edit")
390
390
  end
391
391
  end
392
392
 
393
- it 'should update other user' do
394
- put :update, params: { id: profiles(:user1).id, profile: { user_number: '00003', locale: 'en', user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test' } }
393
+ it "should update other user" do
394
+ put :update, params: { id: profiles(:user1).id, profile: { user_number: '00003', locale: 'en', user_group_id: 3, library_id: 3, note: 'test' } }
395
395
  response.should redirect_to profile_url(assigns(:profile))
396
396
  end
397
397
 
398
- it 'should not update other admin' do
399
- put :update, params: { id: profiles(:admin).id, profile: { user_number: '00003', locale: 'en', user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test' } }
398
+ it "should not update other admin" do
399
+ put :update, params: { id: profiles(:admin).id, profile: { user_number: '00003', locale: 'en', user_group_id: 3, library_id: 3, note: 'test' } }
400
400
  response.should be_forbidden
401
401
  end
402
402
 
403
403
  it "should update other user's user_group" do
404
- put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, locale: 'en' } }
404
+ put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3, locale: 'en' } }
405
405
  response.should redirect_to profile_url(assigns(:profile))
406
- assigns(:profile).user_group_id.should eq user_groups(:user_group_00003).id
406
+ assigns(:profile).user_group_id.should eq 3
407
407
  end
408
408
 
409
409
  it "should update other user's note" do
410
- put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test', locale: 'en' } }
410
+ put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3, note: 'test', locale: 'en' } }
411
411
  response.should redirect_to profile_url(assigns(:profile))
412
412
  assert_equal assigns(:profile).note, 'test'
413
413
  end
@@ -420,23 +420,23 @@ describe ProfilesController do
420
420
  end
421
421
  end
422
422
 
423
- describe 'When logged in as User' do
423
+ describe "When logged in as User" do
424
424
  login_fixture_user
425
425
 
426
- describe 'with valid params' do
427
- it 'updates the requested user' do
426
+ describe "with valid params" do
427
+ it "updates the requested user" do
428
428
  put :update, params: { id: @profile.id, profile: @attrs }
429
429
  end
430
430
 
431
- it 'assigns the requested user as @profile' do
431
+ it "assigns the requested user as @profile" do
432
432
  put :update, params: { id: @profile.id, profile: @attrs }
433
433
  assigns(:profile).should be_valid
434
434
  response.should redirect_to profile_url(assigns(:profile))
435
435
  end
436
436
  end
437
437
 
438
- describe 'with invalid params' do
439
- it 'assigns the requested user as @profile' do
438
+ describe "with invalid params" do
439
+ it "assigns the requested user as @profile" do
440
440
  put :update, params: { id: @profile.id, profile: @invalid_attrs }
441
441
  # assigns(:profile).should_not be_valid
442
442
  # response.should be_success
@@ -445,57 +445,57 @@ describe ProfilesController do
445
445
  end
446
446
  end
447
447
 
448
- it 'should update myself' do
448
+ it "should update myself" do
449
449
  put :update, params: { id: profiles(:user1).id, profile: { keyword_list: 'test' } }
450
450
  response.should redirect_to profile_url(assigns(:profile))
451
451
  end
452
452
 
453
- it 'should not update my role' do
453
+ it "should not update my role" do
454
454
  put :update, params: { id: profiles(:user1).id, profile: { user_has_role_attributes: { role_id: 4 } } }
455
455
  response.should redirect_to profile_url(assigns(:profile))
456
456
  assigns(:profile).user.role.should_not eq Role.where(name: 'Administrator').first
457
457
  end
458
458
 
459
- it 'should not update my user_group' do
460
- put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id } }
459
+ it "should not update my user_group" do
460
+ put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3 } }
461
461
  response.should redirect_to profile_url(assigns(:profile))
462
- assigns(:profile).user_group_id.should eq user_groups(:user_group_00001).id
462
+ assigns(:profile).user_group_id.should eq 1
463
463
  end
464
464
 
465
- it 'should not update my note' do
466
- put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test' } }
465
+ it "should not update my note" do
466
+ put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3, note: 'test' } }
467
467
  response.should redirect_to profile_url(assigns(:profile))
468
468
  assigns(:profile).note.should be_nil
469
469
  end
470
470
 
471
- it 'should update my keyword_list' do
471
+ it "should update my keyword_list" do
472
472
  put :update, params: { id: profiles(:user1).id, profile: { keyword_list: 'test' } }
473
473
  response.should redirect_to profile_url(assigns(:profile))
474
474
  assigns(:profile).keyword_list.should eq 'test'
475
475
  assigns(:profile).user.role.name.should eq 'User'
476
476
  end
477
477
 
478
- it 'should not update other user' do
478
+ it "should not update other user" do
479
479
  put :update, params: { id: profiles(:user2).id, profile: {} }
480
480
  assigns(:profile).should be_valid
481
481
  response.should be_forbidden
482
482
  end
483
483
  end
484
484
 
485
- describe 'When not logged in' do
486
- describe 'with valid params' do
487
- it 'updates the requested user' do
485
+ describe "When not logged in" do
486
+ describe "with valid params" do
487
+ it "updates the requested user" do
488
488
  put :update, params: { id: @profile.id, profile: @attrs }
489
489
  end
490
490
 
491
- it 'should be forbidden' do
491
+ it "should be forbidden" do
492
492
  put :update, params: { id: @profile.id, profile: @attrs }
493
493
  response.should redirect_to(new_user_session_url)
494
494
  end
495
495
  end
496
496
 
497
- describe 'with invalid params' do
498
- it 'assigns the requested user as @profile' do
497
+ describe "with invalid params" do
498
+ it "assigns the requested user as @profile" do
499
499
  put :update, params: { id: @profile.id, profile: @invalid_attrs }
500
500
  response.should redirect_to(new_user_session_url)
501
501
  end
@@ -503,89 +503,86 @@ describe ProfilesController do
503
503
  end
504
504
  end
505
505
 
506
- describe 'DELETE destroy' do
507
- before(:each) do
508
- @profile = FactoryGirl.create(:profile)
509
- end
510
-
511
- describe 'When logged in as Administrator' do
506
+ describe "DELETE destroy" do
507
+ describe "When logged in as Administrator" do
512
508
  login_fixture_admin
513
509
 
514
- it 'destroys the requested user' do
515
- delete :destroy, params: { id: @profile.id }
510
+ it "destroys the requested user" do
511
+ delete :destroy, params: { id: profiles(:user2).id }
516
512
  end
517
513
 
518
- it 'redirects to the profiles list' do
519
- delete :destroy, params: { id: @profile.id }
514
+ it "redirects to the profiles list" do
515
+ delete :destroy, params: { id: profiles(:user2).id }
520
516
  response.should redirect_to(profiles_url)
521
517
  end
522
518
 
523
- it 'should destroy librarian' do
524
- delete :destroy, params: { id: FactoryGirl.create(:librarian).profile.id }
519
+ it "should destroy librarian" do
520
+ delete :destroy, params: { id: profiles(:librarian2).id }
525
521
  response.should redirect_to(profiles_url)
526
522
  end
527
523
  end
528
524
 
529
- describe 'When logged in as Librarian' do
525
+ describe "When logged in as Librarian" do
530
526
  login_fixture_librarian
531
527
 
532
- it 'destroys the requested user' do
533
- delete :destroy, params: { id: @profile.id }
528
+ it "destroys the requested user" do
529
+ delete :destroy, params: { id: profiles(:user2).id }
534
530
  response.should redirect_to(profiles_url)
535
531
  end
536
532
 
537
- it 'redirects to the profiles list' do
538
- delete :destroy, params: { id: @profile.id }
533
+ it "redirects to the profiles list" do
534
+ delete :destroy, params: { id: profiles(:user2).id }
539
535
  response.should redirect_to(profiles_url)
540
536
  end
541
537
 
542
- it 'should not destroy librarian' do
543
- delete :destroy, params: { id: FactoryGirl.create(:librarian_profile).id }
538
+ it "should not destroy librarian" do
539
+ delete :destroy, params: { id: profiles(:librarian2).id }
544
540
  response.should be_forbidden
545
541
  end
546
542
 
547
- it 'should not destroy admin' do
543
+ it "should not destroy admin" do
548
544
  delete :destroy, params: { id: profiles(:admin).id }
549
545
  response.should be_forbidden
550
546
  end
551
547
 
552
- it 'should not destroy myself' do
548
+ it "should not destroy myself" do
553
549
  delete :destroy, params: { id: profiles(:librarian1).id }
554
550
  response.should be_forbidden
555
551
  end
556
552
 
557
- it 'should not be able to delete other librarian user' do
558
- delete :destroy, params: { id: FactoryGirl.create(:librarian_profile).id }
553
+ it "should not be able to delete other librarian user" do
554
+ librarian = FactoryBot.create(:librarian_profile)
555
+ delete :destroy, params: { id: librarian.id }
559
556
  response.should be_forbidden
560
557
  end
561
558
  end
562
559
 
563
- describe 'When logged in as User' do
560
+ describe "When logged in as User" do
564
561
  login_fixture_user
565
562
 
566
- it 'destroys the requested user' do
567
- delete :destroy, params: { id: @profile.id }
563
+ it "destroys the requested user" do
564
+ delete :destroy, params: { id: profiles(:user2).id }
568
565
  end
569
566
 
570
- it 'should be forbidden' do
571
- delete :destroy, params: { id: @profile.id }
567
+ it "should be forbidden" do
568
+ delete :destroy, params: { id: profiles(:user2).id }
572
569
  response.should be_forbidden
573
570
  end
574
571
 
575
- it 'should not destroy myself' do
572
+ it "should not destroy myself" do
576
573
  delete :destroy, params: { id: profiles(:user1).id }
577
574
  response.should be_forbidden
578
575
  end
579
576
  end
580
577
 
581
- describe 'When not logged in' do
582
- it 'destroys the requested user' do
583
- delete :destroy, params: { id: @profile.id }
578
+ describe "When not logged in" do
579
+ it "destroys the requested user" do
580
+ delete :destroy, params: { id: profiles(:user2).id }
584
581
  response.should redirect_to(new_user_session_url)
585
582
  end
586
583
 
587
- it 'should be forbidden' do
588
- delete :destroy, params: { id: @profile.id }
584
+ it "should be forbidden" do
585
+ delete :destroy, params: { id: profiles(:user2).id }
589
586
  response.should redirect_to(new_user_session_url)
590
587
  end
591
588
  end