enju_biblio 0.1.0.pre55 → 0.1.0.pre56

Sign up to get free protection for your applications and to get access to all the features.
Files changed (614) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/agent_import_files_controller.rb +11 -11
  3. data/app/controllers/agent_import_results_controller.rb +1 -1
  4. data/app/controllers/agent_relationship_types_controller.rb +0 -1
  5. data/app/controllers/agent_relationships_controller.rb +2 -2
  6. data/app/controllers/agent_types_controller.rb +0 -1
  7. data/app/controllers/agents_controller.rb +22 -23
  8. data/app/controllers/carrier_types_controller.rb +11 -11
  9. data/app/controllers/content_types_controller.rb +0 -1
  10. data/app/controllers/countries_controller.rb +1 -1
  11. data/app/controllers/create_types_controller.rb +0 -1
  12. data/app/controllers/creates_controller.rb +13 -14
  13. data/app/controllers/donates_controller.rb +10 -10
  14. data/app/controllers/extents_controller.rb +1 -1
  15. data/app/controllers/form_of_works_controller.rb +1 -1
  16. data/app/controllers/frequencies_controller.rb +1 -1
  17. data/app/controllers/identifier_types_controller.rb +10 -10
  18. data/app/controllers/import_requests_controller.rb +12 -12
  19. data/app/controllers/items_controller.rb +25 -26
  20. data/app/controllers/languages_controller.rb +1 -1
  21. data/app/controllers/licenses_controller.rb +0 -1
  22. data/app/controllers/manifestation_relationship_types_controller.rb +0 -1
  23. data/app/controllers/manifestation_relationships_controller.rb +2 -2
  24. data/app/controllers/manifestations_controller.rb +64 -59
  25. data/app/controllers/medium_of_performances_controller.rb +0 -1
  26. data/app/controllers/owns_controller.rb +12 -13
  27. data/app/controllers/picture_files_controller.rb +13 -14
  28. data/app/controllers/produce_types_controller.rb +0 -1
  29. data/app/controllers/produces_controller.rb +15 -16
  30. data/app/controllers/realize_types_controller.rb +0 -1
  31. data/app/controllers/realizes_controller.rb +13 -14
  32. data/app/controllers/resource_export_files_controller.rb +11 -11
  33. data/app/controllers/resource_import_files_controller.rb +26 -11
  34. data/app/controllers/resource_import_results_controller.rb +2 -2
  35. data/app/controllers/series_statements_controller.rb +13 -14
  36. data/app/helpers/manifestations_helper.rb +1 -1
  37. data/app/models/agent.rb +44 -41
  38. data/app/models/agent_import_file.rb +12 -58
  39. data/app/models/agent_import_result.rb +3 -4
  40. data/app/models/agent_relationship.rb +3 -3
  41. data/app/models/agent_relationship_type.rb +1 -1
  42. data/app/models/agent_sweeper.rb +0 -1
  43. data/app/models/agent_type.rb +1 -1
  44. data/app/models/carrier_type.rb +4 -4
  45. data/app/models/content_type.rb +1 -1
  46. data/app/models/country.rb +1 -1
  47. data/app/models/create.rb +3 -3
  48. data/app/models/create_type.rb +1 -1
  49. data/app/models/donate.rb +2 -2
  50. data/app/models/enju_biblio/ability.rb +2 -13
  51. data/app/models/exemplify.rb +1 -1
  52. data/app/models/extent.rb +1 -1
  53. data/app/models/form_of_work.rb +1 -1
  54. data/app/models/frequency.rb +1 -1
  55. data/app/models/identifier.rb +3 -3
  56. data/app/models/identifier_type.rb +2 -2
  57. data/app/models/import_request.rb +2 -2
  58. data/app/models/item.rb +48 -48
  59. data/app/models/item_sweeper.rb +0 -1
  60. data/app/models/language.rb +1 -1
  61. data/app/models/license.rb +1 -1
  62. data/app/models/manifestation.rb +72 -66
  63. data/app/models/manifestation_relationship.rb +3 -3
  64. data/app/models/manifestation_relationship_type.rb +1 -1
  65. data/app/models/manifestation_sweeper.rb +0 -1
  66. data/app/models/medium_of_performance.rb +1 -1
  67. data/app/models/own.rb +4 -4
  68. data/app/models/page_sweeper.rb +0 -1
  69. data/app/models/picture_file.rb +6 -6
  70. data/app/models/produce.rb +3 -3
  71. data/app/models/produce_type.rb +1 -1
  72. data/app/models/realize.rb +3 -3
  73. data/app/models/realize_type.rb +1 -1
  74. data/app/models/resource_export_file.rb +4 -11
  75. data/app/models/resource_import_file.rb +148 -100
  76. data/app/models/resource_import_result.rb +1 -1
  77. data/app/models/series_statement.rb +7 -5
  78. data/app/views/agent_import_files/edit.html.erb +1 -1
  79. data/app/views/agent_import_files/index.html.erb +4 -4
  80. data/app/views/agent_import_files/new.html.erb +12 -12
  81. data/app/views/agent_import_files/show.html.erb +4 -4
  82. data/app/views/agent_import_results/index.html.erb +6 -8
  83. data/app/views/agent_import_results/{index.tsv.erb → index.txt.erb} +0 -0
  84. data/app/views/agent_import_results/show.html.erb +1 -6
  85. data/app/views/agent_relationship_types/edit.html.erb +1 -1
  86. data/app/views/agent_relationship_types/index.html.erb +20 -12
  87. data/app/views/agent_relationship_types/new.html.erb +1 -1
  88. data/app/views/agent_relationship_types/show.html.erb +1 -1
  89. data/app/views/agent_relationships/edit.html.erb +1 -1
  90. data/app/views/agent_relationships/index.html.erb +3 -3
  91. data/app/views/agent_relationships/new.html.erb +1 -1
  92. data/app/views/agent_relationships/show.html.erb +1 -1
  93. data/app/views/agent_types/edit.html.erb +1 -1
  94. data/app/views/agent_types/index.html.erb +19 -11
  95. data/app/views/agent_types/new.html.erb +1 -1
  96. data/app/views/agent_types/show.html.erb +1 -1
  97. data/app/views/agents/_agent.html.erb +1 -1
  98. data/app/views/agents/_expression_list.html.erb +2 -2
  99. data/app/views/agents/_form.html.erb +8 -8
  100. data/app/views/agents/_form_family_name_first.html.erb +4 -4
  101. data/app/views/agents/_form_family_name_last.html.erb +4 -4
  102. data/app/views/agents/_index.html.erb +4 -4
  103. data/app/views/agents/_index_agent.html.erb +7 -11
  104. data/app/views/agents/_index_expression.html.erb +5 -5
  105. data/app/views/agents/_index_manifestation.html.erb +11 -11
  106. data/app/views/agents/_index_work.html.erb +5 -5
  107. data/app/views/agents/_manifestation_list.html.erb +2 -2
  108. data/app/views/agents/_work_list.html.erb +2 -2
  109. data/app/views/agents/edit.html.erb +2 -2
  110. data/app/views/agents/index.atom.builder +2 -2
  111. data/app/views/agents/index.html.erb +1 -1
  112. data/app/views/agents/index.mobile.erb +3 -3
  113. data/app/views/agents/index.rss.builder +6 -6
  114. data/app/views/agents/new.html.erb +1 -1
  115. data/app/views/agents/show.html.erb +11 -22
  116. data/app/views/agents/show.mobile.erb +3 -9
  117. data/app/views/carrier_types/_form.html.erb +2 -2
  118. data/app/views/carrier_types/edit.html.erb +1 -1
  119. data/app/views/carrier_types/index.html.erb +15 -9
  120. data/app/views/carrier_types/new.html.erb +1 -1
  121. data/app/views/carrier_types/show.html.erb +17 -1
  122. data/app/views/content_types/_form.html.erb +5 -5
  123. data/app/views/content_types/edit.html.erb +1 -1
  124. data/app/views/content_types/index.html.erb +14 -8
  125. data/app/views/content_types/new.html.erb +1 -1
  126. data/app/views/content_types/show.html.erb +6 -1
  127. data/app/views/countries/_form.html.erb +5 -5
  128. data/app/views/countries/edit.html.erb +1 -1
  129. data/app/views/countries/index.html.erb +10 -8
  130. data/app/views/countries/new.html.erb +1 -1
  131. data/app/views/countries/show.html.erb +1 -1
  132. data/app/views/create_types/edit.html.erb +1 -1
  133. data/app/views/create_types/index.html.erb +20 -12
  134. data/app/views/create_types/new.html.erb +1 -1
  135. data/app/views/create_types/show.html.erb +1 -1
  136. data/app/views/creates/_index.html.erb +3 -3
  137. data/app/views/creates/_index_agent.html.erb +5 -6
  138. data/app/views/creates/_index_work.html.erb +4 -4
  139. data/app/views/creates/edit.html.erb +1 -1
  140. data/app/views/creates/new.html.erb +3 -3
  141. data/app/views/creates/show.html.erb +3 -3
  142. data/app/views/donates/edit.html.erb +1 -1
  143. data/app/views/donates/index.html.erb +4 -4
  144. data/app/views/donates/new.html.erb +1 -1
  145. data/app/views/donates/show.html.erb +1 -1
  146. data/app/views/extents/edit.html.erb +1 -1
  147. data/app/views/extents/index.html.erb +12 -8
  148. data/app/views/extents/new.html.erb +1 -1
  149. data/app/views/extents/show.html.erb +1 -1
  150. data/app/views/form_of_works/_form.html.erb +2 -2
  151. data/app/views/form_of_works/edit.html.erb +1 -1
  152. data/app/views/form_of_works/index.html.erb +15 -9
  153. data/app/views/form_of_works/new.html.erb +1 -1
  154. data/app/views/form_of_works/show.html.erb +1 -1
  155. data/app/views/frequencies/edit.html.erb +1 -1
  156. data/app/views/frequencies/index.html.erb +16 -8
  157. data/app/views/frequencies/new.html.erb +1 -1
  158. data/app/views/frequencies/show.html.erb +6 -1
  159. data/app/views/identifier_types/_form.html.erb +5 -5
  160. data/app/views/identifier_types/edit.html.erb +1 -1
  161. data/app/views/identifier_types/index.html.erb +3 -3
  162. data/app/views/identifier_types/new.html.erb +1 -1
  163. data/app/views/identifier_types/show.html.erb +6 -1
  164. data/app/views/import_requests/edit.html.erb +2 -2
  165. data/app/views/import_requests/index.html.erb +4 -4
  166. data/app/views/import_requests/new.html.erb +3 -3
  167. data/app/views/import_requests/show.html.erb +2 -2
  168. data/app/views/items/_form.html.erb +27 -16
  169. data/app/views/items/_shelf_picture.html.erb +1 -1
  170. data/app/views/items/_shelf_picture.mobile.erb +1 -1
  171. data/app/views/items/edit.html.erb +5 -5
  172. data/app/views/items/index.html.erb +10 -10
  173. data/app/views/items/index.mobile.erb +5 -5
  174. data/app/views/items/index.txt.erb +4 -0
  175. data/app/views/items/new.html.erb +4 -4
  176. data/app/views/items/show.html.erb +35 -21
  177. data/app/views/items/show.mobile.erb +3 -3
  178. data/app/views/languages/_form.html.erb +4 -4
  179. data/app/views/languages/edit.html.erb +1 -1
  180. data/app/views/languages/index.html.erb +2 -2
  181. data/app/views/languages/new.html.erb +1 -1
  182. data/app/views/languages/show.html.erb +1 -1
  183. data/app/views/layouts/agents.html.erb +2 -2
  184. data/app/views/layouts/manifestations.html.erb +2 -2
  185. data/app/views/licenses/_form.html.erb +2 -2
  186. data/app/views/licenses/edit.html.erb +1 -1
  187. data/app/views/licenses/index.html.erb +12 -7
  188. data/app/views/licenses/new.html.erb +1 -1
  189. data/app/views/licenses/show.html.erb +1 -1
  190. data/app/views/manifestation_relationship_types/edit.html.erb +1 -1
  191. data/app/views/manifestation_relationship_types/index.html.erb +20 -12
  192. data/app/views/manifestation_relationship_types/new.html.erb +1 -1
  193. data/app/views/manifestation_relationship_types/show.html.erb +1 -1
  194. data/app/views/manifestation_relationships/edit.html.erb +1 -1
  195. data/app/views/manifestation_relationships/index.html.erb +3 -3
  196. data/app/views/manifestation_relationships/new.html.erb +1 -1
  197. data/app/views/manifestation_relationships/show.html.erb +1 -1
  198. data/app/views/manifestations/_attachment_file.html.erb +1 -1
  199. data/app/views/manifestations/_edit_detail.html.erb +3 -3
  200. data/app/views/manifestations/_form.html.erb +47 -28
  201. data/app/views/manifestations/_holding.html.erb +1 -1
  202. data/app/views/manifestations/_index_form.html.erb +2 -2
  203. data/app/views/manifestations/_index_form_contributor.html.erb +2 -2
  204. data/app/views/manifestations/_index_form_creator.html.erb +2 -2
  205. data/app/views/manifestations/_index_form_item.html.erb +2 -2
  206. data/app/views/manifestations/_index_form_manifestation.html.erb +2 -2
  207. data/app/views/manifestations/_index_form_parent.html.erb +9 -3
  208. data/app/views/manifestations/_index_form_publisher.html.erb +2 -2
  209. data/app/views/manifestations/_index_form_series_statement.html.erb +3 -3
  210. data/app/views/manifestations/_manifestation.html.erb +7 -7
  211. data/app/views/manifestations/_manifestation_list.html.erb +2 -2
  212. data/app/views/manifestations/_paginate_id_link.html.erb +2 -2
  213. data/app/views/manifestations/_pickup.html.erb +4 -4
  214. data/app/views/manifestations/_search_engine.html.erb +1 -1
  215. data/app/views/manifestations/_show.mods.builder +2 -2
  216. data/app/views/manifestations/_show.rdf.builder +2 -2
  217. data/app/views/manifestations/_show_creators.html.erb +2 -2
  218. data/app/views/manifestations/_show_creators.mobile.erb +2 -2
  219. data/app/views/manifestations/_show_detail_librarian.html.erb +13 -9
  220. data/app/views/manifestations/_show_detail_user.html.erb +13 -9
  221. data/app/views/manifestations/_show_holding.html.erb +8 -6
  222. data/app/views/manifestations/_show_holding.mobile.erb +1 -1
  223. data/app/views/manifestations/_show_index.html.erb +7 -5
  224. data/app/views/manifestations/_show_index.mobile.erb +3 -3
  225. data/app/views/manifestations/_show_parent_form.html.erb +12 -0
  226. data/app/views/manifestations/_show_series_index.html.erb +6 -3
  227. data/app/views/manifestations/_submenu_parent.html.erb +1 -1
  228. data/app/views/manifestations/_tab_list.html.erb +3 -3
  229. data/app/views/manifestations/_tab_menu.html.erb +2 -2
  230. data/app/views/manifestations/_title.html.erb +9 -6
  231. data/app/views/manifestations/_title.mobile.erb +6 -6
  232. data/app/views/manifestations/edit.html.erb +3 -3
  233. data/app/views/manifestations/index.atom.builder +2 -2
  234. data/app/views/manifestations/index.html.erb +8 -7
  235. data/app/views/manifestations/index.mobile.erb +4 -4
  236. data/app/views/manifestations/index.mods.builder +1 -1
  237. data/app/views/manifestations/index.opds.builder +4 -4
  238. data/app/views/manifestations/index.rdf.builder +4 -4
  239. data/app/views/manifestations/index.rss.builder +6 -6
  240. data/app/views/manifestations/index.sru.builder +1 -1
  241. data/app/views/manifestations/{index.csv.erb → index.txt.erb} +0 -0
  242. data/app/views/manifestations/new.html.erb +1 -1
  243. data/app/views/manifestations/show.html.erb +14 -14
  244. data/app/views/manifestations/show.mobile.erb +3 -3
  245. data/app/views/manifestations/show.mods.builder +1 -1
  246. data/app/views/manifestations/show.rdf.builder +1 -1
  247. data/app/views/medium_of_performances/edit.html.erb +1 -1
  248. data/app/views/medium_of_performances/index.html.erb +16 -9
  249. data/app/views/medium_of_performances/new.html.erb +1 -1
  250. data/app/views/medium_of_performances/show.html.erb +1 -1
  251. data/app/views/notifier/manifestation_info.en.text.erb +2 -2
  252. data/app/views/notifier/manifestation_info.ja.text.erb +2 -2
  253. data/app/views/owns/edit.html.erb +1 -1
  254. data/app/views/owns/index.html.erb +4 -4
  255. data/app/views/owns/new.html.erb +1 -1
  256. data/app/views/owns/show.html.erb +3 -3
  257. data/app/views/picture_files/_index.html.erb +7 -7
  258. data/app/views/picture_files/_index_agent.html.erb +4 -4
  259. data/app/views/picture_files/_index_event.html.erb +4 -4
  260. data/app/views/picture_files/_index_manifestation.html.erb +4 -4
  261. data/app/views/picture_files/_index_shelf.html.erb +4 -4
  262. data/app/views/picture_files/_link.html.erb +1 -1
  263. data/app/views/picture_files/_link.mobile.erb +1 -1
  264. data/app/views/picture_files/edit.html.erb +1 -1
  265. data/app/views/picture_files/index.html.erb +1 -1
  266. data/app/views/picture_files/new.html.erb +2 -2
  267. data/app/views/picture_files/show.html.erb +7 -7
  268. data/app/views/picture_files/show.mobile.erb +2 -2
  269. data/app/views/produce_types/edit.html.erb +1 -1
  270. data/app/views/produce_types/index.html.erb +20 -12
  271. data/app/views/produce_types/new.html.erb +1 -1
  272. data/app/views/produce_types/show.html.erb +1 -1
  273. data/app/views/produces/_index.html.erb +3 -3
  274. data/app/views/produces/_index_agent.html.erb +3 -3
  275. data/app/views/produces/_index_manifestation.html.erb +5 -5
  276. data/app/views/produces/edit.html.erb +1 -1
  277. data/app/views/produces/index.html.erb +1 -1
  278. data/app/views/produces/new.html.erb +3 -3
  279. data/app/views/produces/show.html.erb +3 -3
  280. data/app/views/realize_types/edit.html.erb +1 -1
  281. data/app/views/realize_types/index.html.erb +20 -12
  282. data/app/views/realize_types/new.html.erb +1 -1
  283. data/app/views/realize_types/show.html.erb +1 -1
  284. data/app/views/realizes/_index.html.erb +3 -3
  285. data/app/views/realizes/_index_agent.html.erb +3 -3
  286. data/app/views/realizes/_index_expression.html.erb +5 -5
  287. data/app/views/realizes/edit.html.erb +1 -1
  288. data/app/views/realizes/new.html.erb +3 -3
  289. data/app/views/realizes/show.html.erb +3 -3
  290. data/app/views/resource_export_files/index.html.erb +3 -3
  291. data/app/views/resource_export_files/new.html.erb +2 -2
  292. data/app/views/resource_export_files/show.html.erb +1 -1
  293. data/app/views/resource_import_files/_observe_field.html.erb +7 -0
  294. data/app/views/resource_import_files/edit.html.erb +1 -1
  295. data/app/views/resource_import_files/index.html.erb +30 -25
  296. data/app/views/resource_import_files/new.html.erb +21 -13
  297. data/app/views/resource_import_files/show.html.erb +9 -4
  298. data/app/views/resource_import_results/index.html.erb +6 -6
  299. data/app/views/resource_import_results/{index.tsv.erb → index.txt.erb} +0 -0
  300. data/app/views/resource_import_results/show.html.erb +1 -1
  301. data/app/views/series_statements/_form.html.erb +2 -2
  302. data/app/views/series_statements/_index.html.erb +5 -5
  303. data/app/views/series_statements/_index_manifestation.html.erb +5 -5
  304. data/app/views/series_statements/_index_series_statement_merge_list.html.erb +5 -5
  305. data/app/views/series_statements/_merge.html.erb +2 -2
  306. data/app/views/series_statements/_refine_search_form.html.erb +2 -2
  307. data/app/views/series_statements/edit.html.erb +1 -1
  308. data/app/views/series_statements/new.html.erb +1 -1
  309. data/app/views/series_statements/show.html.erb +2 -2
  310. data/config/locales/translation_en.yml +13 -9
  311. data/config/locales/translation_ja.yml +16 -9
  312. data/config/routes.rb +5 -14
  313. data/db/migrate/001_create_agents.rb +0 -2
  314. data/db/migrate/006_create_items.rb +0 -2
  315. data/db/migrate/20100925074559_create_agent_import_results.rb +0 -1
  316. data/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +8 -0
  317. data/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +5 -0
  318. data/db/migrate/20140802082007_add_manifestation_id_to_item.rb +6 -0
  319. data/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +5 -0
  320. data/lib/enju_biblio/biblio_helper.rb +4 -4
  321. data/lib/enju_biblio/engine.rb +0 -1
  322. data/lib/enju_biblio/version.rb +1 -1
  323. data/lib/generators/enju_biblio/setup/setup_generator.rb +2 -0
  324. data/lib/generators/enju_biblio/setup/templates/db/fixtures/agent_relationship_types.yml +3 -3
  325. data/lib/generators/enju_biblio/setup/templates/db/fixtures/agent_types.yml +2 -2
  326. data/lib/generators/enju_biblio/setup/templates/db/fixtures/carrier_types.yml +12 -10
  327. data/lib/generators/enju_biblio/setup/templates/db/fixtures/content_types.yml +70 -7
  328. data/lib/generators/enju_biblio/setup/templates/db/fixtures/manifestation_relationship_types.yml +2 -2
  329. data/lib/tasks/carrier_type.rb +26 -0
  330. data/lib/tasks/content_type.rb +19 -0
  331. data/lib/tasks/enju_biblio_tasks.rake +14 -0
  332. data/lib/tasks/item.rb +7 -0
  333. data/spec/cassette_library/ResourceImportFile/should_import_in_background.yml +433 -0
  334. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_has_only_isbn/should_be_imported.yml +363 -326
  335. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_shift_jis/should_be_imported.yml +166 -180
  336. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_be_imported.yml +166 -180
  337. data/spec/controllers/agent_import_files_controller_spec.rb +20 -60
  338. data/spec/controllers/agent_import_results_controller_spec.rb +6 -18
  339. data/spec/controllers/agent_relationship_types_controller_spec.rb +21 -21
  340. data/spec/controllers/agent_relationships_controller_spec.rb +21 -21
  341. data/spec/controllers/agent_types_controller_spec.rb +2 -1
  342. data/spec/controllers/carrier_types_controller_spec.rb +1 -1
  343. data/spec/controllers/content_types_controller_spec.rb +2 -1
  344. data/spec/controllers/countries_controller_spec.rb +22 -23
  345. data/spec/controllers/create_types_controller_spec.rb +2 -2
  346. data/spec/controllers/creates_controller_spec.rb +22 -22
  347. data/spec/controllers/donates_controller_spec.rb +21 -21
  348. data/spec/controllers/extents_controller_spec.rb +2 -1
  349. data/spec/controllers/form_of_works_controller_spec.rb +2 -2
  350. data/spec/controllers/frequencies_controller_spec.rb +2 -1
  351. data/spec/controllers/identifier_types_controller_spec.rb +1 -1
  352. data/spec/controllers/import_requests_controller_spec.rb +21 -21
  353. data/spec/controllers/items_controller_spec.rb +24 -24
  354. data/spec/controllers/languages_controller_spec.rb +12 -12
  355. data/spec/controllers/licenses_controller_spec.rb +2 -1
  356. data/spec/controllers/manifestation_relationship_types_controller_spec.rb +21 -21
  357. data/spec/controllers/manifestation_relationships_controller_spec.rb +21 -21
  358. data/spec/controllers/manifestations_controller_spec.rb +22 -22
  359. data/spec/controllers/medium_of_performances_controller_spec.rb +2 -1
  360. data/spec/controllers/owns_controller_spec.rb +22 -22
  361. data/spec/controllers/picture_files_controller_spec.rb +21 -21
  362. data/spec/controllers/produce_types_controller_spec.rb +2 -1
  363. data/spec/controllers/produces_controller_spec.rb +22 -22
  364. data/spec/controllers/realize_types_controller_spec.rb +2 -1
  365. data/spec/controllers/realizes_controller_spec.rb +23 -23
  366. data/spec/controllers/resource_export_files_controller_spec.rb +18 -18
  367. data/spec/controllers/resource_import_files_controller_spec.rb +18 -18
  368. data/spec/controllers/resource_import_results_controller_spec.rb +9 -9
  369. data/spec/dummy/app/models/user.rb +4 -79
  370. data/spec/dummy/config/environments/test.rb +3 -2
  371. data/spec/dummy/db/development.sqlite3 +0 -0
  372. data/spec/dummy/db/migrate/20111201155456_devise_create_users.rb +42 -0
  373. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +26 -0
  374. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +18 -0
  375. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +11 -0
  376. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +20 -0
  377. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +14 -0
  378. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +14 -0
  379. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +14 -0
  380. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +14 -0
  381. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +14 -0
  382. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +14 -0
  383. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +14 -0
  384. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +14 -0
  385. data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +11 -0
  386. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +5 -0
  387. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +11 -0
  388. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +14 -0
  389. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +5 -0
  390. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +5 -0
  391. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +12 -0
  392. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
  393. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
  394. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +5 -0
  395. data/spec/dummy/db/schema.rb +218 -24
  396. data/spec/dummy/db/test.sqlite3 +0 -0
  397. data/spec/dummy/private/system/agent_import_files/agent_imports/000/000/004/original/agent_import_file_sample1.tsv +5 -5
  398. data/spec/dummy/private/system/agent_import_files/agent_imports/000/000/004/original/agent_import_file_sample2.tsv +8 -8
  399. data/spec/dummy/private/system/agent_import_files/agent_imports/000/000/004/original/agent_import_file_sample3.tsv +5 -5
  400. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/item_update_file.tsv +5 -4
  401. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv +19 -19
  402. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv +19 -19
  403. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140702-50651-14mi4s9.txt +147 -0
  404. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140702-50742-1fdbjo6.txt +147 -0
  405. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140704-12784-ozvvo.txt +147 -0
  406. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-18550-cc3qx2.txt +147 -0
  407. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-19313-rlc624.txt +147 -0
  408. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-20440-1o0htch.txt +147 -0
  409. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/{resource_export_file_20140705-26819-14hii8j.txt → resource_export_file_20140705-28145-o9qcd4.txt} +0 -0
  410. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/{resource_export_file_20140705-43608-i7uus1.txt → resource_export_file_20140722-98727-1jesse9.txt} +0 -0
  411. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140816-17115-1c1tv13.txt +147 -0
  412. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140816-18348-14d01b3.txt +147 -0
  413. data/spec/dummy/solr/test/data/index/_20i.fdt +0 -0
  414. data/spec/dummy/solr/test/data/index/_20i.fdx +0 -0
  415. data/spec/dummy/solr/test/data/index/_20i.fnm +0 -0
  416. data/spec/dummy/solr/test/data/index/_20i.nvd +0 -0
  417. data/spec/dummy/solr/test/data/index/_20i.nvm +0 -0
  418. data/spec/dummy/solr/test/data/index/_20i.si +0 -0
  419. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.doc +0 -0
  420. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.pos +0 -0
  421. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.tim +0 -0
  422. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.tip +0 -0
  423. data/spec/dummy/solr/test/data/index/_20j.fdt +0 -0
  424. data/spec/dummy/solr/test/data/index/_20j.fdx +0 -0
  425. data/spec/dummy/solr/test/data/index/_20j.fnm +0 -0
  426. data/spec/dummy/solr/test/data/index/_20j.nvd +0 -0
  427. data/spec/dummy/solr/test/data/index/_20j.nvm +0 -0
  428. data/spec/dummy/solr/test/data/index/_20j.si +0 -0
  429. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.doc +0 -0
  430. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.pos +0 -0
  431. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.tim +0 -0
  432. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.tip +0 -0
  433. data/spec/dummy/solr/test/data/index/_20k.fdt +0 -0
  434. data/spec/dummy/solr/test/data/index/_20k.fdx +0 -0
  435. data/spec/dummy/solr/test/data/index/_20k.fnm +0 -0
  436. data/spec/dummy/solr/test/data/index/_20k.nvd +0 -0
  437. data/spec/dummy/solr/test/data/index/_20k.nvm +0 -0
  438. data/spec/dummy/solr/test/data/index/_20k.si +0 -0
  439. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.doc +0 -0
  440. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.pos +0 -0
  441. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.tim +0 -0
  442. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.tip +0 -0
  443. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  444. data/spec/dummy/solr/test/data/index/segments_2uc +0 -0
  445. data/spec/dummy/solr/test/data/tlog/{tlog.0000000000000000492 → tlog.0000000000000003680} +0 -0
  446. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000003681 +0 -0
  447. data/spec/dummy/solr/test/data/tlog/{tlog.0000000000000000494 → tlog.0000000000000003682} +0 -0
  448. data/spec/dummy/test/integration/resource_export_file_test.rb +7 -0
  449. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  450. data/spec/dummy/tmp/cache/6E4/420/search_engine_all +0 -0
  451. data/spec/dummy/tmp/cache/assets/test/sprockets/01c388ec88c5fa6d00409d725549a506 +0 -0
  452. data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
  453. data/spec/dummy/tmp/cache/assets/test/sprockets/0483120d2ec851526d1beb322a87b34d +0 -0
  454. data/spec/dummy/tmp/cache/assets/test/sprockets/0c0062cfb97ef1437ab0020e724876c6 +0 -0
  455. data/spec/dummy/tmp/cache/assets/test/sprockets/0c8f59d97121b79a2e2a0d009d6da9c3 +0 -0
  456. data/spec/dummy/tmp/cache/assets/test/sprockets/0d8876cd5c35974067b09df39826ad64 +0 -0
  457. data/spec/dummy/tmp/cache/assets/test/sprockets/0dfa4223643dd4c4e2f977989012a78f +0 -0
  458. data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
  459. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  460. data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
  461. data/spec/dummy/tmp/cache/assets/test/sprockets/15aaed1a5a5f4f98d5c8d19084d7980d +0 -0
  462. data/spec/dummy/tmp/cache/assets/test/sprockets/16262df7c7e382ef78b21f453750ea94 +0 -0
  463. data/spec/dummy/tmp/cache/assets/test/sprockets/173711a319dbf01f35a2ad8e1efe08b9 +0 -0
  464. data/spec/dummy/tmp/cache/assets/test/sprockets/19a44bc29c5173edea456f9416243854 +0 -0
  465. data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
  466. data/spec/dummy/tmp/cache/assets/test/sprockets/1d0caee819e97b6e819aff48d160ba0e +0 -0
  467. data/spec/dummy/tmp/cache/assets/test/sprockets/1eeeee88b80ad204f61af2154ab097db +0 -0
  468. data/spec/dummy/tmp/cache/assets/test/sprockets/24051f5752691433a5a205b04a62fca1 +0 -0
  469. data/spec/dummy/tmp/cache/assets/test/sprockets/267e026cf7dcb8ed5ca66aa83dff1a87 +0 -0
  470. data/spec/dummy/tmp/cache/assets/test/sprockets/2b35ad8fee7e1228e205669278e2adda +0 -0
  471. data/spec/dummy/tmp/cache/assets/test/sprockets/2d65b40e585725207fd52ce4cf5134f4 +0 -0
  472. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  473. data/spec/dummy/tmp/cache/assets/test/sprockets/305729f8ea45e96c3a7e75df920aa125 +0 -0
  474. data/spec/dummy/tmp/cache/assets/test/sprockets/3417713460df81bb2349531adec5f348 +0 -0
  475. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  476. data/spec/dummy/tmp/cache/assets/test/sprockets/36fe3bdb5b7a6e84e23515bca1842154 +0 -0
  477. data/spec/dummy/tmp/cache/assets/test/sprockets/3ed0e4936463665c59155042a650dfa5 +0 -0
  478. data/spec/dummy/tmp/cache/assets/test/sprockets/3fc2b4de95dbb94dfe82ccfc97265cc4 +0 -0
  479. data/spec/dummy/tmp/cache/assets/test/sprockets/40e90f0c329b14292a9ff1a2fe907b39 +0 -0
  480. data/spec/dummy/tmp/cache/assets/test/sprockets/45adf514664dd4134fb290b1938c56d8 +0 -0
  481. data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
  482. data/spec/dummy/tmp/cache/assets/test/sprockets/46ed442c54e0ad50ed9cbff91bca2c03 +0 -0
  483. data/spec/dummy/tmp/cache/assets/test/sprockets/479d8a0e6643a473b785734c1fb0655b +0 -0
  484. data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
  485. data/spec/dummy/tmp/cache/assets/test/sprockets/4db7c7b5ea13aacccd89ea32460e2de0 +0 -0
  486. data/spec/dummy/tmp/cache/assets/test/sprockets/4facb9d4adad5d1f55e19897f19ff502 +0 -0
  487. data/spec/dummy/tmp/cache/assets/test/sprockets/51df74c0fa7fbfa41670caa0f4268d54 +0 -0
  488. data/spec/dummy/tmp/cache/assets/test/sprockets/53ce49f7cb73ec18bfefea19be486fd5 +0 -0
  489. data/spec/dummy/tmp/cache/assets/test/sprockets/55de678ed3c84c51b3a4b4cf473da823 +0 -0
  490. data/spec/dummy/tmp/cache/assets/test/sprockets/5686725a34a5b152399098fe6811dfcc +0 -0
  491. data/spec/dummy/tmp/cache/assets/test/sprockets/5762cca052dd5d3eb8bb35e2ed9a59b8 +0 -0
  492. data/spec/dummy/tmp/cache/assets/test/sprockets/59d9f2ec47e055feaa8deb88dd230fd9 +0 -0
  493. data/spec/dummy/tmp/cache/assets/test/sprockets/5d30286c45c334a3e08806b2713ddbcd +0 -0
  494. data/spec/dummy/tmp/cache/assets/test/sprockets/5f084c5c398edfb6e223c67ec8fbf80d +0 -0
  495. data/spec/dummy/tmp/cache/assets/test/sprockets/60d030b3fef398bd6c75b5342c1e6951 +0 -0
  496. data/spec/dummy/tmp/cache/assets/test/sprockets/6273ac5ec2eeeb08808c520e45e7c353 +0 -0
  497. data/spec/dummy/tmp/cache/assets/test/sprockets/64513343a4d1500f6642a9797f2d6caf +0 -0
  498. data/spec/dummy/tmp/cache/assets/test/sprockets/64ee480e95febf6b404c1264755ea42e +0 -0
  499. data/spec/dummy/tmp/cache/assets/test/sprockets/6580b1bd3cb606ae0cc6a660e43ee91d +0 -0
  500. data/spec/dummy/tmp/cache/assets/test/sprockets/66e8ff0ee49363fdd0e1866807515228 +0 -0
  501. data/spec/dummy/tmp/cache/assets/test/sprockets/67ef1f14c3ad48997b6d2971949a9974 +0 -0
  502. data/spec/dummy/tmp/cache/assets/test/sprockets/6cf8b3b420dc28c045daec27150ade0a +0 -0
  503. data/spec/dummy/tmp/cache/assets/test/sprockets/7395823b7ae60934b3053f26fdb362d4 +0 -0
  504. data/spec/dummy/tmp/cache/assets/test/sprockets/74c056fa2e48770cba3499207a5027f5 +0 -0
  505. data/spec/dummy/tmp/cache/assets/test/sprockets/796cd029cd1ff06c3212795cdcc5a7c4 +0 -0
  506. data/spec/dummy/tmp/cache/assets/test/sprockets/7de140ed6f303b9d00d8d703cced3349 +0 -0
  507. data/spec/dummy/tmp/cache/assets/test/sprockets/7ef97a0c04f996570fa8d054e77614e4 +0 -0
  508. data/spec/dummy/tmp/cache/assets/test/sprockets/80348afae86df384b25e1e3bff21b13e +0 -0
  509. data/spec/dummy/tmp/cache/assets/test/sprockets/814bc1bed3effa0bb4588eb8b75ab92a +0 -0
  510. data/spec/dummy/tmp/cache/assets/test/sprockets/8488002e0e6035b7d00c3800c2c0e27e +0 -0
  511. data/spec/dummy/tmp/cache/assets/test/sprockets/84c8a64682205dba3f8edd60fc1ec8e5 +0 -0
  512. data/spec/dummy/tmp/cache/assets/test/sprockets/86dfe8a3e156aeb6ebcd456b2251fab7 +0 -0
  513. data/spec/dummy/tmp/cache/assets/test/sprockets/89c9228bae34e0ff18fd8fe7f6eb5847 +0 -0
  514. data/spec/dummy/tmp/cache/assets/test/sprockets/8e2bf5102d77a2cff3dda27a5617a79d +0 -0
  515. data/spec/dummy/tmp/cache/assets/test/sprockets/9411c91747cff7187d3b5eb3d5401758 +0 -0
  516. data/spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9 +0 -0
  517. data/spec/dummy/tmp/cache/assets/test/sprockets/994c519d4fdf48cadf8846c64a7c217d +0 -0
  518. data/spec/dummy/tmp/cache/assets/test/sprockets/9a11ac4cf3c8597981773b8ea1c36659 +0 -0
  519. data/spec/dummy/tmp/cache/assets/test/sprockets/a2474b74df12470fb37c668b85b562c6 +0 -0
  520. data/spec/dummy/tmp/cache/assets/test/sprockets/a2ee8688f63b884277632a234086f7df +0 -0
  521. data/spec/dummy/tmp/cache/assets/test/sprockets/a3cea75f1356ef55329e78f86b4c72b1 +0 -0
  522. data/spec/dummy/tmp/cache/assets/test/sprockets/a5ff35005a82346756c8a2d9b564aa8e +0 -0
  523. data/spec/dummy/tmp/cache/assets/test/sprockets/a72fe28675ab93fbb5f1fab49703e8b8 +0 -0
  524. data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
  525. data/spec/dummy/tmp/cache/assets/test/sprockets/b0e11c6d89683eaa7256a44a164a2a12 +0 -0
  526. data/spec/dummy/tmp/cache/assets/test/sprockets/b530f21ccf5882027bf2aff5502dc79e +0 -0
  527. data/spec/dummy/tmp/cache/assets/test/sprockets/b62c2d32477b85c1a8e33a4b3ba86483 +0 -0
  528. data/spec/dummy/tmp/cache/assets/test/sprockets/b817a9a61cc21da35abec9d0dfb2a143 +0 -0
  529. data/spec/dummy/tmp/cache/assets/test/sprockets/b9ad765321d7527b38c851119d4d6f41 +0 -0
  530. data/spec/dummy/tmp/cache/assets/test/sprockets/bc086c9c936e5b91659a438d35126a90 +0 -0
  531. data/spec/dummy/tmp/cache/assets/test/sprockets/bf17ca8affe2a1febca7f2a4e37cd77b +0 -0
  532. data/spec/dummy/tmp/cache/assets/test/sprockets/c21a9a8a5166b51d4c2737ad4b99c16b +0 -0
  533. data/spec/dummy/tmp/cache/assets/test/sprockets/c36b7431da1ae91722b1c4091e4ba084 +0 -0
  534. data/spec/dummy/tmp/cache/assets/test/sprockets/c3e87e99d52cd8082c8548a7aa63b9da +0 -0
  535. data/spec/dummy/tmp/cache/assets/test/sprockets/c40786442706ae0cc6c793c6ee2500d3 +0 -0
  536. data/spec/dummy/tmp/cache/assets/test/sprockets/c42ec68313928d1544e733ae8383ef6d +0 -0
  537. data/spec/dummy/tmp/cache/assets/test/sprockets/c488c91e58a235d36a0ff8058e5a1004 +0 -0
  538. data/spec/dummy/tmp/cache/assets/test/sprockets/c4dbc19d89022a35885f5621f6b86eb3 +0 -0
  539. data/spec/dummy/tmp/cache/assets/test/sprockets/c6bbf5ca5c9b58807ba226fde0ccc60f +0 -0
  540. data/spec/dummy/tmp/cache/assets/test/sprockets/c7b0db461dfcfc1108bf9a6a87fb909d +0 -0
  541. data/spec/dummy/tmp/cache/assets/test/sprockets/c9d565eb8899b86408d9fd06fbf039be +0 -0
  542. data/spec/dummy/tmp/cache/assets/test/sprockets/cfeee09fa6b6ec2344a7b44bf0676028 +0 -0
  543. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  544. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  545. data/spec/dummy/tmp/cache/assets/test/sprockets/d8d8b7e606faf0fa1c22a6c2ebc2b58f +0 -0
  546. data/spec/dummy/tmp/cache/assets/test/sprockets/d8e283e15fd77782ae12f9b18e5be456 +0 -0
  547. data/spec/dummy/tmp/cache/assets/test/sprockets/d909adefad62117a3e85463b83954827 +0 -0
  548. data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
  549. data/spec/dummy/tmp/cache/assets/test/sprockets/e22f9546f5d75bd3549886e979dcb96e +0 -0
  550. data/spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15 +0 -0
  551. data/spec/dummy/tmp/cache/assets/test/sprockets/e58908ad0ccad6546faf9bcab669b0cd +0 -0
  552. data/spec/dummy/tmp/cache/assets/test/sprockets/e8f801eeda49cba4a03cfd9e2a4562ae +0 -0
  553. data/spec/dummy/tmp/cache/assets/test/sprockets/ea6fdf5f7aa83bf540d26f1ae12159a8 +0 -0
  554. data/spec/dummy/tmp/cache/assets/test/sprockets/eef93e7d091d8118419fb96adf80387b +0 -0
  555. data/spec/dummy/tmp/cache/assets/test/sprockets/efd104c04916854411c86a5440ba30e0 +0 -0
  556. data/spec/dummy/tmp/cache/assets/test/sprockets/f32a42f77e45018f7748de516be3c393 +0 -0
  557. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
  558. data/spec/dummy/tmp/cache/assets/test/sprockets/fb91323d4585f2e27d281cdb4193beb1 +0 -0
  559. data/spec/dummy/tmp/cache/assets/test/sprockets/fd080bad11122c7c3147a3fe1964c396 +0 -0
  560. data/spec/dummy/tmp/cache/assets/test/sprockets/fd88f9f1128cbff14dd2fa00800cfa10 +0 -0
  561. data/spec/dummy/tmp/cache/assets/test/sprockets/fe5bcfd29764185be3d476dee4108595 +0 -0
  562. data/spec/dummy/tmp/cache/assets/test/sprockets/ff64e9ded481959dfa8c78718e59e607 +0 -0
  563. data/spec/dummy/tmp/cache/stdout +3579 -87
  564. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  565. data/spec/factories/agent.rb +1 -1
  566. data/spec/factories/profile.rb +10 -0
  567. data/spec/factories/user.rb +21 -12
  568. data/spec/fixtures/agent_relationship_types.yml +3 -3
  569. data/spec/fixtures/agent_types.yml +3 -3
  570. data/spec/fixtures/agents.yml +0 -7
  571. data/spec/fixtures/carrier_types.yml +2 -2
  572. data/spec/fixtures/items.yml +46 -19
  573. data/spec/fixtures/manifestations.yml +1 -0
  574. data/spec/fixtures/message_requests.yml +3 -4
  575. data/spec/fixtures/message_templates.yml +51 -16
  576. data/spec/fixtures/profiles.yml +98 -0
  577. data/spec/fixtures/reserve_transitions.yml +88 -0
  578. data/spec/fixtures/resource_import_files.yml +1 -1
  579. data/spec/fixtures/user_groups.yml +3 -3
  580. data/spec/models/agent_import_file_spec.rb +0 -3
  581. data/spec/models/agent_spec.rb +0 -1
  582. data/spec/models/item_spec.rb +36 -26
  583. data/spec/models/manifestation_spec.rb +7 -0
  584. data/spec/models/resource_export_file_spec.rb +3 -0
  585. data/spec/models/resource_import_file_spec.rb +63 -34
  586. data/spec/spec_helper.rb +0 -1
  587. data/spec/support/resque.rb +3 -2
  588. data/spec/views/agent_types/index.html.erb_spec.rb +2 -2
  589. data/spec/views/create_types/index.html.erb_spec.rb +2 -2
  590. data/spec/views/produce_types/index.html.erb_spec.rb +2 -2
  591. data/spec/views/realize_types/index.html.erb_spec.rb +2 -2
  592. metadata +391 -67
  593. data/app/controllers/exemplifies_controller.rb +0 -103
  594. data/app/views/exemplifies/_form.html.erb +0 -27
  595. data/app/views/exemplifies/edit.html.erb +0 -13
  596. data/app/views/exemplifies/index.html.erb +0 -38
  597. data/app/views/exemplifies/new.html.erb +0 -12
  598. data/app/views/exemplifies/show.html.erb +0 -24
  599. data/app/views/items/index.csv.erb +0 -4
  600. data/app/views/manifestations/_question_list.html.erb +0 -13
  601. data/lib/generators/enju_biblio/setup/templates/db/fixtures/request_status_types.yml +0 -37
  602. data/lib/generators/enju_biblio/setup/templates/db/fixtures/request_types.yml +0 -29
  603. data/spec/controllers/exemplifies_controller_spec.rb +0 -446
  604. data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -16
  605. data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb +0 -44
  606. data/spec/dummy/solr/test/data/index/segments_dv +0 -0
  607. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000493 +0 -0
  608. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000495 +0 -0
  609. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000496 +0 -0
  610. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000497 +0 -0
  611. data/spec/views/exemplifies/edit.html.erb_spec.rb +0 -22
  612. data/spec/views/exemplifies/index.html.erb_spec.rb +0 -25
  613. data/spec/views/exemplifies/new.html.erb_spec.rb +0 -22
  614. data/spec/views/exemplifies/show.html.erb_spec.rb +0 -19
data/spec/controllers/agent_import_results_controller_spec.rb CHANGED
@@ -6,9 +6,7 @@ describe AgentImportResultsController do
6
6
 
7
7
  describe "GET index" do
8
8
  describe "When logged in as Administrator" do
9
- before(:each) do
10
- sign_in FactoryGirl.create(:admin)
11
- end
9
+ login_fixture_admin
12
10
 
13
11
  it "assigns all agent_import_results as @agent_import_results" do
14
12
  get :index
@@ -17,9 +15,7 @@ describe AgentImportResultsController do
17
15
  end
18
16
 
19
17
  describe "When logged in as Librarian" do
20
- before(:each) do
21
- sign_in FactoryGirl.create(:librarian)
22
- end
18
+ login_fixture_librarian
23
19
 
24
20
  it "assigns all agent_import_results as @agent_import_results" do
25
21
  get :index
@@ -28,9 +24,7 @@ describe AgentImportResultsController do
28
24
  end
29
25
 
30
26
  describe "When logged in as User" do
31
- before(:each) do
32
- sign_in FactoryGirl.create(:user)
33
- end
27
+ login_fixture_user
34
28
 
35
29
  it "assigns empty as @agent_import_results" do
36
30
  get :index
@@ -50,9 +44,7 @@ describe AgentImportResultsController do
50
44
 
51
45
  describe "GET show" do
52
46
  describe "When logged in as Administrator" do
53
- before(:each) do
54
- sign_in FactoryGirl.create(:admin)
55
- end
47
+ login_fixture_admin
56
48
 
57
49
  it "assigns the requested agent_import_result as @agent_import_result" do
58
50
  get :show, :id => 1
@@ -61,9 +53,7 @@ describe AgentImportResultsController do
61
53
  end
62
54
 
63
55
  describe "When logged in as Librarian" do
64
- before(:each) do
65
- sign_in FactoryGirl.create(:librarian)
66
- end
56
+ login_fixture_librarian
67
57
 
68
58
  it "assigns the requested agent_import_result as @agent_import_result" do
69
59
  get :show, :id => 1
@@ -72,9 +62,7 @@ describe AgentImportResultsController do
72
62
  end
73
63
 
74
64
  describe "When logged in as User" do
75
- before(:each) do
76
- sign_in FactoryGirl.create(:user)
77
- end
65
+ login_fixture_user
78
66
 
79
67
  it "assigns the requested agent_import_result as @agent_import_result" do
80
68
  get :show, :id => 1
data/spec/controllers/agent_relationship_types_controller_spec.rb CHANGED
@@ -15,7 +15,7 @@ describe AgentRelationshipTypesController do
15
15
  end
16
16
 
17
17
  describe "When logged in as Administrator" do
18
- login_admin
18
+ login_fixture_admin
19
19
 
20
20
  it "assigns all agent_relationship_types as @agent_relationship_types" do
21
21
  get :index
@@ -24,7 +24,7 @@ describe AgentRelationshipTypesController do
24
24
  end
25
25
 
26
26
  describe "When logged in as Librarian" do
27
- login_librarian
27
+ login_fixture_librarian
28
28
 
29
29
  it "assigns all agent_relationship_types as @agent_relationship_types" do
30
30
  get :index
@@ -33,7 +33,7 @@ describe AgentRelationshipTypesController do
33
33
  end
34
34
 
35
35
  describe "When logged in as User" do
36
- login_user
36
+ login_fixture_user
37
37
 
38
38
  it "assigns all agent_relationship_types as @agent_relationship_types" do
39
39
  get :index
@@ -51,7 +51,7 @@ describe AgentRelationshipTypesController do
51
51
 
52
52
  describe "GET show" do
53
53
  describe "When logged in as Administrator" do
54
- login_admin
54
+ login_fixture_admin
55
55
 
56
56
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
57
57
  agent_relationship_type = FactoryGirl.create(:agent_relationship_type)
@@ -61,7 +61,7 @@ describe AgentRelationshipTypesController do
61
61
  end
62
62
 
63
63
  describe "When logged in as Librarian" do
64
- login_librarian
64
+ login_fixture_librarian
65
65
 
66
66
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
67
67
  agent_relationship_type = FactoryGirl.create(:agent_relationship_type)
@@ -71,7 +71,7 @@ describe AgentRelationshipTypesController do
71
71
  end
72
72
 
73
73
  describe "When logged in as User" do
74
- login_user
74
+ login_fixture_user
75
75
 
76
76
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
77
77
  agent_relationship_type = FactoryGirl.create(:agent_relationship_type)
@@ -91,7 +91,7 @@ describe AgentRelationshipTypesController do
91
91
 
92
92
  describe "GET new" do
93
93
  describe "When logged in as Administrator" do
94
- login_admin
94
+ login_fixture_admin
95
95
 
96
96
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
97
97
  get :new
@@ -101,7 +101,7 @@ describe AgentRelationshipTypesController do
101
101
  end
102
102
 
103
103
  describe "When logged in as Librarian" do
104
- login_librarian
104
+ login_fixture_librarian
105
105
 
106
106
  it "should not assign the requested agent_relationship_type as @agent_relationship_type" do
107
107
  get :new
@@ -111,7 +111,7 @@ describe AgentRelationshipTypesController do
111
111
  end
112
112
 
113
113
  describe "When logged in as User" do
114
- login_user
114
+ login_fixture_user
115
115
 
116
116
  it "should not assign the requested agent_relationship_type as @agent_relationship_type" do
117
117
  get :new
@@ -131,7 +131,7 @@ describe AgentRelationshipTypesController do
131
131
 
132
132
  describe "GET edit" do
133
133
  describe "When logged in as Administrator" do
134
- login_admin
134
+ login_fixture_admin
135
135
 
136
136
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
137
137
  agent_relationship_type = FactoryGirl.create(:agent_relationship_type)
@@ -141,7 +141,7 @@ describe AgentRelationshipTypesController do
141
141
  end
142
142
 
143
143
  describe "When logged in as Librarian" do
144
- login_librarian
144
+ login_fixture_librarian
145
145
 
146
146
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
147
147
  agent_relationship_type = FactoryGirl.create(:agent_relationship_type)
@@ -151,7 +151,7 @@ describe AgentRelationshipTypesController do
151
151
  end
152
152
 
153
153
  describe "When logged in as User" do
154
- login_user
154
+ login_fixture_user
155
155
 
156
156
  it "assigns the requested agent_relationship_type as @agent_relationship_type" do
157
157
  agent_relationship_type = FactoryGirl.create(:agent_relationship_type)
@@ -176,7 +176,7 @@ describe AgentRelationshipTypesController do
176
176
  end
177
177
 
178
178
  describe "When logged in as Administrator" do
179
- login_admin
179
+ login_fixture_admin
180
180
 
181
181
  describe "with valid params" do
182
182
  it "assigns a newly created agent_relationship_type as @agent_relationship_type" do
@@ -204,7 +204,7 @@ describe AgentRelationshipTypesController do
204
204
  end
205
205
 
206
206
  describe "When logged in as Librarian" do
207
- login_librarian
207
+ login_fixture_librarian
208
208
 
209
209
  describe "with valid params" do
210
210
  it "assigns a newly created agent_relationship_type as @agent_relationship_type" do
@@ -232,7 +232,7 @@ describe AgentRelationshipTypesController do
232
232
  end
233
233
 
234
234
  describe "When logged in as User" do
235
- login_user
235
+ login_fixture_user
236
236
 
237
237
  describe "with valid params" do
238
238
  it "assigns a newly created agent_relationship_type as @agent_relationship_type" do
@@ -294,7 +294,7 @@ describe AgentRelationshipTypesController do
294
294
  end
295
295
 
296
296
  describe "When logged in as Administrator" do
297
- login_admin
297
+ login_fixture_admin
298
298
 
299
299
  describe "with valid params" do
300
300
  it "updates the requested agent_relationship_type" do
@@ -321,7 +321,7 @@ describe AgentRelationshipTypesController do
321
321
  end
322
322
 
323
323
  describe "When logged in as Librarian" do
324
- login_librarian
324
+ login_fixture_librarian
325
325
 
326
326
  describe "with valid params" do
327
327
  it "updates the requested agent_relationship_type" do
@@ -344,7 +344,7 @@ describe AgentRelationshipTypesController do
344
344
  end
345
345
 
346
346
  describe "When logged in as User" do
347
- login_user
347
+ login_fixture_user
348
348
 
349
349
  describe "with valid params" do
350
350
  it "updates the requested agent_relationship_type" do
@@ -393,7 +393,7 @@ describe AgentRelationshipTypesController do
393
393
  end
394
394
 
395
395
  describe "When logged in as Administrator" do
396
- login_admin
396
+ login_fixture_admin
397
397
 
398
398
  it "destroys the requested agent_relationship_type" do
399
399
  delete :destroy, :id => @agent_relationship_type.id
@@ -406,7 +406,7 @@ describe AgentRelationshipTypesController do
406
406
  end
407
407
 
408
408
  describe "When logged in as Librarian" do
409
- login_librarian
409
+ login_fixture_librarian
410
410
 
411
411
  it "destroys the requested agent_relationship_type" do
412
412
  delete :destroy, :id => @agent_relationship_type.id
@@ -419,7 +419,7 @@ describe AgentRelationshipTypesController do
419
419
  end
420
420
 
421
421
  describe "When logged in as User" do
422
- login_user
422
+ login_fixture_user
423
423
 
424
424
  it "destroys the requested agent_relationship_type" do
425
425
  delete :destroy, :id => @agent_relationship_type.id
data/spec/controllers/agent_relationships_controller_spec.rb CHANGED
@@ -15,7 +15,7 @@ describe AgentRelationshipsController do
15
15
  end
16
16
 
17
17
  describe "When logged in as Administrator" do
18
- login_admin
18
+ login_fixture_admin
19
19
 
20
20
  it "assigns all agent_relationships as @agent_relationships" do
21
21
  get :index
@@ -24,7 +24,7 @@ describe AgentRelationshipsController do
24
24
  end
25
25
 
26
26
  describe "When logged in as Librarian" do
27
- login_librarian
27
+ login_fixture_librarian
28
28
 
29
29
  it "assigns all agent_relationships as @agent_relationships" do
30
30
  get :index
@@ -33,7 +33,7 @@ describe AgentRelationshipsController do
33
33
  end
34
34
 
35
35
  describe "When logged in as User" do
36
- login_user
36
+ login_fixture_user
37
37
 
38
38
  it "assigns all agent_relationships as @agent_relationships" do
39
39
  get :index
@@ -51,7 +51,7 @@ describe AgentRelationshipsController do
51
51
 
52
52
  describe "GET show" do
53
53
  describe "When logged in as Administrator" do
54
- login_admin
54
+ login_fixture_admin
55
55
 
56
56
  it "assigns the requested agent_relationship as @agent_relationship" do
57
57
  agent_relationship = FactoryGirl.create(:agent_relationship)
@@ -61,7 +61,7 @@ describe AgentRelationshipsController do
61
61
  end
62
62
 
63
63
  describe "When logged in as Librarian" do
64
- login_librarian
64
+ login_fixture_librarian
65
65
 
66
66
  it "assigns the requested agent_relationship as @agent_relationship" do
67
67
  agent_relationship = FactoryGirl.create(:agent_relationship)
@@ -71,7 +71,7 @@ describe AgentRelationshipsController do
71
71
  end
72
72
 
73
73
  describe "When logged in as User" do
74
- login_user
74
+ login_fixture_user
75
75
 
76
76
  it "assigns the requested agent_relationship as @agent_relationship" do
77
77
  agent_relationship = FactoryGirl.create(:agent_relationship)
@@ -91,7 +91,7 @@ describe AgentRelationshipsController do
91
91
 
92
92
  describe "GET new" do
93
93
  describe "When logged in as Administrator" do
94
- login_admin
94
+ login_fixture_admin
95
95
 
96
96
  it "assigns the requested agent_relationship as @agent_relationship" do
97
97
  get :new
@@ -101,7 +101,7 @@ describe AgentRelationshipsController do
101
101
  end
102
102
 
103
103
  describe "When logged in as Librarian" do
104
- login_librarian
104
+ login_fixture_librarian
105
105
 
106
106
  it "should not assign the requested agent_relationship as @agent_relationship" do
107
107
  get :new
@@ -111,7 +111,7 @@ describe AgentRelationshipsController do
111
111
  end
112
112
 
113
113
  describe "When logged in as User" do
114
- login_user
114
+ login_fixture_user
115
115
 
116
116
  it "should not assign the requested agent_relationship as @agent_relationship" do
117
117
  get :new
@@ -131,7 +131,7 @@ describe AgentRelationshipsController do
131
131
 
132
132
  describe "GET edit" do
133
133
  describe "When logged in as Administrator" do
134
- login_admin
134
+ login_fixture_admin
135
135
 
136
136
  it "assigns the requested agent_relationship as @agent_relationship" do
137
137
  agent_relationship = FactoryGirl.create(:agent_relationship)
@@ -141,7 +141,7 @@ describe AgentRelationshipsController do
141
141
  end
142
142
 
143
143
  describe "When logged in as Librarian" do
144
- login_librarian
144
+ login_fixture_librarian
145
145
 
146
146
  it "assigns the requested agent_relationship as @agent_relationship" do
147
147
  agent_relationship = FactoryGirl.create(:agent_relationship)
@@ -151,7 +151,7 @@ describe AgentRelationshipsController do
151
151
  end
152
152
 
153
153
  describe "When logged in as User" do
154
- login_user
154
+ login_fixture_user
155
155
 
156
156
  it "assigns the requested agent_relationship as @agent_relationship" do
157
157
  agent_relationship = FactoryGirl.create(:agent_relationship)
@@ -176,7 +176,7 @@ describe AgentRelationshipsController do
176
176
  end
177
177
 
178
178
  describe "When logged in as Administrator" do
179
- login_admin
179
+ login_fixture_admin
180
180
 
181
181
  describe "with valid params" do
182
182
  it "assigns a newly created agent_relationship as @agent_relationship" do
@@ -204,7 +204,7 @@ describe AgentRelationshipsController do
204
204
  end
205
205
 
206
206
  describe "When logged in as Librarian" do
207
- login_librarian
207
+ login_fixture_librarian
208
208
 
209
209
  describe "with valid params" do
210
210
  it "assigns a newly created agent_relationship as @agent_relationship" do
@@ -232,7 +232,7 @@ describe AgentRelationshipsController do
232
232
  end
233
233
 
234
234
  describe "When logged in as User" do
235
- login_user
235
+ login_fixture_user
236
236
 
237
237
  describe "with valid params" do
238
238
  it "assigns a newly created agent_relationship as @agent_relationship" do
@@ -294,7 +294,7 @@ describe AgentRelationshipsController do
294
294
  end
295
295
 
296
296
  describe "When logged in as Administrator" do
297
- login_admin
297
+ login_fixture_admin
298
298
 
299
299
  describe "with valid params" do
300
300
  it "updates the requested agent_relationship" do
@@ -322,7 +322,7 @@ describe AgentRelationshipsController do
322
322
  end
323
323
 
324
324
  describe "When logged in as Librarian" do
325
- login_librarian
325
+ login_fixture_librarian
326
326
 
327
327
  describe "with valid params" do
328
328
  it "updates the requested agent_relationship" do
@@ -345,7 +345,7 @@ describe AgentRelationshipsController do
345
345
  end
346
346
 
347
347
  describe "When logged in as User" do
348
- login_user
348
+ login_fixture_user
349
349
 
350
350
  describe "with valid params" do
351
351
  it "updates the requested agent_relationship" do
@@ -394,7 +394,7 @@ describe AgentRelationshipsController do
394
394
  end
395
395
 
396
396
  describe "When logged in as Administrator" do
397
- login_admin
397
+ login_fixture_admin
398
398
 
399
399
  it "destroys the requested agent_relationship" do
400
400
  delete :destroy, :id => @agent_relationship.id
@@ -407,7 +407,7 @@ describe AgentRelationshipsController do
407
407
  end
408
408
 
409
409
  describe "When logged in as Librarian" do
410
- login_librarian
410
+ login_fixture_librarian
411
411
 
412
412
  it "destroys the requested agent_relationship" do
413
413
  delete :destroy, :id => @agent_relationship.id
@@ -420,7 +420,7 @@ describe AgentRelationshipsController do
420
420
  end
421
421
 
422
422
  describe "When logged in as User" do
423
- login_user
423
+ login_fixture_user
424
424
 
425
425
  it "destroys the requested agent_relationship" do
426
426
  delete :destroy, :id => @agent_relationship.id
data/spec/controllers/agent_types_controller_spec.rb CHANGED
@@ -19,7 +19,8 @@ require 'spec_helper'
19
19
  # that an instance is receiving a specific message.
20
20
 
21
21
  describe AgentTypesController do
22
- login_admin
22
+ fixtures :all
23
+ login_fixture_admin
23
24
 
24
25
  # This should return the minimal set of attributes required to create a valid
25
26
  # AgentType. As you add validations to AgentType, be sure to
data/spec/controllers/carrier_types_controller_spec.rb CHANGED
@@ -20,7 +20,7 @@ require 'spec_helper'
20
20
 
21
21
  describe CarrierTypesController do
22
22
  fixtures :all
23
- login_admin
23
+ login_fixture_admin
24
24
 
25
25
  # This should return the minimal set of attributes required to create a valid
26
26
  # CarrierType. As you add validations to CarrierType, be sure to
data/spec/controllers/content_types_controller_spec.rb CHANGED
@@ -19,7 +19,8 @@ require 'spec_helper'
19
19
  # that an instance is receiving a specific message.
20
20
 
21
21
  describe ContentTypesController do
22
- login_admin
22
+ fixtures :all
23
+ login_fixture_admin
23
24
 
24
25
  # This should return the minimal set of attributes required to create a valid
25
26
  # ContentType. As you add validations to ContentType, be sure to
data/spec/controllers/countries_controller_spec.rb CHANGED
@@ -2,8 +2,7 @@ require 'spec_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe CountriesController do
5
- fixtures :countries, :agent_types, :library_groups, :languages, :user_groups,
6
- :roles
5
+ fixtures :all
7
6
  disconnect_sunspot
8
7
 
9
8
  def valid_attributes
@@ -16,7 +15,7 @@ describe CountriesController do
16
15
  end
17
16
 
18
17
  describe "When logged in as Administrator" do
19
- login_admin
18
+ login_fixture_admin
20
19
 
21
20
  it "assigns all countries as @countries" do
22
21
  get :index
@@ -25,7 +24,7 @@ describe CountriesController do
25
24
  end
26
25
 
27
26
  describe "When logged in as Librarian" do
28
- login_librarian
27
+ login_fixture_librarian
29
28
 
30
29
  it "assigns all countries as @countries" do
31
30
  get :index
@@ -34,7 +33,7 @@ describe CountriesController do
34
33
  end
35
34
 
36
35
  describe "When logged in as User" do
37
- login_user
36
+ login_fixture_user
38
37
 
39
38
  it "assigns all countries as @countries" do
40
39
  get :index
@@ -56,7 +55,7 @@ describe CountriesController do
56
55
  end
57
56
 
58
57
  describe "When logged in as Administrator" do
59
- login_admin
58
+ login_fixture_admin
60
59
 
61
60
  it "assigns the requested country as @country" do
62
61
  get :show, :id => @country.id
@@ -65,7 +64,7 @@ describe CountriesController do
65
64
  end
66
65
 
67
66
  describe "When logged in as Librarian" do
68
- login_librarian
67
+ login_fixture_librarian
69
68
 
70
69
  it "assigns the requested country as @country" do
71
70
  get :show, :id => @country.id
@@ -74,7 +73,7 @@ describe CountriesController do
74
73
  end
75
74
 
76
75
  describe "When logged in as User" do
77
- login_user
76
+ login_fixture_user
78
77
 
79
78
  it "assigns the requested country as @country" do
80
79
  get :show, :id => @country.id
@@ -92,7 +91,7 @@ describe CountriesController do
92
91
 
93
92
  describe "GET new" do
94
93
  describe "When logged in as Administrator" do
95
- login_admin
94
+ login_fixture_admin
96
95
 
97
96
  it "assigns the requested country as @country" do
98
97
  get :new
@@ -102,7 +101,7 @@ describe CountriesController do
102
101
  end
103
102
 
104
103
  describe "When logged in as Librarian" do
105
- login_librarian
104
+ login_fixture_librarian
106
105
 
107
106
  it "assigns the requested country as @country" do
108
107
  get :new
@@ -112,7 +111,7 @@ describe CountriesController do
112
111
  end
113
112
 
114
113
  describe "When logged in as User" do
115
- login_user
114
+ login_fixture_user
116
115
 
117
116
  it "assigns the requested country as @country" do
118
117
  get :new
@@ -132,7 +131,7 @@ describe CountriesController do
132
131
 
133
132
  describe "GET edit" do
134
133
  describe "When logged in as Administrator" do
135
- login_admin
134
+ login_fixture_admin
136
135
 
137
136
  it "assigns the requested country as @country" do
138
137
  country = FactoryGirl.create(:country)
@@ -142,7 +141,7 @@ describe CountriesController do
142
141
  end
143
142
 
144
143
  describe "When logged in as Librarian" do
145
- login_librarian
144
+ login_fixture_librarian
146
145
 
147
146
  it "assigns the requested country as @country" do
148
147
  country = FactoryGirl.create(:country)
@@ -152,7 +151,7 @@ describe CountriesController do
152
151
  end
153
152
 
154
153
  describe "When logged in as User" do
155
- login_user
154
+ login_fixture_user
156
155
 
157
156
  it "assigns the requested country as @country" do
158
157
  country = FactoryGirl.create(:country)
@@ -177,7 +176,7 @@ describe CountriesController do
177
176
  end
178
177
 
179
178
  describe "When logged in as Administrator" do
180
- login_admin
179
+ login_fixture_admin
181
180
 
182
181
  describe "with valid params" do
183
182
  it "assigns a newly created country as @country" do
@@ -205,7 +204,7 @@ describe CountriesController do
205
204
  end
206
205
 
207
206
  describe "When logged in as Librarian" do
208
- login_librarian
207
+ login_fixture_librarian
209
208
 
210
209
  describe "with valid params" do
211
210
  it "assigns a newly created country as @country" do
@@ -233,7 +232,7 @@ describe CountriesController do
233
232
  end
234
233
 
235
234
  describe "When logged in as User" do
236
- login_user
235
+ login_fixture_user
237
236
 
238
237
  describe "with valid params" do
239
238
  it "assigns a newly created country as @country" do
@@ -295,7 +294,7 @@ describe CountriesController do
295
294
  end
296
295
 
297
296
  describe "When logged in as Administrator" do
298
- login_admin
297
+ login_fixture_admin
299
298
 
300
299
  describe "with valid params" do
301
300
  it "updates the requested country" do
@@ -322,7 +321,7 @@ describe CountriesController do
322
321
  end
323
322
 
324
323
  describe "When logged in as Librarian" do
325
- login_librarian
324
+ login_fixture_librarian
326
325
 
327
326
  describe "with valid params" do
328
327
  it "updates the requested country" do
@@ -349,7 +348,7 @@ describe CountriesController do
349
348
  end
350
349
 
351
350
  describe "When logged in as User" do
352
- login_user
351
+ login_fixture_user
353
352
 
354
353
  describe "with valid params" do
355
354
  it "updates the requested country" do
@@ -402,7 +401,7 @@ describe CountriesController do
402
401
  end
403
402
 
404
403
  describe "When logged in as Administrator" do
405
- login_admin
404
+ login_fixture_admin
406
405
 
407
406
  it "destroys the requested country" do
408
407
  delete :destroy, :id => @country.id
@@ -415,7 +414,7 @@ describe CountriesController do
415
414
  end
416
415
 
417
416
  describe "When logged in as Librarian" do
418
- login_librarian
417
+ login_fixture_librarian
419
418
 
420
419
  it "destroys the requested country" do
421
420
  delete :destroy, :id => @country.id
@@ -428,7 +427,7 @@ describe CountriesController do
428
427
  end
429
428
 
430
429
  describe "When logged in as User" do
431
- login_user
430
+ login_fixture_user
432
431
 
433
432
  it "destroys the requested country" do
434
433
  delete :destroy, :id => @country.id
data/spec/controllers/create_types_controller_spec.rb CHANGED
@@ -19,8 +19,8 @@ require 'spec_helper'
19
19
  # that an instance is receiving a specific message.
20
20
 
21
21
  describe CreateTypesController do
22
- login_admin
23
- fixtures :library_groups
22
+ fixtures :all
23
+ login_fixture_admin
24
24
 
25
25
  # This should return the minimal set of attributes required to create a valid
26
26
  # CreateType. As you add validations to CreateType, be sure to