enju_leaf 1.1.0.rc12 → 1.1.0.rc13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (367) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/enju.css +0 -1
  3. data/app/controllers/my_accounts_controller.rb +26 -18
  4. data/app/controllers/page_controller.rb +6 -6
  5. data/app/controllers/profiles_controller.rb +155 -0
  6. data/app/controllers/roles_controller.rb +5 -5
  7. data/app/controllers/user_export_files_controller.rb +100 -0
  8. data/app/controllers/user_groups_controller.rb +11 -11
  9. data/app/controllers/user_import_files_controller.rb +22 -11
  10. data/app/controllers/user_import_results_controller.rb +1 -1
  11. data/app/mailers/notifier.rb +7 -7
  12. data/app/models/enju_leaf/ability.rb +14 -13
  13. data/app/models/profile.rb +63 -16
  14. data/app/models/role.rb +2 -2
  15. data/app/models/user_export_file.rb +52 -0
  16. data/app/models/user_export_file_state_machine.rb +15 -0
  17. data/app/models/user_export_file_transition.rb +20 -0
  18. data/app/models/user_group.rb +3 -3
  19. data/app/models/user_has_role.rb +2 -2
  20. data/app/models/user_import_file.rb +139 -53
  21. data/app/views/kaminari/_first_page.html.erb +1 -1
  22. data/app/views/kaminari/_last_page.html.erb +1 -1
  23. data/app/views/kaminari/_next_page.html.erb +1 -1
  24. data/app/views/kaminari/_page.html.erb +1 -1
  25. data/app/views/kaminari/_prev_page.html.erb +1 -1
  26. data/app/views/kaminari/enju_leaf_mobile/_next_page.html.erb +1 -1
  27. data/app/views/kaminari/enju_leaf_mobile/_page.html.erb +1 -1
  28. data/app/views/kaminari/enju_leaf_mobile/_prev_page.html.erb +1 -1
  29. data/app/views/layouts/application.html.erb +4 -4
  30. data/app/views/my_accounts/_edit_credential.html.erb +67 -59
  31. data/app/views/my_accounts/edit.html.erb +6 -46
  32. data/app/views/my_accounts/show.html.erb +8 -8
  33. data/app/views/page/_add.html.erb +2 -2
  34. data/app/views/page/_footer.html.erb +3 -2
  35. data/app/views/page/_footer.mobile.erb +1 -1
  36. data/app/views/page/_header.html.erb +4 -4
  37. data/app/views/page/_include.html.erb +1 -1
  38. data/app/views/page/_index.html.erb +8 -8
  39. data/app/views/page/_index.mobile.erb +4 -4
  40. data/app/views/page/_menu.html.erb +9 -6
  41. data/app/views/page/_msie_acceralator.html.erb +1 -1
  42. data/app/views/page/_position.html.erb +2 -2
  43. data/app/views/page/_search_form.html.erb +2 -2
  44. data/app/views/page/_search_form.mobile.erb +2 -2
  45. data/app/views/page/_select_locale.html.erb +2 -2
  46. data/app/views/page/about.en.html.erb +2 -2
  47. data/app/views/page/about.ja.html.erb +2 -2
  48. data/app/views/page/advanced_search.html.erb +8 -8
  49. data/app/views/page/configuration.html.erb +5 -3
  50. data/app/views/page/export.html.erb +7 -17
  51. data/app/views/page/import.html.erb +1 -4
  52. data/app/views/page/index.html.erb +2 -2
  53. data/app/views/page/msie_acceralator.builder +1 -1
  54. data/app/views/page/opensearch.builder +2 -2
  55. data/app/views/profiles/_edit_credential.html.erb +78 -0
  56. data/app/views/profiles/_edit_profile.html.erb +42 -0
  57. data/app/views/{users → profiles}/_form.html.erb +0 -0
  58. data/app/views/{users → profiles}/_show.html.erb +0 -0
  59. data/app/views/profiles/edit.html.erb +36 -0
  60. data/app/views/profiles/index.html.erb +61 -0
  61. data/app/views/{users → profiles}/new.html.erb +34 -36
  62. data/app/views/{users → profiles}/show.html.erb +24 -22
  63. data/app/views/{users → profiles}/show.mobile.erb +0 -0
  64. data/app/views/roles/_form.html.erb +1 -1
  65. data/app/views/roles/edit.html.erb +1 -1
  66. data/app/views/roles/index.html.erb +2 -2
  67. data/app/views/roles/new.html.erb +1 -1
  68. data/app/views/roles/show.html.erb +1 -1
  69. data/app/views/user_export_files/_form.html.erb +22 -0
  70. data/app/views/user_export_files/edit.html.erb +6 -0
  71. data/app/views/user_export_files/index.html.erb +44 -0
  72. data/app/views/user_export_files/new.html.erb +16 -0
  73. data/app/views/user_export_files/show.html.erb +31 -0
  74. data/app/views/user_groups/_form.html.erb +5 -5
  75. data/app/views/user_groups/edit.html.erb +1 -1
  76. data/app/views/user_groups/index.html.erb +14 -8
  77. data/app/views/user_groups/new.html.erb +1 -1
  78. data/app/views/user_groups/show.html.erb +3 -3
  79. data/app/views/user_import_files/index.html.erb +11 -10
  80. data/app/views/user_import_files/new.html.erb +15 -3
  81. data/app/views/user_import_files/show.html.erb +13 -3
  82. data/app/views/user_import_results/index.html.erb +7 -7
  83. data/app/views/user_import_results/{index.tsv.erb → index.txt.erb} +1 -1
  84. data/app/views/user_import_results/show.html.erb +2 -2
  85. data/app/workers/user_export_file_queue.rb +7 -0
  86. data/config/initializers/mime_types.rb +1 -1
  87. data/config/locales/devise.en.yml +19 -18
  88. data/config/locales/devise.ja.yml +45 -42
  89. data/config/locales/en.yml +214 -0
  90. data/config/locales/ja.yml +10 -6
  91. data/config/locales/translation_en.yml +34 -5
  92. data/config/locales/translation_ja.yml +35 -6
  93. data/config/routes.rb +4 -7
  94. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +0 -9
  95. data/db/migrate/20140122054321_create_profiles.rb +1 -1
  96. data/db/migrate/20140709113413_create_user_export_files.rb +11 -0
  97. data/db/migrate/20140709113905_create_user_export_file_transitions.rb +14 -0
  98. data/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +5 -0
  99. data/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +5 -0
  100. data/db/migrate/20140811031145_add_expired_at_to_profile.rb +5 -0
  101. data/lib/enju_leaf/calculate_stat.rb +9 -0
  102. data/lib/enju_leaf/controller.rb +1 -1
  103. data/lib/enju_leaf/export_file.rb +26 -0
  104. data/lib/enju_leaf/import_file.rb +25 -0
  105. data/lib/enju_leaf/master_model.rb +15 -6
  106. data/lib/enju_leaf/url_validator.rb +4 -2
  107. data/lib/enju_leaf/user.rb +74 -68
  108. data/lib/enju_leaf/version.rb +1 -1
  109. data/lib/enju_leaf.rb +23 -24
  110. data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +2 -1
  111. data/lib/generators/enju_leaf/setup/setup_generator.rb +6 -0
  112. data/lib/generators/enju_leaf/setup/templates/db/fixtures/user_groups.yml +1 -1
  113. data/lib/generators/enju_leaf/setup/templates/db/seeds.rb +5 -4
  114. data/lib/tasks/enju_leaf_tasks.rake +18 -9
  115. data/lib/tasks/profile.rb +15 -0
  116. data/spec/controllers/my_accounts_controller_spec.rb +61 -43
  117. data/spec/controllers/page_controller_spec.rb +20 -20
  118. data/spec/controllers/profiles_controller_spec.rb +530 -0
  119. data/spec/controllers/roles_controller_spec.rb +19 -19
  120. data/spec/controllers/user_export_files_controller_spec.rb +297 -0
  121. data/spec/controllers/user_groups_controller_spec.rb +48 -48
  122. data/spec/controllers/user_import_files_controller_spec.rb +45 -41
  123. data/spec/controllers/user_import_results_controller_spec.rb +9 -9
  124. data/spec/dummy/app/models/user.rb +3 -0
  125. data/spec/dummy/config/application.rb +3 -1
  126. data/spec/dummy/config/environments/test.rb +2 -0
  127. data/spec/dummy/db/development.sqlite3 +0 -0
  128. data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb} +1 -2
  129. data/spec/dummy/db/migrate/005_create_manifestations.rb +5 -17
  130. data/spec/dummy/db/migrate/006_create_items.rb +2 -3
  131. data/spec/dummy/db/migrate/032_create_checkins.rb +17 -0
  132. data/spec/dummy/db/migrate/033_create_checkouts.rb +25 -0
  133. data/spec/dummy/db/migrate/035_create_reserves.rb +27 -0
  134. data/spec/dummy/db/migrate/055_create_bookmarks.rb +22 -0
  135. data/spec/dummy/db/migrate/059_create_libraries.rb +5 -1
  136. data/spec/dummy/db/migrate/069_create_shelves.rb +5 -1
  137. data/spec/dummy/db/migrate/080_create_library_groups.rb +0 -2
  138. data/spec/dummy/db/migrate/113_create_events.rb +23 -0
  139. data/spec/dummy/db/migrate/114_create_event_categories.rb +16 -0
  140. data/spec/dummy/db/migrate/121_create_checked_items.rb +17 -0
  141. data/spec/dummy/db/migrate/127_create_use_restrictions.rb +16 -0
  142. data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +16 -0
  143. data/spec/dummy/db/migrate/130_create_request_status_types.rb +5 -1
  144. data/spec/dummy/db/migrate/131_create_request_types.rb +5 -1
  145. data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +16 -0
  146. data/spec/dummy/db/migrate/149_create_message_templates.rb +18 -0
  147. data/spec/dummy/db/migrate/154_create_messages.rb +23 -0
  148. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +18 -0
  149. data/spec/dummy/db/migrate/{20080905191442_create_patron_types.rb → 20080905191442_create_agent_types.rb} +1 -1
  150. data/spec/dummy/db/migrate/{20081028083142_create_patron_import_files.rb → 20081028083142_create_agent_import_files.rb} +2 -4
  151. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -3
  152. data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +17 -0
  153. data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +25 -0
  154. data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +18 -0
  155. data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +17 -0
  156. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +16 -0
  157. data/spec/dummy/db/migrate/20081212151614_create_bookmark_stats.rb +16 -0
  158. data/spec/dummy/db/migrate/20081212151820_create_bookmark_stat_has_manifestations.rb +13 -0
  159. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +16 -0
  160. data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +17 -0
  161. data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +17 -0
  162. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +16 -0
  163. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +16 -0
  164. data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +17 -0
  165. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +27 -0
  166. data/spec/dummy/db/migrate/{20090812151902_create_patron_relationship_types.rb → 20090812151902_create_agent_relationship_types.rb} +1 -1
  167. data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb +21 -0
  168. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +0 -1
  169. data/spec/dummy/db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb +9 -0
  170. data/spec/dummy/db/migrate/20100525171356_acts_as_taggable_on_migration.rb +30 -0
  171. data/spec/dummy/db/migrate/{20100606073747_create_patron_relationships.rb → 20100606073747_create_agent_relationships.rb} +1 -1
  172. data/spec/dummy/db/migrate/{20100814091104_add_position_to_patron_relationship.rb → 20100814091104_add_position_to_agent_relationship.rb} +1 -1
  173. data/spec/dummy/db/migrate/{20100925074559_create_patron_import_results.rb → 20100925074559_create_agent_import_results.rb} +1 -1
  174. data/spec/dummy/db/migrate/{20110301121550_add_birth_date_and_death_date_to_patron.rb → 20110301121550_add_birth_date_and_death_date_to_agent.rb} +1 -1
  175. data/spec/dummy/db/migrate/20110301134521_add_expire_date_to_reserve.rb +9 -0
  176. data/spec/dummy/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb +9 -0
  177. data/spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb +1 -1
  178. data/spec/dummy/db/migrate/20110621093332_remove_expire_date_from_reserve.rb +9 -0
  179. data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +11 -0
  180. data/spec/dummy/db/migrate/20111020063828_remove_dsbl_from_library_group.rb +11 -0
  181. data/spec/dummy/db/migrate/20111217234412_add_save_checkout_history_to_user.rb +5 -0
  182. data/spec/dummy/db/migrate/20111218002349_add_checkout_icalendar_token_to_user.rb +6 -0
  183. data/spec/dummy/db/migrate/20111231145823_add_share_bookmarks_to_user.rb +5 -0
  184. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +6 -0
  185. data/spec/dummy/db/migrate/{20120413161403_add_fingerprint_to_patron_import_file.rb → 20120413161403_add_fingerprint_to_agent_import_file.rb} +1 -1
  186. data/spec/dummy/db/migrate/{20120413170720_add_error_message_to_patron_import_file.rb → 20120413170720_add_error_message_to_agent_import_file.rb} +1 -1
  187. data/spec/dummy/db/migrate/20120418121539_add_save_search_history_to_user.rb +5 -0
  188. data/spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb +5 -0
  189. data/spec/dummy/db/migrate/{20120511072422_add_patron_identifier_to_patron.rb → 20120511072422_add_agent_identifier_to_agent.rb} +1 -1
  190. data/spec/dummy/db/migrate/{20120602141129_add_edit_mode_to_patron_import_file.rb → 20120602141129_add_edit_mode_to_agent_import_file.rb} +1 -1
  191. data/spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb +5 -0
  192. data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb +5 -0
  193. data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +5 -0
  194. data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +8 -0
  195. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +7 -0
  196. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +5 -0
  197. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +5 -0
  198. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +5 -0
  199. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +5 -0
  200. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +14 -0
  201. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +14 -0
  202. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +14 -0
  203. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +14 -0
  204. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +14 -0
  205. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +14 -0
  206. data/spec/dummy/db/migrate/20140524135607_create_bookmark_stat_transitions.rb +14 -0
  207. data/spec/dummy/db/migrate/20140524142813_add_taggings_count_to_tag.rb +5 -0
  208. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +14 -0
  209. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +14 -0
  210. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +14 -0
  211. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +14 -0
  212. data/spec/dummy/db/migrate/20140529014410_create_item_transitions.rb +14 -0
  213. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +11 -0
  214. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +14 -0
  215. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +5 -0
  216. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +5 -0
  217. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_stat.rb +12 -0
  218. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
  219. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
  220. data/spec/dummy/db/migrate/20140811132912_add_save_search_history_to_profile.rb +5 -0
  221. data/spec/dummy/db/migrate/20140812093836_add_share_bookmarks_to_profile.rb +5 -0
  222. data/spec/dummy/db/schema.rb +632 -57
  223. data/spec/dummy/db/test.sqlite3 +0 -0
  224. data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv +4 -0
  225. data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv +7 -7
  226. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140815-3963-1s1td26.txt +8 -0
  227. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140815-69229-i0rcty.txt +8 -0
  228. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140816-21120-1w731r8.txt +8 -0
  229. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140711-28652-1dj3e98.txt +148 -0
  230. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140711-29117-13jb6ol.txt +148 -0
  231. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140721-65743-1tnagd4.txt +8 -0
  232. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140815-3963-1kk8o87.txt +8 -0
  233. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140815-69229-188nwub.txt +8 -0
  234. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140816-21120-twzfb6.txt +8 -0
  235. data/spec/dummy/solr/default/data/index/_4h.fdt +0 -0
  236. data/spec/dummy/solr/default/data/index/{_3h.fdx → _4h.fdx} +0 -0
  237. data/spec/dummy/solr/default/data/index/{_3h.fnm → _4h.fnm} +0 -0
  238. data/spec/dummy/solr/default/data/index/{_3h.nvd → _4h.nvd} +0 -0
  239. data/spec/dummy/solr/default/data/index/{_3h.nvm → _4h.nvm} +0 -0
  240. data/spec/dummy/solr/default/data/index/{_3h.si → _4h.si} +0 -0
  241. data/spec/dummy/solr/default/data/index/_4h_Lucene41_0.doc +0 -0
  242. data/spec/dummy/solr/default/data/index/_4h_Lucene41_0.pos +0 -0
  243. data/spec/dummy/solr/default/data/index/_4h_Lucene41_0.tim +0 -0
  244. data/spec/dummy/solr/default/data/index/_4h_Lucene41_0.tip +0 -0
  245. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  246. data/spec/dummy/solr/default/data/index/segments_97 +0 -0
  247. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000320 +0 -0
  248. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000321 +0 -0
  249. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000322 +0 -0
  250. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000323 +0 -0
  251. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000324 +0 -0
  252. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000325 +0 -0
  253. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000326 +0 -0
  254. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000327 +0 -0
  255. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000328 +0 -0
  256. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000329 +0 -0
  257. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  258. data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
  259. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  260. data/spec/dummy/tmp/cache/assets/test/sprockets/154f7b83f2da0e86effbe25f32135177 +0 -0
  261. data/spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d +0 -0
  262. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  263. data/spec/dummy/tmp/cache/assets/test/sprockets/3054c50144654f9c7e57bb0639a276e9 +0 -0
  264. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  265. data/spec/dummy/tmp/cache/assets/test/sprockets/3bd7a263237ba366f64d938fe5303757 +0 -0
  266. data/spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9 +0 -0
  267. data/spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2 +0 -0
  268. data/spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7 +0 -0
  269. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  270. data/spec/dummy/tmp/cache/assets/test/sprockets/d38d8658b30de1d068603968227680d4 +0 -0
  271. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  272. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
  273. data/spec/dummy/tmp/cache/stdout +246 -279
  274. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  275. data/spec/factories/profile.rb +9 -0
  276. data/spec/factories/user.rb +0 -13
  277. data/spec/fixtures/agent_import_files.yml +0 -3
  278. data/spec/fixtures/agents.yml +54 -54
  279. data/spec/fixtures/baskets.yml +4 -4
  280. data/spec/fixtures/carrier_type_has_checkout_types.yml +30 -0
  281. data/spec/fixtures/checked_items.yml +34 -0
  282. data/spec/fixtures/checkins.yml +54 -0
  283. data/spec/fixtures/checkout_stat_has_manifestations.yml +23 -0
  284. data/spec/fixtures/checkout_stat_has_users.yml +23 -0
  285. data/spec/fixtures/checkout_types.yml +33 -0
  286. data/spec/fixtures/checkouts.yml +162 -0
  287. data/spec/fixtures/circulation_statuses.yml +119 -0
  288. data/spec/fixtures/event_categories.yml +55 -0
  289. data/spec/fixtures/events.yml +142 -0
  290. data/spec/fixtures/exemplifies.yml +12 -0
  291. data/spec/fixtures/import_requests.yml +0 -2
  292. data/spec/fixtures/item_has_use_restrictions.yml +60 -0
  293. data/spec/fixtures/items.yml +101 -11
  294. data/spec/fixtures/lending_policies.yml +98 -0
  295. data/spec/fixtures/libraries.yml +26 -25
  296. data/spec/fixtures/library_groups.yml +6 -8
  297. data/spec/fixtures/manifestation_checkout_stats.yml +30 -0
  298. data/spec/fixtures/manifestation_reserve_stats.yml +30 -0
  299. data/spec/fixtures/manifestations.yml +69 -207
  300. data/spec/fixtures/message_requests.yml +27 -0
  301. data/spec/fixtures/message_templates.yml +105 -0
  302. data/spec/fixtures/profiles.yml +98 -0
  303. data/spec/fixtures/request_status_types.yml +63 -0
  304. data/spec/fixtures/request_types.yml +55 -0
  305. data/spec/fixtures/reserve_stat_has_manifestations.yml +23 -0
  306. data/spec/fixtures/reserve_stat_has_users.yml +23 -0
  307. data/spec/fixtures/reserve_transitions.yml +88 -0
  308. data/spec/fixtures/reserves.yml +162 -0
  309. data/spec/fixtures/resource_import_files.yml +0 -3
  310. data/spec/fixtures/roles.yml +0 -4
  311. data/spec/fixtures/shelves.yml +2 -3
  312. data/spec/fixtures/use_restrictions.yml +92 -0
  313. data/spec/fixtures/user_checkout_stats.yml +30 -0
  314. data/spec/fixtures/user_export_files.yml +26 -0
  315. data/spec/fixtures/user_group_has_checkout_types.yml +110 -0
  316. data/spec/fixtures/user_import_files.yml +2 -0
  317. data/spec/fixtures/user_reserve_stats.yml +30 -0
  318. data/spec/fixtures/users.yml +1 -101
  319. data/spec/models/profile_spec.rb +66 -0
  320. data/spec/models/user_export_file_spec.rb +31 -0
  321. data/spec/models/user_import_file_spec.rb +42 -20
  322. data/spec/models/user_spec.rb +1 -18
  323. data/spec/requests/{users_spec.rb → profiles_spec.rb} +3 -3
  324. data/spec/routing/accounts_spec.rb +1 -1
  325. data/spec/routing/profiles_routing_spec.rb +35 -0
  326. data/spec/support/resque.rb +1 -0
  327. data/spec/views/{users → profiles}/edit.html.erb_spec.rb +5 -7
  328. data/spec/views/{users → profiles}/index.html.erb_spec.rb +3 -3
  329. data/spec/views/{users → profiles}/new.html.erb_spec.rb +5 -5
  330. data/spec/views/profiles/show.html.erb_spec.rb +20 -0
  331. data/vendor/assets/javascripts/jquery.colorbox.js +4 -3
  332. data/vendor/assets/stylesheets/colorbox.css +1 -1
  333. metadata +416 -132
  334. data/app/controllers/users_controller.rb +0 -195
  335. data/app/models/user_sweeper.rb +0 -18
  336. data/app/views/users/_edit_credential.html.erb +0 -79
  337. data/app/views/users/edit.html.erb +0 -76
  338. data/app/views/users/index.html.erb +0 -56
  339. data/lib/enju_leaf/expire_editable_fragment.rb +0 -30
  340. data/lib/enju_leaf/expire_fragment_cache.rb +0 -17
  341. data/spec/controllers/users_controller_spec.rb +0 -539
  342. data/spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb +0 -13
  343. data/spec/dummy/db/migrate/20120415060308_rename_resource_import_file_imported_at_to_executed_at.rb +0 -9
  344. data/spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb +0 -9
  345. data/spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb +0 -5
  346. data/spec/dummy/solr/default/data/index/_3h.fdt +0 -0
  347. data/spec/dummy/solr/default/data/index/_3h_Lucene41_0.doc +0 -0
  348. data/spec/dummy/solr/default/data/index/_3h_Lucene41_0.pos +0 -0
  349. data/spec/dummy/solr/default/data/index/_3h_Lucene41_0.tim +0 -0
  350. data/spec/dummy/solr/default/data/index/_3h_Lucene41_0.tip +0 -0
  351. data/spec/dummy/solr/default/data/index/segments_71 +0 -0
  352. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000242 +0 -0
  353. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000243 +0 -0
  354. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000244 +0 -0
  355. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000245 +0 -0
  356. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000246 +0 -0
  357. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000247 +0 -0
  358. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000248 +0 -0
  359. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000249 +0 -0
  360. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000250 +0 -0
  361. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000251 +0 -0
  362. data/spec/dummy/tmp/cache/assets/test/sprockets/3f8d795856d1fdf902b0be679120571a +0 -0
  363. data/spec/dummy/tmp/cache/assets/test/sprockets/5998e66e374537d52eed3fe1ca5f2bfc +0 -0
  364. data/spec/dummy/tmp/cache/assets/test/sprockets/5ea4a1824e1d67da6c4fb9aeef9f49f4 +0 -0
  365. data/spec/dummy/tmp/cache/assets/test/sprockets/87f0cb69a0df1355e33cce3949919d5a +0 -0
  366. data/spec/routing/users_routing_spec.rb +0 -35
  367. data/spec/views/users/show.html.erb_spec.rb +0 -15
@@ -1,539 +0,0 @@
1
- require 'spec_helper'
2
-
3
- describe UsersController do
4
- fixtures :all
5
-
6
- describe "GET index", :solr => true do
7
- before do
8
- User.reindex
9
- end
10
-
11
- describe "When logged in as Administrator" do
12
- login_fixture_admin
13
-
14
- it "assigns all users as @users" do
15
- get :index
16
- assigns(:users).should_not be_nil
17
- end
18
- end
19
-
20
- describe "When logged in as Librarian" do
21
- login_fixture_librarian
22
-
23
- it "assigns all users as @users" do
24
- get :index
25
- assigns(:users).should_not be_nil
26
- end
27
-
28
- it "should get index with query" do
29
- get :index, :query => 'user1'
30
- response.should be_success
31
- assigns(:users).should_not be_empty
32
- end
33
-
34
- it "should get sorted index" do
35
- get :index, :query => 'user1', :sort_by => 'username', :order => 'desc'
36
- response.should be_success
37
- assigns(:users).should_not be_empty
38
- end
39
- end
40
-
41
- describe "When logged in as User" do
42
- login_fixture_user
43
-
44
- it "assigns all users as @users" do
45
- get :index
46
- assigns(:users).should be_nil
47
- response.should be_forbidden
48
- end
49
- end
50
-
51
- describe "When not logged in" do
52
- it "assigns all users as @users" do
53
- get :index
54
- assigns(:users).should be_nil
55
- response.should redirect_to(new_user_session_url)
56
- end
57
- end
58
- end
59
-
60
- describe "GET show" do
61
- describe "When logged in as Administrator" do
62
- login_fixture_admin
63
-
64
- it "assigns the requested user as @user" do
65
- get :show, :id => 'admin'
66
- assigns(:user).should eq(User.find('admin'))
67
- end
68
- end
69
-
70
- describe "When logged in as Librarian" do
71
- login_fixture_librarian
72
-
73
- it "assigns the requested user as @user" do
74
- get :show, :id => users(:librarian1).username
75
- assigns(:user).should eq(users(:librarian1))
76
- end
77
- end
78
-
79
- describe "When logged in as User" do
80
- login_fixture_user
81
-
82
- it "assigns the requested user as @user" do
83
- get :show, :id => users(:user1).username
84
- assigns(:user).should eq(users(:user1))
85
- end
86
-
87
- it "should redirect to my user account" do
88
- get :show, :id => users(:user1).username
89
- assert_redirected_to my_account_url
90
- end
91
-
92
- it "should show other user's account" do
93
- get :show, :id => users(:admin).username
94
- assigns(:user).should eq(users(:admin))
95
- response.should be_success
96
- end
97
- end
98
-
99
- describe "When not logged in" do
100
- it "assigns the requested user as @user" do
101
- get :show, :id => 'admin'
102
- assigns(:user).should eq(User.find('admin'))
103
- response.should redirect_to(new_user_session_url)
104
- end
105
- end
106
- end
107
-
108
- describe "GET new" do
109
- describe "When logged in as Administrator" do
110
- login_fixture_admin
111
-
112
- it "assigns the requested user as @user" do
113
- get :new
114
- assigns(:user).should_not be_valid
115
- end
116
- end
117
-
118
- describe "When logged in as Librarian" do
119
- login_fixture_librarian
120
-
121
- it "should not assign the requested user as @user" do
122
- get :new
123
- assigns(:user).should_not be_valid
124
- end
125
- end
126
-
127
- describe "When logged in as User" do
128
- login_fixture_user
129
-
130
- it "should not assign the requested user as @user" do
131
- get :new
132
- assigns(:user).should_not be_valid
133
- response.should be_forbidden
134
- end
135
- end
136
-
137
- describe "When not logged in" do
138
- it "should not assign the requested user as @user" do
139
- get :new
140
- assigns(:user).should_not be_valid
141
- response.should redirect_to(new_user_session_url)
142
- end
143
- end
144
- end
145
-
146
- describe "GET edit" do
147
- describe "When logged in as Administrator" do
148
- login_fixture_admin
149
-
150
- it "assigns the requested user as @user" do
151
- user = FactoryGirl.create(:user)
152
- get :edit, :id => user.id
153
- assigns(:user).should eq(user)
154
- end
155
- end
156
-
157
- describe "When logged in as Librarian" do
158
- login_fixture_librarian
159
-
160
- it "should assign the requested user as @user" do
161
- user = FactoryGirl.create(:user)
162
- get :edit, :id => user.id
163
- assigns(:user).should eq(user)
164
- end
165
- end
166
-
167
- describe "When logged in as User" do
168
- login_fixture_user
169
-
170
- it "should not assign the requested user as @user" do
171
- user = FactoryGirl.create(:user)
172
- get :edit, :id => user.id
173
- assigns(:user).should eq(user)
174
- response.should be_forbidden
175
- end
176
-
177
- it "should edit myself" do
178
- get :edit, :id => users(:user1).username
179
- response.should redirect_to edit_my_account_url
180
- end
181
- end
182
-
183
- describe "When not logged in" do
184
- it "should not assign the requested user as @user" do
185
- user = FactoryGirl.create(:user)
186
- get :edit, :id => user.id
187
- assigns(:user).should eq(user)
188
- response.should redirect_to(new_user_session_url)
189
- end
190
- end
191
- end
192
-
193
- describe "POST create" do
194
- before(:each) do
195
- @attrs = FactoryGirl.attributes_for(:user)
196
- @invalid_attrs = {:username => ''}
197
- end
198
-
199
- describe "When logged in as Administrator" do
200
- login_fixture_admin
201
-
202
- describe "with valid params" do
203
- it "assigns a newly created user as @user" do
204
- post :create, :user => @attrs
205
- assigns(:user).should be_valid
206
- end
207
-
208
- it "redirects to the created user" do
209
- post :create, :user => @attrs
210
- response.should redirect_to(user_url(assigns(:user)))
211
- end
212
- end
213
-
214
- describe "with invalid params" do
215
- it "assigns a newly created but unsaved user as @user" do
216
- post :create, :user => @invalid_attrs
217
- assigns(:user).should_not be_valid
218
- end
219
-
220
- it "re-renders the 'new' template" do
221
- post :create, :user => @invalid_attrs
222
- response.should render_template("new")
223
- end
224
- end
225
- end
226
-
227
- describe "When logged in as Librarian" do
228
- login_fixture_librarian
229
-
230
- describe "with valid params" do
231
- it "assigns a newly created user as @user" do
232
- post :create, :user => @attrs
233
- assigns(:user).should be_valid
234
- end
235
-
236
- it "redirects to the created user" do
237
- post :create, :user => @attrs
238
- response.should redirect_to(user_url(assigns(:user)))
239
- end
240
- end
241
-
242
- describe "with invalid params" do
243
- it "assigns a newly created but unsaved user as @user" do
244
- post :create, :user => @invalid_attrs
245
- assigns(:user).should_not be_valid
246
- end
247
-
248
- it "re-renders the 'new' template" do
249
- post :create, :user => @invalid_attrs
250
- response.should render_template("new")
251
- end
252
- end
253
-
254
- it "should not create user without username" do
255
- post :create, :user => { :username => '' }
256
- assigns(:user).should_not be_valid
257
- response.should be_success
258
- end
259
-
260
- it "should create user" do
261
- post :create, :user => { :username => 'test10' }
262
- assigns(:user).should be_valid
263
- response.should redirect_to user_url(assigns(:user))
264
- end
265
- end
266
-
267
- describe "When logged in as User" do
268
- login_fixture_user
269
-
270
- it "should not create user" do
271
- post :create, :user => { :username => 'test10' }
272
- assigns(:user).should_not be_valid
273
- response.should be_forbidden
274
- end
275
- end
276
-
277
- describe "When not logged in" do
278
- it "should not create user" do
279
- post :create, :user => { :username => 'test10' }
280
- response.should redirect_to new_user_session_url
281
- end
282
- end
283
- end
284
-
285
- describe "PUT update" do
286
- before(:each) do
287
- @user = users(:user1)
288
- @attrs = {:email => 'newaddress@example.jp', :locale => 'en'}
289
- @invalid_attrs = {:email => 'invalid'}
290
- end
291
-
292
- describe "When logged in as Administrator" do
293
- login_fixture_admin
294
-
295
- describe "with valid params" do
296
- it "updates the requested user" do
297
- put :update, :id => @user.id, :user => @attrs
298
- end
299
-
300
- it "assigns the requested user as @user" do
301
- put :update, :id => @user.id, :user => @attrs
302
- assigns(:user).should eq(@user)
303
- end
304
-
305
- it "redirects to the user" do
306
- put :update, :id => @user.id, :user => @attrs
307
- assigns(:user).should eq(@user)
308
- response.should redirect_to(@user)
309
- end
310
- end
311
-
312
- describe "with invalid params" do
313
- it "assigns the requested user as @user" do
314
- put :update, :id => @user.id, :user => @invalid_attrs
315
- assigns(:user).should eq(@user)
316
- end
317
-
318
- it "re-renders the 'edit' template" do
319
- put :update, :id => @user, :user => @invalid_attrs
320
- response.should render_template("edit")
321
- end
322
- end
323
-
324
- it "should update other user's role" do
325
- put :update, :id => users(:user1).username, :user => {:user_has_role_attributes => {:role_id => 4}, :locale => 'en'}
326
- response.should redirect_to user_url(assigns(:user))
327
- assigns(:user).reload
328
- assigns(:user).role.should eq Role.find_by_name('Administrator')
329
- end
330
- end
331
-
332
- describe "When logged in as Librarian" do
333
- login_fixture_librarian
334
-
335
- describe "with valid params" do
336
- it "updates the requested user" do
337
- put :update, :id => @user.id, :user => @attrs
338
- end
339
-
340
- it "assigns the requested user as @user" do
341
- put :update, :id => @user.id, :user => @attrs
342
- assigns(:user).should eq(@user)
343
- end
344
-
345
- it "redirects to the user" do
346
- put :update, :id => @user.id, :user => @attrs
347
- assigns(:user).should eq(@user)
348
- response.should redirect_to(@user)
349
- end
350
- end
351
-
352
- describe "with invalid params" do
353
- it "assigns the user as @user" do
354
- put :update, :id => @user, :user => @invalid_attrs
355
- assigns(:user).should_not be_valid
356
- end
357
-
358
- it "re-renders the 'edit' template" do
359
- put :update, :id => @user, :user => @invalid_attrs
360
- response.should render_template("edit")
361
- end
362
- end
363
-
364
- it "should update other user" do
365
- put :update, :id => users(:user1).username, :user => {:user_number => '00003', :locale => 'en'}
366
- response.should redirect_to user_url(assigns(:user))
367
- end
368
-
369
- it "should update other user's user_group" do
370
- put :update, :id => users(:user1).username, :user => {:user_group_id => 3, :locale => 'en'}
371
- response.should redirect_to user_url(assigns(:user))
372
- assigns(:user).user_group_id.should eq 3
373
- end
374
-
375
- it "should update other user's note" do
376
- put :update, :id => users(:user1).username, :user => {:note => 'test', :locale => 'en'}
377
- response.should redirect_to user_url(assigns(:user))
378
- assert_equal assigns(:user).note, 'test'
379
- end
380
- end
381
-
382
- describe "When logged in as User" do
383
- login_fixture_user
384
-
385
- describe "with valid params" do
386
- it "updates the requested user" do
387
- put :update, :id => @user.id, :user => @attrs
388
- end
389
-
390
- it "assigns the requested user as @user" do
391
- put :update, :id => @user.id, :user => @attrs
392
- assigns(:user).should be_valid
393
- response.should redirect_to user_url(assigns(:user))
394
- end
395
- end
396
-
397
- describe "with invalid params" do
398
- it "assigns the requested user as @user" do
399
- put :update, :id => @user.id, :user => @invalid_attrs
400
- assigns(:user).should_not be_valid
401
- response.should be_success
402
- end
403
- end
404
-
405
- it "should update myself" do
406
- put :update, :id => users(:user1).username, :user => { }
407
- response.should redirect_to user_url(assigns(:user))
408
- end
409
-
410
- it "should not update my role" do
411
- put :update, :id => users(:user1).username, :user => {:user_has_role_attributes => {:role_id => 4}}
412
- response.should redirect_to user_url(assigns(:user))
413
- assigns(:user).role.should_not eq Role.find_by_name('Administrator')
414
- end
415
-
416
- it "should not update my user_group" do
417
- put :update, :id => users(:user1).username, :user => {:user_group_id => 3}
418
- response.should redirect_to user_url(assigns(:user))
419
- assigns(:user).user_group.id.should eq 1
420
- end
421
-
422
- it "should not update my note" do
423
- put :update, :id => users(:user1).username, :user => {:note => 'test'}
424
- response.should redirect_to user_url(assigns(:user))
425
- assigns(:user).note.should be_nil
426
- end
427
-
428
- it "should update my keyword_list" do
429
- put :update, :id => users(:user1).username, :user => {:keyword_list => 'test'}
430
- response.should redirect_to user_url(assigns(:user))
431
- assigns(:user).keyword_list.should eq 'test'
432
- assigns(:user).role.name.should eq 'User'
433
- end
434
-
435
- it "should not update other user" do
436
- put :update, :id => users(:user2).username, :user => { }
437
- assigns(:user).should be_valid
438
- response.should be_forbidden
439
- end
440
- end
441
-
442
- describe "When not logged in" do
443
- describe "with valid params" do
444
- it "updates the requested user" do
445
- put :update, :id => @user.id, :user => @attrs
446
- end
447
-
448
- it "should be forbidden" do
449
- put :update, :id => @user.id, :user => @attrs
450
- response.should redirect_to(new_user_session_url)
451
- end
452
- end
453
-
454
- describe "with invalid params" do
455
- it "assigns the requested user as @user" do
456
- put :update, :id => @user.id, :user => @invalid_attrs
457
- response.should redirect_to(new_user_session_url)
458
- end
459
- end
460
- end
461
- end
462
-
463
- describe "DELETE destroy" do
464
- describe "When logged in as Administrator" do
465
- login_fixture_admin
466
-
467
- it "destroys the requested user" do
468
- delete :destroy, :id => users(:user2).username
469
- end
470
-
471
- it "redirects to the users list" do
472
- delete :destroy, :id => users(:user2).username
473
- response.should redirect_to(users_url)
474
- end
475
-
476
- it "should destroy librarian" do
477
- delete :destroy, :id => users(:librarian2).username
478
- response.should redirect_to(users_url)
479
- end
480
- end
481
-
482
- describe "When logged in as Librarian" do
483
- login_fixture_librarian
484
-
485
- it "destroys the requested user" do
486
- delete :destroy, :id => users(:user2).username
487
- end
488
-
489
- it "redirects to the users list" do
490
- delete :destroy, :id => users(:user2).username
491
- response.should redirect_to(users_url)
492
- end
493
-
494
- it "should not destroy librarian" do
495
- delete :destroy, :id => users(:librarian2).username
496
- response.should be_forbidden
497
- end
498
-
499
- it "should not destroy admin" do
500
- delete :destroy, :id => users(:admin).username
501
- response.should be_forbidden
502
- end
503
-
504
- it "should not destroy myself" do
505
- delete :destroy, :id => users(:librarian1).username
506
- response.should be_forbidden
507
- end
508
- end
509
-
510
- describe "When logged in as User" do
511
- login_fixture_user
512
-
513
- it "destroys the requested user" do
514
- delete :destroy, :id => users(:user2).username
515
- end
516
-
517
- it "should be forbidden" do
518
- delete :destroy, :id => users(:user2).username
519
- response.should be_forbidden
520
- end
521
-
522
- it "should not destroy myself" do
523
- delete :destroy, :id => users(:user1).username
524
- response.should be_forbidden
525
- end
526
- end
527
-
528
- describe "When not logged in" do
529
- it "destroys the requested user" do
530
- delete :destroy, :id => users(:user2).username
531
- end
532
-
533
- it "should be forbidden" do
534
- delete :destroy, :id => users(:user2).username
535
- response.should redirect_to(new_user_session_url)
536
- end
537
- end
538
- end
539
- end
@@ -1,13 +0,0 @@
1
- class RenameManifestationNumberListToNumberString < ActiveRecord::Migration
2
- def self.up
3
- rename_column :manifestations, :volume_number_list, :volume_number_string
4
- rename_column :manifestations, :issue_number_list, :issue_number_string
5
- rename_column :manifestations, :serial_number_list, :serial_number_string
6
- end
7
-
8
- def self.down
9
- rename_column :manifestations, :serial_number_string, :serial_number_list
10
- rename_column :manifestations, :issue_number_string, :issue_number_list
11
- rename_column :manifestations, :volume_number_string, :volume_number_list
12
- end
13
- end
@@ -1,9 +0,0 @@
1
- class RenameResourceImportFileImportedAtToExecutedAt < ActiveRecord::Migration
2
- def up
3
- rename_column :resource_import_files, :imported_at, :executed_at
4
- end
5
-
6
- def down
7
- rename_column :resource_import_files, :executed_at, :imported_at
8
- end
9
- end
@@ -1,9 +0,0 @@
1
- class RenamePatronImportFileImportedAtToExecutedAt < ActiveRecord::Migration
2
- def up
3
- rename_column :agent_import_files, :imported_at, :executed_at
4
- end
5
-
6
- def down
7
- rename_column :agent_import_files, :executed_at, :imported_at
8
- end
9
- end
@@ -1,5 +0,0 @@
1
- class AddManifestationIdToItem < ActiveRecord::Migration
2
- def change
3
- add_column :items, :manifestation_id, :integer
4
- end
5
- end
@@ -1,35 +0,0 @@
1
- require "spec_helper"
2
-
3
- describe UsersController do
4
- describe "routing" do
5
-
6
- it "recognizes and generates #index" do
7
- { :get => "/users" }.should route_to(:controller => "users", :action => "index")
8
- end
9
-
10
- it "recognizes and generates #new" do
11
- { :get => "/users/new" }.should route_to(:controller => "users", :action => "new")
12
- end
13
-
14
- it "recognizes and generates #show" do
15
- { :get => "/users/1" }.should route_to(:controller => "users", :action => "show", :id => "1")
16
- end
17
-
18
- it "recognizes and generates #edit" do
19
- { :get => "/users/1/edit" }.should route_to(:controller => "users", :action => "edit", :id => "1")
20
- end
21
-
22
- it "recognizes and generates #create" do
23
- { :post => "/users" }.should route_to(:controller => "users", :action => "create")
24
- end
25
-
26
- it "recognizes and generates #update" do
27
- { :put => "/users/1" }.should route_to(:controller => "users", :action => "update", :id => "1")
28
- end
29
-
30
- it "recognizes and generates #destroy" do
31
- { :delete => "/users/1" }.should route_to(:controller => "users", :action => "destroy", :id => "1")
32
- end
33
-
34
- end
35
- end
@@ -1,15 +0,0 @@
1
- require 'spec_helper'
2
-
3
- describe "users/show" do
4
- before(:each) do
5
- @user = assign(:user, stub_model(User,
6
- :username => "Username"
7
- ))
8
- end
9
-
10
- it "renders attributes in <p>" do
11
- render
12
- # Run the generator again with the --webrat flag if you want to use webrat matchers
13
- rendered.should match(/Username/)
14
- end
15
- end