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
@@ -1,50 +1,40 @@
1
1
  ---
2
2
  user_group_00001:
3
3
  name: not_specified
4
- display_name_translations: {"en": "(not specified)", "ja": "不明"}
4
+ display_name: (not specified)
5
5
  updated_at: 2007-12-13 21:00:51.564542 +09:00
6
- id: bcb18f9e-1272-41a3-8011-0fc757553d78
6
+ id: 1
7
7
  note: ""
8
8
  created_at: 2007-12-13 21:00:01.674976 +09:00
9
9
  position: 1
10
- valid_period_for_new_user: 0
11
- number_of_day_to_notify_due_date: 2
12
10
  user_group_00002:
13
11
  name: user
14
- display_name_translations: {"en": "User", "ja": "利用者"}
12
+ display_name: User
15
13
  updated_at: 2007-12-23 03:14:56.836548 +09:00
16
- id: 40e0516e-30a5-4363-b5cf-f35aada5d050
14
+ id: 2
17
15
  note: ""
18
16
  created_at: 2007-12-23 03:14:40.173954 +09:00
19
17
  position: 2
20
- valid_period_for_new_user: 365
21
- number_of_day_to_notify_overdue: 30
22
- number_of_time_to_notify_overdue: 6
23
18
  user_group_00003:
24
19
  name: faculty
25
- display_name_translations: {"en": "Faculty", "ja": "教職員"}
20
+ display_name: Faculty
26
21
  updated_at: 2007-12-23 03:15:05.134351 +09:00
27
- id: 44882e36-86cd-4bf3-aba3-6298b472a76f
22
+ id: 3
28
23
  note: ""
29
24
  created_at: 2007-12-23 03:15:05.126457 +09:00
30
25
  position: 3
31
- valid_period_for_new_user: 730
32
26
 
33
27
  # == Schema Information
34
28
  #
35
29
  # Table name: user_groups
36
30
  #
37
- # id :uuid not null, primary key
31
+ # id :integer not null, primary key
38
32
  # name :string
39
- # display_name_translations :jsonb
33
+ # display_name :text
40
34
  # note :text
41
35
  # position :integer
42
- # created_at :datetime not null
43
- # updated_at :datetime not null
36
+ # created_at :datetime
37
+ # updated_at :datetime
44
38
  # deleted_at :datetime
45
- # valid_period_for_new_user :integer default(0), not null
46
39
  # expired_at :datetime
47
- # number_of_day_to_notify_overdue :integer default(1), not null
48
- # number_of_day_to_notify_due_date :integer default(7), not null
49
- # number_of_time_to_notify_overdue :integer default(3), not null
50
40
  #
@@ -35,6 +35,6 @@ user4:
35
35
  # id :integer not null, primary key
36
36
  # user_id :integer not null
37
37
  # role_id :integer not null
38
- # created_at :datetime not null
39
- # updated_at :datetime not null
38
+ # created_at :datetime
39
+ # updated_at :datetime
40
40
  #
@@ -6,7 +6,6 @@ admin:
6
6
  username: enjuadmin
7
7
  email: tanabe@kamata.lib.teu.ac.jp
8
8
  created_at: 2007-11-19 16:58:32.111941 +09:00
9
- profile_id: 30ab045a-3b92-45bf-baba-0c74ed19ea94
10
9
  librarian1:
11
10
  updated_at: 2008-05-31 12:41:16.337474 +09:00
12
11
  encrypted_password: $2a$10$9O2VuTccN4gHq36ARg0QReSrb1D7WrBBhZZ759RM9moHbB0W5zCzS
@@ -14,7 +13,6 @@ librarian1:
14
13
  username: librarian1
15
14
  email: librarian1@kamata.lib.teu.ac.jp
16
15
  created_at: 2007-11-19 16:58:33.172441 +09:00
17
- profile_id: 2d4405c1-a6c3-4439-95f5-694e6e7ed7db
18
16
  user1:
19
17
  updated_at: 2008-05-31 13:02:25.101261 +09:00
20
18
  encrypted_password: $2a$10$JthS59A0BNkDOoFpCXM0V.GhhffKaoWKbzpPahYp/vTFrOyM7h/uW
@@ -22,7 +20,6 @@ user1:
22
20
  username: user1
23
21
  email: user1@kamata.lib.teu.ac.jp
24
22
  created_at: 2007-11-19 16:58:34.637413 +09:00
25
- profile_id: e6082def-74e9-43ad-bdab-8f77f9eaeec8
26
23
  librarian2:
27
24
  updated_at: 2008-05-31 12:42:23.340575 +09:00
28
25
  encrypted_password: $2a$10$YmmTGrYQ1Ir6oc7wXnp.GuNeO1eYLoP3sv8wMSIrTdaGw2BPwRrpS
@@ -30,7 +27,6 @@ librarian2:
30
27
  username: librarian2
31
28
  email: librarian2@library.example.jp
32
29
  created_at: 2008-01-18 12:24:04.222344 +09:00
33
- profile_id: 2fe27c18-98f8-4cd5-ba2f-293dbb43e8a6
34
30
  user2:
35
31
  updated_at: 2008-05-31 12:42:44.711117 +09:00
36
32
  encrypted_password: $2a$10$i7UjJhLVrJM/J7qaTwW39OXw1NiwowUEbtNHVDV0sqMLjX9.UO9ca
@@ -38,7 +34,6 @@ user2:
38
34
  username: user2
39
35
  email: user2@library.example.jp
40
36
  created_at: 2008-01-18 13:29:06.922728 +09:00
41
- profile_id: e832240e-afac-437c-bf50-29aaeed00967
42
37
  user3:
43
38
  updated_at: 2008-05-31 13:02:25.101261 +09:00
44
39
  encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
@@ -46,7 +41,6 @@ user3:
46
41
  username: user3
47
42
  email: user3@kamata.lib.teu.ac.jp
48
43
  created_at: 2007-11-19 16:58:34.637413 +09:00
49
- profile_id: 15e47edb-a9db-4cc4-92f2-58078a1a2510
50
44
  user4:
51
45
  updated_at: 2008-05-31 13:02:25.101261 +09:00
52
46
  encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
@@ -55,4 +49,3 @@ user4:
55
49
  email: user4@kamata.lib.teu.ac.jp
56
50
  created_at: 2007-11-19 16:58:34.637413 +09:00
57
51
  locked_at: <%= 1.day.ago.to_s(:db) %>
58
- profile_id: e77d4f87-4beb-42c8-ad9e-e99a59740512
@@ -1,69 +1,69 @@
1
1
  require 'rails_helper'
2
2
 
3
3
  describe Profile do
4
- # pending "add some examples to (or delete) #{__FILE__}"
4
+ #pending "add some examples to (or delete) #{__FILE__}"
5
5
  fixtures :all
6
6
 
7
7
  it 'should create a profile' do
8
- FactoryGirl.create(:profile)
8
+ FactoryBot.create(:profile)
9
9
  end
10
10
 
11
11
  it 'should destroy a profile' do
12
- profile = FactoryGirl.create(:profile)
12
+ profile = FactoryBot.create(:profile)
13
13
  profile.destroy.should be_truthy
14
14
  end
15
15
 
16
16
  it 'should not set expired_at if its user group does not have valid period' do
17
- profile = FactoryGirl.build(:profile, user_group_id: '')
17
+ profile = FactoryBot.create(:profile)
18
18
  profile.expired_at.should be_nil
19
19
  end
20
20
 
21
21
  it 'should set expired_at if its user group has valid period' do
22
- profile = FactoryGirl.build(:profile)
23
- user_group = FactoryGirl.create(:user_group, valid_period_for_new_user: 10)
22
+ profile = FactoryBot.build(:profile)
23
+ user_group = FactoryBot.create(:user_group, valid_period_for_new_user: 10)
24
24
  user_group.profiles << profile
25
25
  profile.user_group.valid_period_for_new_user.should eq 10
26
26
  profile.expired_at.should eq 10.days.from_now.end_of_day
27
27
  end
28
28
 
29
- it 'should create profile' do
30
- profile = FactoryGirl.create(:profile)
31
- assert !profile.new_record?, profile.errors.full_messages.to_sentence.to_s
29
+ it "should create profile" do
30
+ profile = FactoryBot.create(:profile)
31
+ assert !profile.new_record?, "#{profile.errors.full_messages.to_sentence}"
32
32
  end
33
33
 
34
- it 'should create profile with empty user_number' do
35
- profile1 = FactoryGirl.create(:profile, user_number: '')
36
- profile2 = FactoryGirl.create(:profile, user_number: '')
34
+ it "should create profile with empty user_number" do
35
+ profile1 = FactoryBot.create(:profile, user_number: "")
36
+ profile2 = FactoryBot.create(:profile, user_number: "")
37
37
  profile1.should be_valid
38
38
  profile2.should be_valid
39
39
  end
40
40
 
41
41
  if defined?(EnjuQuestion)
42
- it 'should reset answer_feed_token' do
42
+ it "should reset answer_feed_token" do
43
43
  profiles(:user1).reset_answer_feed_token
44
44
  profiles(:user1).answer_feed_token.should be_truthy
45
45
  end
46
46
 
47
- it 'should delete answer_feed_token' do
47
+ it "should delete answer_feed_token" do
48
48
  profiles(:user1).delete_answer_feed_token
49
49
  profiles(:user1).answer_feed_token.should be_nil
50
50
  end
51
51
  end
52
52
 
53
53
  if defined?(EnjuCirculation)
54
- it 'should reset checkout_icalendar_token' do
54
+ it "should reset checkout_icalendar_token" do
55
55
  profiles(:user1).reset_checkout_icalendar_token
56
56
  profiles(:user1).checkout_icalendar_token.should be_truthy
57
57
  end
58
58
 
59
- it 'should delete checkout_icalendar_token' do
59
+ it "should delete checkout_icalendar_token" do
60
60
  profiles(:user1).delete_checkout_icalendar_token
61
61
  profiles(:user1).checkout_icalendar_token.should be_nil
62
62
  end
63
63
  end
64
64
 
65
65
  if defined?(EnjuCirculation)
66
- it 'should send_message' do
66
+ it "should send_message" do
67
67
  assert profiles(:librarian1).user.send_message('reservation_expired_for_patron', manifestations: profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.collect(&:manifestation))
68
68
  profiles(:librarian1).reload
69
69
  profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.should be_empty
@@ -75,17 +75,18 @@ end
75
75
  #
76
76
  # Table name: profiles
77
77
  #
78
- # id :uuid not null, primary key
79
- # user_group_id :uuid
80
- # library_id :uuid
78
+ # id :integer not null, primary key
79
+ # user_id :integer
80
+ # user_group_id :integer
81
+ # library_id :integer
81
82
  # locale :string
82
83
  # user_number :string
83
84
  # full_name :text
84
85
  # note :text
85
86
  # keyword_list :text
86
87
  # required_role_id :integer
87
- # created_at :datetime not null
88
- # updated_at :datetime not null
88
+ # created_at :datetime
89
+ # updated_at :datetime
89
90
  # checkout_icalendar_token :string
90
91
  # save_checkout_history :boolean default(FALSE), not null
91
92
  # expired_at :datetime
@@ -1,25 +1,26 @@
1
- require 'rails_helper'
1
+ # -*- encoding: utf-8 -*-
2
+ require 'spec_helper'
2
3
 
3
4
  describe Role do
4
- # pending "add some examples to (or delete) #{__FILE__}"
5
+ #pending "add some examples to (or delete) #{__FILE__}"
5
6
  fixtures :roles
6
7
 
7
- it 'should not be saved if name is blank' do
8
+ it "should not be saved if name is blank" do
8
9
  role = Role.first
9
10
  role.name = ''
10
- -> { role.save! }.should raise_error(ActiveRecord::RecordInvalid)
11
+ lambda{role.save!}.should raise_error(ActiveRecord::RecordInvalid)
11
12
  end
12
13
 
13
- it 'should not be saved if name is not unique' do
14
+ it "should not be saved if name is not unique" do
14
15
  role = Role.first
15
- -> { Role.create!(name: role.name) }.should raise_error(ActiveRecord::RecordInvalid)
16
+ lambda{Role.create!(name: role.name)}.should raise_error(ActiveRecord::RecordInvalid)
16
17
  end
17
18
 
18
- it 'should respond to localized_name' do
19
- roles(:role_00001).display_name.should eq 'Guest'
19
+ it "should respond to localized_name" do
20
+ roles(:role_00001).localized_name.should eq 'Guest'
20
21
  end
21
22
 
22
- it 'should respond to default_role' do
23
+ it "should respond to default_role" do
23
24
  Role.default_role.should eq roles(:role_00001)
24
25
  end
25
26
  end
@@ -28,12 +29,12 @@ end
28
29
  #
29
30
  # Table name: roles
30
31
  #
31
- # id :integer not null, primary key
32
- # name :string not null
33
- # display_name_translations :jsonb
34
- # note :text
35
- # created_at :datetime not null
36
- # updated_at :datetime not null
37
- # score :integer default(0), not null
38
- # position :integer
32
+ # id :integer not null, primary key
33
+ # name :string not null
34
+ # display_name :string
35
+ # note :text
36
+ # created_at :datetime
37
+ # updated_at :datetime
38
+ # score :integer default(0), not null
39
+ # position :integer
39
40
  #
@@ -1,7 +1,9 @@
1
- require 'rails_helper'
1
+ # -*- encoding: utf-8 -*-
2
+ require 'spec_helper'
2
3
 
3
4
  describe UserHasRole do
4
- # pending "add some examples to (or delete) #{__FILE__}"
5
+ #pending "add some examples to (or delete) #{__FILE__}"
6
+
5
7
  end
6
8
 
7
9
  # == Schema Information
@@ -11,6 +13,6 @@ end
11
13
  # id :integer not null, primary key
12
14
  # user_id :integer not null
13
15
  # role_id :integer not null
14
- # created_at :datetime not null
15
- # updated_at :datetime not null
16
+ # created_at :datetime
17
+ # updated_at :datetime
16
18
  #
@@ -1,85 +1,86 @@
1
+ # -*- encoding: utf-8 -*-
1
2
  require 'rails_helper'
2
3
 
3
4
  describe User do
4
- # pending "add some examples to (or delete) #{__FILE__}"
5
+ #pending "add some examples to (or delete) #{__FILE__}"
5
6
  fixtures :all
6
7
 
7
8
  it 'should create an user' do
8
- FactoryGirl.create(:user)
9
+ FactoryBot.create(:user)
9
10
  end
10
11
 
11
12
  it 'should destroy an user' do
12
- user = FactoryGirl.create(:user)
13
+ user = FactoryBot.create(:user)
13
14
  user.destroy.should be_truthy
14
15
  end
15
16
 
16
17
  it 'should respond to has_role(Administrator)' do
17
- admin = FactoryGirl.create(:admin)
18
+ admin = FactoryBot.create(:admin)
18
19
  admin.has_role?('Administrator').should be_truthy
19
20
  end
20
21
 
21
22
  it 'should respond to has_role(Librarian)' do
22
- librarian = FactoryGirl.create(:librarian)
23
+ librarian = FactoryBot.create(:librarian)
23
24
  librarian.has_role?('Administrator').should be_falsy
24
25
  librarian.has_role?('Librarian').should be_truthy
25
26
  librarian.has_role?('User').should be_truthy
26
27
  end
27
28
 
28
29
  it 'should respond to has_role(User)' do
29
- user = FactoryGirl.create(:user)
30
+ user = FactoryBot.create(:user)
30
31
  user.has_role?('Administrator').should be_falsy
31
32
  user.has_role?('Librarian').should be_falsy
32
33
  user.has_role?('User').should be_truthy
33
34
  end
34
35
 
35
36
  it 'should lock an user' do
36
- user = FactoryGirl.create(:user)
37
+ user = FactoryBot.create(:user)
37
38
  user.locked = '1'
38
39
  user.save
39
40
  user.active_for_authentication?.should be_falsy
40
41
  end
41
42
 
42
43
  it 'should unlock an user' do
43
- user = FactoryGirl.create(:user)
44
+ user = FactoryBot.create(:user)
44
45
  user.lock_access!
45
46
  user.locked = '0'
46
47
  user.save
47
48
  user.active_for_authentication?.should be_truthy
48
49
  end
49
50
 
50
- it 'should create user' do
51
- user = FactoryGirl.create(:user)
52
- assert !user.new_record?, user.errors.full_messages.to_sentence.to_s
51
+ it "should create user" do
52
+ user = FactoryBot.create(:user)
53
+ assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
53
54
  end
54
55
 
55
- it 'should require username' do
56
+ it "should require username" do
56
57
  old_count = User.count
57
- user = FactoryGirl.build(:user, username: nil)
58
+ user = FactoryBot.build(:user, username: nil)
58
59
  user.save
59
60
  user.errors[:username].should be_truthy
60
61
  User.count.should eq old_count
61
62
  end
62
63
 
63
- it 'should require password' do
64
- user = FactoryGirl.build(:user, password: nil)
64
+ it "should require password" do
65
+ user = FactoryBot.build(:user, password: nil)
65
66
  user.save
66
67
  user.errors[:password].should be_truthy
67
68
  end
68
69
 
69
- it 'should not require password_confirmation on create' do
70
- user = FactoryGirl.build(:user, password: 'new_password', password_confirmation: nil)
70
+ it "should not require password_confirmation on create" do
71
+ user = FactoryBot.build(:user, password: 'new_password', password_confirmation: nil)
71
72
  user.save
72
73
  user.errors[:email].should be_empty
73
74
  end
74
75
 
75
- it 'should reset password' do
76
+ it "should reset password" do
76
77
  users(:user1).password = 'new password'
77
78
  users(:user1).password_confirmation = 'new password'
78
79
  users(:user1).save
79
80
  users(:user1).valid_password?('new password').should be_truthy
80
81
  end
81
82
 
82
- it 'should set temporary_password' do
83
+ it "should set temporary_password" do
83
84
  user = users(:user1)
84
85
  old_password = user.encrypted_password
85
86
  user.set_auto_generated_password
@@ -88,16 +89,16 @@ describe User do
88
89
  user.valid_password?('user1password').should be_falsy
89
90
  end
90
91
 
91
- it 'should get highest_role' do
92
+ it "should get highest_role" do
92
93
  users(:admin).role.name.should eq 'Administrator'
93
94
  end
94
95
 
95
- it 'should lock all expired users' do
96
+ it "should lock all expired users" do
96
97
  User.lock_expired_users
97
98
  users(:user4).active_for_authentication?.should be_falsy
98
99
  end
99
100
 
100
- it 'should lock_expired users' do
101
+ it "should lock_expired users" do
101
102
  user = users(:user1)
102
103
  users(:user1).active_for_authentication?.should be_truthy
103
104
  user.expired_at = 1.day.ago
@@ -106,18 +107,18 @@ describe User do
106
107
  end
107
108
 
108
109
  if defined?(EnjuQuestion)
109
- it 'should reset answer_feed_token' do
110
+ it "should reset answer_feed_token" do
110
111
  users(:user1).reset_answer_feed_token
111
112
  users(:user1).answer_feed_token.should be_truthy
112
113
  end
113
114
 
114
- it 'should delete answer_feed_token' do
115
+ it "should delete answer_feed_token" do
115
116
  users(:user1).delete_answer_feed_token
116
117
  users(:user1).answer_feed_token.should be_nil
117
118
  end
118
119
  end
119
120
 
120
- describe '.export' do
121
+ describe ".export" do
121
122
  it "should export all user's information" do
122
123
  lines = User.export
123
124
  CSV.parse(lines, col_sep: "\t")
@@ -171,3 +172,4 @@ end
171
172
  # save_search_history :boolean default(FALSE), not null
172
173
  # answer_feed_token :string(255)
173
174
  #
175
+
data/spec/rails_helper.rb CHANGED
@@ -1,14 +1,13 @@
1
- require 'simplecov'
2
- SimpleCov.start
3
-
1
+ require 'coveralls'
2
+ Coveralls.wear!
4
3
  # This file is copied to spec/ when you run 'rails generate rspec:install'
5
4
  ENV['RAILS_ENV'] ||= 'test'
6
5
  require File.expand_path('../../spec/dummy/config/environment', __FILE__)
7
6
  # Prevent database truncation if the environment is production
8
- abort('The Rails environment is running in production mode!') if Rails.env.production?
7
+ abort("The Rails environment is running in production mode!") if Rails.env.production?
9
8
  require 'spec_helper'
10
9
  require 'rspec/rails'
11
- require 'factory_girl'
10
+ require 'factory_bot'
12
11
  require 'rspec/active_model/mocks'
13
12
  require 'sunspot_matchers'
14
13
  require 'pundit/rspec'
@@ -70,5 +69,5 @@ RSpec.configure do |config|
70
69
  config.include SunspotMatchers
71
70
  end
72
71
 
73
- FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
74
- FactoryGirl.find_definitions
72
+ FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
73
+ FactoryBot.find_definitions
@@ -1,8 +1,8 @@
1
1
  require 'spec_helper'
2
2
 
3
- describe 'Profiles' do
4
- describe 'GET /profiles' do
5
- it 'works! (now write some real specs)' do
3
+ describe "Profiles" do
4
+ describe "GET /profiles" do
5
+ it "works! (now write some real specs)" do
6
6
  get profiles_path
7
7
  end
8
8
  end
@@ -1,33 +1,35 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe ProfilesController do
4
- describe 'routing' do
5
- it 'recognizes and generates #index' do
6
- { get: '/profiles' }.should route_to(controller: 'profiles', action: 'index')
4
+ describe "routing" do
5
+
6
+ it "recognizes and generates #index" do
7
+ { get: "/profiles" }.should route_to(controller: "profiles", action: "index")
7
8
  end
8
9
 
9
- it 'recognizes and generates #new' do
10
- { get: '/profiles/new' }.should route_to(controller: 'profiles', action: 'new')
10
+ it "recognizes and generates #new" do
11
+ { get: "/profiles/new" }.should route_to(controller: "profiles", action: "new")
11
12
  end
12
13
 
13
- it 'recognizes and generates #show' do
14
- { get: '/profiles/1' }.should route_to(controller: 'profiles', action: 'show', id: '1')
14
+ it "recognizes and generates #show" do
15
+ { get: "/profiles/1" }.should route_to(controller: "profiles", action: "show", id: "1")
15
16
  end
16
17
 
17
- it 'recognizes and generates #edit' do
18
- { get: '/profiles/1/edit' }.should route_to(controller: 'profiles', action: 'edit', id: '1')
18
+ it "recognizes and generates #edit" do
19
+ { get: "/profiles/1/edit" }.should route_to(controller: "profiles", action: "edit", id: "1")
19
20
  end
20
21
 
21
- it 'recognizes and generates #create' do
22
- { post: '/profiles' }.should route_to(controller: 'profiles', action: 'create')
22
+ it "recognizes and generates #create" do
23
+ { post: "/profiles" }.should route_to(controller: "profiles", action: "create")
23
24
  end
24
25
 
25
- it 'recognizes and generates #update' do
26
- { put: '/profiles/1' }.should route_to(controller: 'profiles', action: 'update', id: '1')
26
+ it "recognizes and generates #update" do
27
+ { put: "/profiles/1" }.should route_to(controller: "profiles", action: "update", id: "1")
27
28
  end
28
29
 
29
- it 'recognizes and generates #destroy' do
30
- { delete: '/profiles/1' }.should route_to(controller: 'profiles', action: 'destroy', id: '1')
30
+ it "recognizes and generates #destroy" do
31
+ { delete: "/profiles/1" }.should route_to(controller: "profiles", action: "destroy", id: "1")
31
32
  end
33
+
32
34
  end
33
35
  end
@@ -1,33 +1,35 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe RolesController do
4
- describe 'routing' do
5
- it 'recognizes and generates #index' do
6
- { get: '/roles' }.should route_to(controller: 'roles', action: 'index')
4
+ describe "routing" do
5
+
6
+ it "recognizes and generates #index" do
7
+ { get: "/roles" }.should route_to(controller: "roles", action: "index")
7
8
  end
8
9
 
9
- # it "recognizes and generates #new" do
10
+ #it "recognizes and generates #new" do
10
11
  # { :get => "/roles/new" }.should route_to(:controller => "roles", :action => "new")
11
- # end
12
+ #end
12
13
 
13
- it 'recognizes and generates #show' do
14
- { get: '/roles/1' }.should route_to(controller: 'roles', action: 'show', id: '1')
14
+ it "recognizes and generates #show" do
15
+ { get: "/roles/1" }.should route_to(controller: "roles", action: "show", id: "1")
15
16
  end
16
17
 
17
- it 'recognizes and generates #edit' do
18
- { get: '/roles/1/edit' }.should route_to(controller: 'roles', action: 'edit', id: '1')
18
+ it "recognizes and generates #edit" do
19
+ { get: "/roles/1/edit" }.should route_to(controller: "roles", action: "edit", id: "1")
19
20
  end
20
21
 
21
- # it "recognizes and generates #create" do
22
+ #it "recognizes and generates #create" do
22
23
  # { :post => "/roles" }.should route_to(:controller => "roles", :action => "create")
23
- # end
24
+ #end
24
25
 
25
- it 'recognizes and generates #update' do
26
- { put: '/roles/1' }.should route_to(controller: 'roles', action: 'update', id: '1')
26
+ it "recognizes and generates #update" do
27
+ { put: "/roles/1" }.should route_to(controller: "roles", action: "update", id: "1")
27
28
  end
28
29
 
29
- # it "recognizes and generates #destroy" do
30
+ #it "recognizes and generates #destroy" do
30
31
  # { :delete => "/roles/1" }.should route_to(:controller => "roles", :action => "destroy", :id => "1")
31
- # end
32
+ #end
33
+
32
34
  end
33
35
  end
@@ -1,13 +1,14 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe ProfilesController do
4
- describe 'routing' do
5
- it 'recognizes and generates #new' do
6
- { get: '/users/sign_in' }.should route_to(controller: 'devise/sessions', action: 'new')
4
+ describe "routing" do
5
+
6
+ it "recognizes and generates #new" do
7
+ { get: "/users/sign_in" }.should route_to(controller: "devise/sessions", action: "new")
7
8
  end
8
9
 
9
- it 'recognizes and generates #destroy' do
10
- { delete: '/users/sign_out' }.should route_to(controller: 'devise/sessions', action: 'destroy')
10
+ it "recognizes and generates #destroy" do
11
+ { delete: "/users/sign_out" }.should route_to(controller: "devise/sessions", action: "destroy")
11
12
  end
12
13
  end
13
14
  end