enju_biblio 0.1.0.pre58 → 0.1.0.pre59

Sign up to get free protection for your applications and to get access to all the features.
Files changed (398) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/agent_merge_lists_controller.rb +93 -0
  3. data/app/controllers/agent_merges_controller.rb +87 -0
  4. data/app/controllers/agent_relationships_controller.rb +1 -1
  5. data/app/controllers/agents_controller.rb +1 -3
  6. data/app/controllers/creates_controller.rb +3 -3
  7. data/app/controllers/manifestation_relationships_controller.rb +1 -1
  8. data/app/controllers/manifestations_controller.rb +12 -12
  9. data/app/controllers/owns_controller.rb +3 -3
  10. data/app/controllers/picture_files_controller.rb +1 -1
  11. data/app/controllers/produces_controller.rb +3 -3
  12. data/app/controllers/realizes_controller.rb +3 -3
  13. data/app/controllers/series_statement_merge_lists_controller.rb +92 -0
  14. data/app/controllers/series_statement_merges_controller.rb +90 -0
  15. data/app/controllers/series_statements_controller.rb +1 -3
  16. data/app/helpers/manifestations_helper.rb +17 -17
  17. data/app/models/agent.rb +24 -26
  18. data/app/models/agent_import_file.rb +3 -3
  19. data/app/models/agent_import_result.rb +2 -2
  20. data/app/models/agent_merge.rb +21 -0
  21. data/app/models/agent_merge_list.rb +29 -0
  22. data/app/models/agent_relationship_type.rb +1 -1
  23. data/app/models/agent_type.rb +1 -1
  24. data/app/models/carrier_type.rb +2 -2
  25. data/app/models/content_type.rb +1 -1
  26. data/app/models/country.rb +8 -4
  27. data/app/models/create_type.rb +1 -1
  28. data/app/models/enju_biblio/ability.rb +12 -9
  29. data/app/models/form_of_work.rb +1 -1
  30. data/app/models/frequency.rb +1 -1
  31. data/app/models/identifier.rb +12 -0
  32. data/app/models/identifier_type.rb +2 -2
  33. data/app/models/import_request.rb +2 -1
  34. data/app/models/item.rb +3 -3
  35. data/app/models/language.rb +8 -1
  36. data/app/models/license.rb +1 -1
  37. data/app/models/manifestation.rb +42 -43
  38. data/app/models/manifestation_relationship_type.rb +1 -1
  39. data/app/models/medium_of_performance.rb +1 -1
  40. data/app/models/picture_file.rb +9 -9
  41. data/app/models/produce_type.rb +1 -1
  42. data/app/models/realize_type.rb +1 -1
  43. data/app/models/resource_import_file.rb +118 -63
  44. data/app/models/resource_import_result.rb +5 -4
  45. data/app/models/series_statement.rb +4 -7
  46. data/app/models/series_statement_merge.rb +21 -0
  47. data/app/models/series_statement_merge_list.rb +19 -0
  48. data/app/views/agent_merge_lists/_form.html.erb +11 -0
  49. data/app/views/agent_merge_lists/edit.html.erb +13 -0
  50. data/app/views/agent_merge_lists/index.html.erb +33 -0
  51. data/app/views/agent_merge_lists/new.html.erb +12 -0
  52. data/app/views/agent_merge_lists/show.html.erb +31 -0
  53. data/app/views/agent_merges/edit.html.erb +31 -0
  54. data/app/views/agent_merges/index.html.erb +32 -0
  55. data/app/views/agent_merges/new.html.erb +39 -0
  56. data/app/views/agent_merges/show.html.erb +25 -0
  57. data/app/views/agents/_index.html.erb +1 -3
  58. data/app/views/agents/_index_agent_merge_list.html.erb +53 -0
  59. data/app/views/layouts/manifestations.html.erb +1 -1
  60. data/app/views/manifestations/_form.html.erb +14 -2
  61. data/app/views/manifestations/_index_form_parent.html.erb +1 -1
  62. data/app/views/manifestations/_show.mods.builder +1 -4
  63. data/app/views/manifestations/_show.rdf.builder +1 -4
  64. data/app/views/manifestations/_show_detail_librarian.html.erb +1 -1
  65. data/app/views/manifestations/_show_detail_user.html.erb +1 -1
  66. data/app/views/manifestations/_show_index.html.erb +1 -1
  67. data/app/views/manifestations/_show_index.mobile.erb +2 -2
  68. data/app/views/manifestations/_show_parent_form.html.erb +1 -1
  69. data/app/views/manifestations/_show_series_index.html.erb +1 -1
  70. data/app/views/manifestations/_title.html.erb +1 -1
  71. data/app/views/picture_files/show.html.erb +1 -1
  72. data/app/views/resource_import_files/show.html.erb +9 -0
  73. data/app/views/resource_import_results/index.html.erb +2 -0
  74. data/app/views/resource_import_results/show.html.erb +6 -1
  75. data/app/views/series_statement_merge_lists/_form.html.erb +11 -0
  76. data/app/views/series_statement_merge_lists/edit.html.erb +13 -0
  77. data/app/views/series_statement_merge_lists/index.html.erb +33 -0
  78. data/app/views/series_statement_merge_lists/new.html.erb +12 -0
  79. data/app/views/series_statement_merge_lists/show.html.erb +31 -0
  80. data/app/views/series_statement_merges/_form.html.erb +12 -0
  81. data/app/views/series_statement_merges/edit.html.erb +31 -0
  82. data/app/views/series_statement_merges/index.html.erb +32 -0
  83. data/app/views/series_statement_merges/new.html.erb +39 -0
  84. data/app/views/series_statement_merges/show.html.erb +27 -0
  85. data/config/locales/translation_en.yml +25 -7
  86. data/config/locales/translation_ja.yml +25 -7
  87. data/config/routes.rb +20 -1
  88. data/db/migrate/005_create_manifestations.rb +0 -1
  89. data/db/migrate/133_create_agent_merges.rb +15 -0
  90. data/db/migrate/134_create_agent_merge_lists.rb +13 -0
  91. data/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
  92. data/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
  93. data/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
  94. data/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
  95. data/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
  96. data/lib/enju_biblio.rb +8 -0
  97. data/lib/enju_biblio/version.rb +1 -1
  98. data/lib/tasks/agent_type.rb +15 -0
  99. data/lib/tasks/enju_biblio_tasks.rake +2 -0
  100. data/spec/controllers/agent_merge_lists_controller_spec.rb +456 -0
  101. data/spec/controllers/agent_merges_controller_spec.rb +437 -0
  102. data/spec/controllers/series_statement_merge_lists_controller_spec.rb +439 -0
  103. data/spec/controllers/series_statement_merges_controller_spec.rb +433 -0
  104. data/spec/dummy/app/models/ability.rb +0 -5
  105. data/spec/dummy/db/development.sqlite3 +0 -0
  106. data/spec/dummy/db/schema.rb +22 -14
  107. data/spec/dummy/db/test.sqlite3 +0 -0
  108. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/item_update_file.tsv +1 -1
  109. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv +21 -19
  110. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv +21 -19
  111. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/{resource_export_file_20140818-53863-1jz1wlr.txt → resource_export_file_20140824-71278-o9rcl2.txt} +1 -1
  112. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/{resource_export_file_20140818-55246-1rvhs1s.txt → resource_export_file_20140824-76052-14e2vr0.txt} +1 -1
  113. data/spec/dummy/solr/default/data/index/_n.fdt +0 -0
  114. data/spec/dummy/solr/{test/data/index/_49n.fdx → default/data/index/_n.fdx} +0 -0
  115. data/spec/dummy/solr/default/data/index/_n.fnm +0 -0
  116. data/spec/dummy/solr/default/data/index/_n.nvd +0 -0
  117. data/spec/dummy/solr/default/data/index/_n.nvm +0 -0
  118. data/spec/dummy/solr/default/data/index/_n.si +0 -0
  119. data/spec/dummy/solr/default/data/index/_n_Lucene41_0.doc +0 -0
  120. data/spec/dummy/solr/default/data/index/_n_Lucene41_0.pos +0 -0
  121. data/spec/dummy/solr/default/data/index/_n_Lucene41_0.tim +0 -0
  122. data/spec/dummy/solr/default/data/index/_n_Lucene41_0.tip +0 -0
  123. data/spec/dummy/solr/default/data/index/_o.fdt +0 -0
  124. data/spec/dummy/solr/default/data/index/_o.fdx +0 -0
  125. data/spec/dummy/solr/default/data/index/_o.fnm +0 -0
  126. data/spec/dummy/solr/default/data/index/_o.nvd +0 -0
  127. data/spec/dummy/solr/default/data/index/_o.nvm +0 -0
  128. data/spec/dummy/solr/default/data/index/_o.si +0 -0
  129. data/spec/dummy/solr/default/data/index/_o_Lucene41_0.doc +0 -0
  130. data/spec/dummy/solr/default/data/index/_o_Lucene41_0.pos +0 -0
  131. data/spec/dummy/solr/default/data/index/_o_Lucene41_0.tim +0 -0
  132. data/spec/dummy/solr/default/data/index/_o_Lucene41_0.tip +0 -0
  133. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  134. data/spec/dummy/solr/default/data/index/segments_15 +0 -0
  135. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000030 +0 -0
  136. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000031 +0 -0
  137. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000032 +0 -0
  138. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000033 +0 -0
  139. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000034 +0 -0
  140. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000035 +0 -0
  141. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000036 +0 -0
  142. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000037 +0 -0
  143. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000038 +0 -0
  144. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000039 +0 -0
  145. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  146. data/spec/dummy/solr/test/data/index/segments_401 +0 -0
  147. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005178 +0 -0
  148. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005179 +0 -0
  149. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005180 +0 -0
  150. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005181 +0 -0
  151. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005182 +0 -0
  152. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005183 +0 -0
  153. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  154. data/spec/dummy/tmp/cache/6E4/420/search_engine_all +0 -0
  155. data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
  156. data/spec/dummy/tmp/cache/assets/test/sprockets/{173711a319dbf01f35a2ad8e1efe08b9 → 016035697c13f20f5d2b52792d85c604} +0 -0
  157. data/spec/dummy/tmp/cache/assets/test/sprockets/{0440b81b0aae840cf287a686585a8cec → 016f9220091ee2a634e3a6c7fbe9c147} +0 -0
  158. data/spec/dummy/tmp/cache/assets/test/sprockets/{19a44bc29c5173edea456f9416243854 → 052185a11dac17697ab8119d0eae969d} +0 -0
  159. data/spec/dummy/tmp/cache/assets/test/sprockets/091f6b71beeef71345e4cb87e0e0f60e +0 -0
  160. data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
  161. data/spec/dummy/tmp/cache/assets/test/sprockets/{e58908ad0ccad6546faf9bcab669b0cd → 11bb992144d5d72e1251e5d4cf370f86} +0 -0
  162. data/spec/dummy/tmp/cache/assets/test/sprockets/{64ee480e95febf6b404c1264755ea42e → 120d4c2662a2d695d86719703963cbc2} +0 -0
  163. data/spec/dummy/tmp/cache/assets/test/sprockets/12c4795597f72ed1be53a24203b9605a +0 -0
  164. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  165. data/spec/dummy/tmp/cache/assets/test/sprockets/{0c8f59d97121b79a2e2a0d009d6da9c3 → 1462d348fc6af4ed5164bd969f65ef40} +0 -0
  166. data/spec/dummy/tmp/cache/assets/test/sprockets/1ba5d9cae60d012a67e6c857c0f5aa3c +0 -0
  167. data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
  168. data/spec/dummy/tmp/cache/assets/test/sprockets/27e1b4616976bb325e2963da52263610 +0 -0
  169. data/spec/dummy/tmp/cache/assets/test/sprockets/29755b7a6522fd2bd21a5821dcc1024c +0 -0
  170. data/spec/dummy/tmp/cache/assets/test/sprockets/{0d8876cd5c35974067b09df39826ad64 → 2a4804739761c332dbea9b545ebdc90b} +0 -0
  171. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  172. data/spec/dummy/tmp/cache/assets/test/sprockets/3013236b88f48eb1a0e36f7ce20e9278 +0 -0
  173. data/spec/dummy/tmp/cache/assets/test/sprockets/306cf2727f2c4d5bcc3318fdf704f9f8 +0 -0
  174. data/spec/dummy/tmp/cache/assets/test/sprockets/{1d0caee819e97b6e819aff48d160ba0e → 3137d593e6b38d7364165258707ba168} +0 -0
  175. data/spec/dummy/tmp/cache/assets/test/sprockets/3417713460df81bb2349531adec5f348 +0 -0
  176. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  177. data/spec/dummy/tmp/cache/assets/test/sprockets/3ef32f79b6e9b4487b09c38d17e96c5b +0 -0
  178. data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
  179. data/spec/dummy/tmp/cache/assets/test/sprockets/4982460b51d59b2a6ca1a2a62f578883 +0 -0
  180. data/spec/dummy/tmp/cache/assets/test/sprockets/{2b35ad8fee7e1228e205669278e2adda → 4c00935da384db345e9d75e427a6ecfd} +0 -0
  181. data/spec/dummy/tmp/cache/assets/test/sprockets/{a2474b74df12470fb37c668b85b562c6 → 4d6ee78c9b5a731d2770590bdca965db} +0 -0
  182. data/spec/dummy/tmp/cache/assets/test/sprockets/{267e026cf7dcb8ed5ca66aa83dff1a87 → 4ec967e0b0aa8965b00d8d02580cb1e8} +0 -0
  183. data/spec/dummy/tmp/cache/assets/test/sprockets/{01c388ec88c5fa6d00409d725549a506 → 524145c58d27d8645853427057c8e352} +0 -0
  184. data/spec/dummy/tmp/cache/assets/test/sprockets/53f3ea63c7f59d989da4e7299c5ebef6 +0 -0
  185. data/spec/dummy/tmp/cache/assets/test/sprockets/{86dfe8a3e156aeb6ebcd456b2251fab7 → 5401d1bbdbcca869f9ec530be8954c7b} +0 -0
  186. data/spec/dummy/tmp/cache/assets/test/sprockets/5657f9c72ff547052db9db89e95d1758 +0 -0
  187. data/spec/dummy/tmp/cache/assets/test/sprockets/5762cca052dd5d3eb8bb35e2ed9a59b8 +0 -0
  188. data/spec/dummy/tmp/cache/assets/test/sprockets/5e6bfa8ff735312df3c6e3ab5e4544dd +0 -0
  189. data/spec/dummy/tmp/cache/assets/test/sprockets/617d3692a7e14d57d7d7c18e62988c56 +0 -0
  190. data/spec/dummy/tmp/cache/assets/test/sprockets/6a45e3c9461983dc78a7a4f06326d98a +0 -0
  191. data/spec/dummy/tmp/cache/assets/test/sprockets/6ef07ba38c3fb7876f0dd5a9580ddb09 +0 -0
  192. data/spec/dummy/tmp/cache/assets/test/sprockets/{15aaed1a5a5f4f98d5c8d19084d7980d → 726c9190898ab9d89a285df9f73fc835} +0 -0
  193. data/spec/dummy/tmp/cache/assets/test/sprockets/768618b68fc55616affb09d1366839bf +0 -0
  194. data/spec/dummy/tmp/cache/assets/test/sprockets/7cf6f7130d3eca66452321d70d360864 +0 -0
  195. data/spec/dummy/tmp/cache/assets/test/sprockets/7e097aef96e9d7a3f16e013b6f612b68 +0 -0
  196. data/spec/dummy/tmp/cache/assets/test/sprockets/84c8a64682205dba3f8edd60fc1ec8e5 +0 -0
  197. data/spec/dummy/tmp/cache/assets/test/sprockets/8c36936509297e044c5353b3c57148f9 +0 -0
  198. data/spec/dummy/tmp/cache/assets/test/sprockets/{0483120d2ec851526d1beb322a87b34d → 8fe57feab5051fd40f4878b7a740486f} +0 -0
  199. data/spec/dummy/tmp/cache/assets/test/sprockets/{0dfa4223643dd4c4e2f977989012a78f → 94fe70b1fcf11d0f4ba62fd956b13410} +0 -0
  200. data/spec/dummy/tmp/cache/assets/test/sprockets/{16262df7c7e382ef78b21f453750ea94 → 9757a9437821225e1c033c19725d7f29} +0 -0
  201. data/spec/dummy/tmp/cache/assets/test/sprockets/9872a7a2c1dbfa71b55ebcf97dfa07b1 +0 -0
  202. data/spec/dummy/tmp/cache/assets/test/sprockets/9a11ac4cf3c8597981773b8ea1c36659 +0 -0
  203. data/spec/dummy/tmp/cache/assets/test/sprockets/9ad166e60e3d477c78328181979a7b77 +0 -0
  204. data/spec/dummy/tmp/cache/assets/test/sprockets/9c500035359d42d1d6eb3152407753da +0 -0
  205. data/spec/dummy/tmp/cache/assets/test/sprockets/{0c0062cfb97ef1437ab0020e724876c6 → a0d32bfbf69edb9affa96b926037041a} +0 -0
  206. data/spec/dummy/tmp/cache/assets/test/sprockets/aa0c14240f47d6746cd5d3bf2fe4b936 +0 -0
  207. data/spec/dummy/tmp/cache/assets/test/sprockets/aff11c6f1bdcce6d91baf69968f93ad6 +0 -0
  208. data/spec/dummy/tmp/cache/assets/test/sprockets/b1cfee6085e55e41f311c5dfeda8661b +0 -0
  209. data/spec/dummy/tmp/cache/assets/test/sprockets/b4125d2c5630528bd1587b244a3303d6 +0 -0
  210. data/spec/dummy/tmp/cache/assets/test/sprockets/{1572dfd6f1e555f4be1aa60ddc3cb0c0 → b4857dbfaac3e3d5aeb45b1beff2b88b} +0 -0
  211. data/spec/dummy/tmp/cache/assets/test/sprockets/{e8f801eeda49cba4a03cfd9e2a4562ae → b4f5eca040699a5d38403ce80236bc12} +0 -0
  212. data/spec/dummy/tmp/cache/assets/test/sprockets/b530f21ccf5882027bf2aff5502dc79e +0 -0
  213. data/spec/dummy/tmp/cache/assets/test/sprockets/{24051f5752691433a5a205b04a62fca1 → b6fec44e6e93be3375951dad4faa2c14} +0 -0
  214. data/spec/dummy/tmp/cache/assets/test/sprockets/{305729f8ea45e96c3a7e75df920aa125 → b943165df1109f3c68280a04e5e960f8} +0 -0
  215. data/spec/dummy/tmp/cache/assets/test/sprockets/{2d65b40e585725207fd52ce4cf5134f4 → c48a5c8c0b091de16e629df2f6145f67} +0 -0
  216. data/spec/dummy/tmp/cache/assets/test/sprockets/{40e90f0c329b14292a9ff1a2fe907b39 → c5602b825ee6f6e1946e61a5c607d444} +0 -0
  217. data/spec/dummy/tmp/cache/assets/test/sprockets/ca2bbe58fd1ca1ca98a242a18b3f4ef3 +0 -0
  218. data/spec/dummy/tmp/cache/assets/test/sprockets/cdad6edc528defc97cc803f9b28f4a71 +0 -0
  219. data/spec/dummy/tmp/cache/assets/test/sprockets/cfb9cef7d320ba59870855aa2306bddd +0 -0
  220. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  221. data/spec/dummy/tmp/cache/assets/test/sprockets/d626bad4b5037b4ffa8b7f7d15d76a53 +0 -0
  222. data/spec/dummy/tmp/cache/assets/test/sprockets/d648a0b0abb7fd7ff579d72ffe033d50 +0 -0
  223. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  224. data/spec/dummy/tmp/cache/assets/test/sprockets/d8e283e15fd77782ae12f9b18e5be456 +0 -0
  225. data/spec/dummy/tmp/cache/assets/test/sprockets/{479d8a0e6643a473b785734c1fb0655b → ddcad094e1d77a1ec8d17b77f1161b47} +0 -0
  226. data/spec/dummy/tmp/cache/assets/test/sprockets/e18b88fcf05f32d6b7e22c426144a580 +0 -0
  227. data/spec/dummy/tmp/cache/assets/test/sprockets/{45adf514664dd4134fb290b1938c56d8 → e1cad328d04e160bea05772ab16eacbc} +0 -0
  228. data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
  229. data/spec/dummy/tmp/cache/assets/test/sprockets/e52bd8c13070b84565f76938fe68458c +0 -0
  230. data/spec/dummy/tmp/cache/assets/test/sprockets/ea20f8df525b74f3cb6581c9c8c10831 +0 -0
  231. data/spec/dummy/tmp/cache/assets/test/sprockets/{3fc2b4de95dbb94dfe82ccfc97265cc4 → f02885699e51e1515eb7fd0a2f17cef7} +0 -0
  232. data/spec/dummy/tmp/cache/assets/test/sprockets/f6a963700cd75861fcdc6fd9474e5e77 +0 -0
  233. data/spec/dummy/tmp/cache/assets/test/sprockets/f70653c23b5a12c74bf82c0e9afe906b +0 -0
  234. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
  235. data/spec/dummy/tmp/cache/assets/test/sprockets/fb4d31a0ce2d585e276e7e5fc9407aba +0 -0
  236. data/spec/dummy/tmp/cache/assets/test/sprockets/ffb3c7ae1ec3a76cac3e94303559fe51 +0 -0
  237. data/spec/dummy/tmp/cache/assets/test/sprockets/ffb98f25d690ed017b364714434126e5 +0 -0
  238. data/spec/dummy/tmp/cache/stdout +168 -6132
  239. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  240. data/spec/factories/agent_merge.rb +6 -0
  241. data/spec/factories/agent_merge_list.rb +5 -0
  242. data/spec/factories/series_statement_merge.rb +6 -0
  243. data/spec/factories/series_statement_merge_list.rb +5 -0
  244. data/spec/fixtures/agent_merge_lists.yml +27 -0
  245. data/spec/fixtures/agent_merges.yml +31 -0
  246. data/spec/fixtures/content_types.yml +13 -0
  247. data/spec/fixtures/frequencies.yml +13 -0
  248. data/spec/fixtures/manifestations.yml +7 -7
  249. data/spec/fixtures/resource_import_results.yml +1 -1
  250. data/spec/fixtures/series_statement_merge_lists.yml +27 -0
  251. data/spec/fixtures/series_statement_merges.yml +31 -0
  252. data/spec/models/agent_merge_list_spec.rb +18 -0
  253. data/spec/models/agent_merge_spec.rb +19 -0
  254. data/spec/models/manifestation_spec.rb +4 -4
  255. data/spec/models/resource_import_file_spec.rb +22 -11
  256. data/spec/models/resource_import_result_spec.rb +1 -1
  257. data/spec/models/series_statement_merge_list_spec.rb +20 -0
  258. data/spec/models/series_statement_merge_spec.rb +17 -0
  259. data/spec/requests/series_statement_merge_lists_spec.rb +11 -0
  260. data/spec/requests/series_statement_merges_spec.rb +11 -0
  261. data/spec/routing/series_statement_merge_lists_routing_spec.rb +35 -0
  262. data/spec/routing/series_statement_merges_routing_spec.rb +35 -0
  263. data/spec/views/series_statement_merge_lists/edit.html.erb_spec.rb +18 -0
  264. data/spec/views/series_statement_merge_lists/index.html.erb_spec.rb +22 -0
  265. data/spec/views/series_statement_merge_lists/new.html.erb_spec.rb +18 -0
  266. data/spec/views/series_statement_merge_lists/show.html.erb_spec.rb +15 -0
  267. data/spec/views/series_statement_merges/edit.html.erb_spec.rb +23 -0
  268. data/spec/views/series_statement_merges/index.html.erb_spec.rb +27 -0
  269. data/spec/views/series_statement_merges/new.html.erb_spec.rb +23 -0
  270. data/spec/views/series_statement_merges/show.html.erb_spec.rb +17 -0
  271. metadata +313 -311
  272. data/app/controllers/extents_controller.rb +0 -83
  273. data/app/models/agent_sweeper.rb +0 -29
  274. data/app/models/extent.rb +0 -20
  275. data/app/models/page_sweeper.rb +0 -35
  276. data/app/views/extents/_form.html.erb +0 -19
  277. data/app/views/extents/edit.html.erb +0 -13
  278. data/app/views/extents/index.html.erb +0 -52
  279. data/app/views/extents/new.html.erb +0 -12
  280. data/app/views/extents/show.html.erb +0 -29
  281. data/db/migrate/20090719201843_create_extents.rb +0 -12
  282. data/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb +0 -5
  283. data/spec/controllers/extents_controller_spec.rb +0 -167
  284. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140702-50651-14mi4s9.txt +0 -147
  285. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140702-50742-1fdbjo6.txt +0 -147
  286. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140704-12784-ozvvo.txt +0 -147
  287. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-18550-cc3qx2.txt +0 -147
  288. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-19313-rlc624.txt +0 -147
  289. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-20440-1o0htch.txt +0 -147
  290. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-28145-o9qcd4.txt +0 -147
  291. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140722-98727-1jesse9.txt +0 -147
  292. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140816-17115-1c1tv13.txt +0 -147
  293. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140816-18348-14d01b3.txt +0 -147
  294. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-60268-1psjqua.txt +0 -147
  295. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-60996-1cy28m2.txt +0 -147
  296. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-67507-19qjhj3.txt +0 -147
  297. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-69234-1cllrec.txt +0 -147
  298. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-76875-1os6joy.txt +0 -147
  299. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-1148-136brhb.txt +0 -147
  300. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-473-1c326dm.txt +0 -147
  301. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-93795-1x882ik.txt +0 -147
  302. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-94274-1xr9d9e.txt +0 -147
  303. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-94643-1fjcept.txt +0 -147
  304. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-97947-mfqh5b.txt +0 -147
  305. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-98488-126cvb4.txt +0 -147
  306. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-98849-1lg47mm.txt +0 -147
  307. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140820-19805-1p3heid.txt +0 -147
  308. data/spec/dummy/solr/default/data/index/segments_1 +0 -0
  309. data/spec/dummy/solr/test/data/index/_49n.fdt +0 -0
  310. data/spec/dummy/solr/test/data/index/_49n.fnm +0 -0
  311. data/spec/dummy/solr/test/data/index/_49n.nvd +0 -0
  312. data/spec/dummy/solr/test/data/index/_49n.nvm +0 -0
  313. data/spec/dummy/solr/test/data/index/_49n.si +0 -0
  314. data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.doc +0 -0
  315. data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.pos +0 -0
  316. data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.tim +0 -0
  317. data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.tip +0 -0
  318. data/spec/dummy/solr/test/data/index/segments_62f +0 -0
  319. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007855 +0 -0
  320. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007856 +0 -0
  321. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007857 +0 -0
  322. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007858 +0 -0
  323. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007859 +0 -0
  324. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007860 +0 -0
  325. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007861 +0 -0
  326. data/spec/dummy/test/integration/resource_export_file_test.rb +0 -7
  327. data/spec/dummy/tmp/cache/assets/test/sprockets/1eeeee88b80ad204f61af2154ab097db +0 -0
  328. data/spec/dummy/tmp/cache/assets/test/sprockets/36fe3bdb5b7a6e84e23515bca1842154 +0 -0
  329. data/spec/dummy/tmp/cache/assets/test/sprockets/3ed0e4936463665c59155042a650dfa5 +0 -0
  330. data/spec/dummy/tmp/cache/assets/test/sprockets/46ed442c54e0ad50ed9cbff91bca2c03 +0 -0
  331. data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
  332. data/spec/dummy/tmp/cache/assets/test/sprockets/4db7c7b5ea13aacccd89ea32460e2de0 +0 -0
  333. data/spec/dummy/tmp/cache/assets/test/sprockets/4facb9d4adad5d1f55e19897f19ff502 +0 -0
  334. data/spec/dummy/tmp/cache/assets/test/sprockets/51df74c0fa7fbfa41670caa0f4268d54 +0 -0
  335. data/spec/dummy/tmp/cache/assets/test/sprockets/53ce49f7cb73ec18bfefea19be486fd5 +0 -0
  336. data/spec/dummy/tmp/cache/assets/test/sprockets/55de678ed3c84c51b3a4b4cf473da823 +0 -0
  337. data/spec/dummy/tmp/cache/assets/test/sprockets/5686725a34a5b152399098fe6811dfcc +0 -0
  338. data/spec/dummy/tmp/cache/assets/test/sprockets/59d9f2ec47e055feaa8deb88dd230fd9 +0 -0
  339. data/spec/dummy/tmp/cache/assets/test/sprockets/5d30286c45c334a3e08806b2713ddbcd +0 -0
  340. data/spec/dummy/tmp/cache/assets/test/sprockets/5f084c5c398edfb6e223c67ec8fbf80d +0 -0
  341. data/spec/dummy/tmp/cache/assets/test/sprockets/60d030b3fef398bd6c75b5342c1e6951 +0 -0
  342. data/spec/dummy/tmp/cache/assets/test/sprockets/6273ac5ec2eeeb08808c520e45e7c353 +0 -0
  343. data/spec/dummy/tmp/cache/assets/test/sprockets/64513343a4d1500f6642a9797f2d6caf +0 -0
  344. data/spec/dummy/tmp/cache/assets/test/sprockets/6580b1bd3cb606ae0cc6a660e43ee91d +0 -0
  345. data/spec/dummy/tmp/cache/assets/test/sprockets/66e8ff0ee49363fdd0e1866807515228 +0 -0
  346. data/spec/dummy/tmp/cache/assets/test/sprockets/67ef1f14c3ad48997b6d2971949a9974 +0 -0
  347. data/spec/dummy/tmp/cache/assets/test/sprockets/6cf8b3b420dc28c045daec27150ade0a +0 -0
  348. data/spec/dummy/tmp/cache/assets/test/sprockets/7395823b7ae60934b3053f26fdb362d4 +0 -0
  349. data/spec/dummy/tmp/cache/assets/test/sprockets/74c056fa2e48770cba3499207a5027f5 +0 -0
  350. data/spec/dummy/tmp/cache/assets/test/sprockets/796cd029cd1ff06c3212795cdcc5a7c4 +0 -0
  351. data/spec/dummy/tmp/cache/assets/test/sprockets/7de140ed6f303b9d00d8d703cced3349 +0 -0
  352. data/spec/dummy/tmp/cache/assets/test/sprockets/7ef97a0c04f996570fa8d054e77614e4 +0 -0
  353. data/spec/dummy/tmp/cache/assets/test/sprockets/80348afae86df384b25e1e3bff21b13e +0 -0
  354. data/spec/dummy/tmp/cache/assets/test/sprockets/814bc1bed3effa0bb4588eb8b75ab92a +0 -0
  355. data/spec/dummy/tmp/cache/assets/test/sprockets/8488002e0e6035b7d00c3800c2c0e27e +0 -0
  356. data/spec/dummy/tmp/cache/assets/test/sprockets/89c9228bae34e0ff18fd8fe7f6eb5847 +0 -0
  357. data/spec/dummy/tmp/cache/assets/test/sprockets/8e2bf5102d77a2cff3dda27a5617a79d +0 -0
  358. data/spec/dummy/tmp/cache/assets/test/sprockets/9411c91747cff7187d3b5eb3d5401758 +0 -0
  359. data/spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9 +0 -0
  360. data/spec/dummy/tmp/cache/assets/test/sprockets/994c519d4fdf48cadf8846c64a7c217d +0 -0
  361. data/spec/dummy/tmp/cache/assets/test/sprockets/a2ee8688f63b884277632a234086f7df +0 -0
  362. data/spec/dummy/tmp/cache/assets/test/sprockets/a3cea75f1356ef55329e78f86b4c72b1 +0 -0
  363. data/spec/dummy/tmp/cache/assets/test/sprockets/a5ff35005a82346756c8a2d9b564aa8e +0 -0
  364. data/spec/dummy/tmp/cache/assets/test/sprockets/a72fe28675ab93fbb5f1fab49703e8b8 +0 -0
  365. data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
  366. data/spec/dummy/tmp/cache/assets/test/sprockets/b0e11c6d89683eaa7256a44a164a2a12 +0 -0
  367. data/spec/dummy/tmp/cache/assets/test/sprockets/b62c2d32477b85c1a8e33a4b3ba86483 +0 -0
  368. data/spec/dummy/tmp/cache/assets/test/sprockets/b817a9a61cc21da35abec9d0dfb2a143 +0 -0
  369. data/spec/dummy/tmp/cache/assets/test/sprockets/b9ad765321d7527b38c851119d4d6f41 +0 -0
  370. data/spec/dummy/tmp/cache/assets/test/sprockets/bc086c9c936e5b91659a438d35126a90 +0 -0
  371. data/spec/dummy/tmp/cache/assets/test/sprockets/bf17ca8affe2a1febca7f2a4e37cd77b +0 -0
  372. data/spec/dummy/tmp/cache/assets/test/sprockets/c21a9a8a5166b51d4c2737ad4b99c16b +0 -0
  373. data/spec/dummy/tmp/cache/assets/test/sprockets/c36b7431da1ae91722b1c4091e4ba084 +0 -0
  374. data/spec/dummy/tmp/cache/assets/test/sprockets/c3e87e99d52cd8082c8548a7aa63b9da +0 -0
  375. data/spec/dummy/tmp/cache/assets/test/sprockets/c40786442706ae0cc6c793c6ee2500d3 +0 -0
  376. data/spec/dummy/tmp/cache/assets/test/sprockets/c42ec68313928d1544e733ae8383ef6d +0 -0
  377. data/spec/dummy/tmp/cache/assets/test/sprockets/c488c91e58a235d36a0ff8058e5a1004 +0 -0
  378. data/spec/dummy/tmp/cache/assets/test/sprockets/c4dbc19d89022a35885f5621f6b86eb3 +0 -0
  379. data/spec/dummy/tmp/cache/assets/test/sprockets/c6bbf5ca5c9b58807ba226fde0ccc60f +0 -0
  380. data/spec/dummy/tmp/cache/assets/test/sprockets/c7b0db461dfcfc1108bf9a6a87fb909d +0 -0
  381. data/spec/dummy/tmp/cache/assets/test/sprockets/c9d565eb8899b86408d9fd06fbf039be +0 -0
  382. data/spec/dummy/tmp/cache/assets/test/sprockets/cfeee09fa6b6ec2344a7b44bf0676028 +0 -0
  383. data/spec/dummy/tmp/cache/assets/test/sprockets/d8d8b7e606faf0fa1c22a6c2ebc2b58f +0 -0
  384. data/spec/dummy/tmp/cache/assets/test/sprockets/d909adefad62117a3e85463b83954827 +0 -0
  385. data/spec/dummy/tmp/cache/assets/test/sprockets/e22f9546f5d75bd3549886e979dcb96e +0 -0
  386. data/spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15 +0 -0
  387. data/spec/dummy/tmp/cache/assets/test/sprockets/ea6fdf5f7aa83bf540d26f1ae12159a8 +0 -0
  388. data/spec/dummy/tmp/cache/assets/test/sprockets/eef93e7d091d8118419fb96adf80387b +0 -0
  389. data/spec/dummy/tmp/cache/assets/test/sprockets/efd104c04916854411c86a5440ba30e0 +0 -0
  390. data/spec/dummy/tmp/cache/assets/test/sprockets/f32a42f77e45018f7748de516be3c393 +0 -0
  391. data/spec/dummy/tmp/cache/assets/test/sprockets/fb91323d4585f2e27d281cdb4193beb1 +0 -0
  392. data/spec/dummy/tmp/cache/assets/test/sprockets/fd080bad11122c7c3147a3fe1964c396 +0 -0
  393. data/spec/dummy/tmp/cache/assets/test/sprockets/fd88f9f1128cbff14dd2fa00800cfa10 +0 -0
  394. data/spec/dummy/tmp/cache/assets/test/sprockets/fe5bcfd29764185be3d476dee4108595 +0 -0
  395. data/spec/dummy/tmp/cache/assets/test/sprockets/ff64e9ded481959dfa8c78718e59e607 +0 -0
  396. data/spec/factories/extent.rb +0 -5
  397. data/spec/fixtures/extents.yml +0 -29
  398. data/spec/models/extent_spec.rb +0 -21
@@ -0,0 +1,437 @@
1
+ require 'spec_helper'
2
+
3
+ describe AgentMergesController do
4
+ fixtures :all
5
+
6
+ describe "GET index" do
7
+ before(:each) do
8
+ FactoryGirl.create(:agent_merge)
9
+ end
10
+
11
+ describe "When logged in as Administrator" do
12
+ login_admin
13
+
14
+ it "assigns all agent_merges as @agent_merges" do
15
+ get :index
16
+ assigns(:agent_merges).should eq(AgentMerge.all)
17
+ end
18
+ end
19
+
20
+ describe "When logged in as Librarian" do
21
+ login_librarian
22
+
23
+ it "assigns all agent_merges as @agent_merges" do
24
+ get :index
25
+ assigns(:agent_merges).should eq(AgentMerge.all)
26
+ end
27
+ end
28
+
29
+ describe "When logged in as User" do
30
+ login_user
31
+
32
+ it "should be forbidden" do
33
+ get :index
34
+ assigns(:agent_merges).should be_empty
35
+ response.should be_forbidden
36
+ end
37
+ end
38
+
39
+ describe "When not logged in" do
40
+ it "should be forbidden" do
41
+ get :index
42
+ assigns(:agent_merges).should be_empty
43
+ response.should redirect_to(new_user_session_url)
44
+ end
45
+ end
46
+ end
47
+
48
+ describe "GET show" do
49
+ describe "When logged in as Administrator" do
50
+ login_admin
51
+
52
+ it "assigns the requested agent_merge as @agent_merge" do
53
+ agent_merge = FactoryGirl.create(:agent_merge)
54
+ get :show, :id => agent_merge.id
55
+ assigns(:agent_merge).should eq(agent_merge)
56
+ end
57
+ end
58
+
59
+ describe "When logged in as Librarian" do
60
+ login_librarian
61
+
62
+ it "assigns the requested agent_merge as @agent_merge" do
63
+ agent_merge = FactoryGirl.create(:agent_merge)
64
+ get :show, :id => agent_merge.id
65
+ assigns(:agent_merge).should eq(agent_merge)
66
+ end
67
+ end
68
+
69
+ describe "When logged in as User" do
70
+ login_user
71
+
72
+ it "assigns the requested agent_merge as @agent_merge" do
73
+ agent_merge = FactoryGirl.create(:agent_merge)
74
+ get :show, :id => agent_merge.id
75
+ assigns(:agent_merge).should eq(agent_merge)
76
+ end
77
+ end
78
+
79
+ describe "When not logged in" do
80
+ it "assigns the requested agent_merge as @agent_merge" do
81
+ agent_merge = FactoryGirl.create(:agent_merge)
82
+ get :show, :id => agent_merge.id
83
+ assigns(:agent_merge).should eq(agent_merge)
84
+ end
85
+ end
86
+ end
87
+
88
+ describe "GET new" do
89
+ describe "When logged in as Administrator" do
90
+ login_admin
91
+
92
+ it "assigns the requested agent_merge as @agent_merge" do
93
+ get :new
94
+ assigns(:agent_merge).should_not be_valid
95
+ response.should be_success
96
+ end
97
+ end
98
+
99
+ describe "When logged in as Librarian" do
100
+ login_librarian
101
+
102
+ it "assigns the requested agent_merge as @agent_merge" do
103
+ get :new
104
+ assigns(:agent_merge).should_not be_valid
105
+ response.should be_success
106
+ end
107
+ end
108
+
109
+ describe "When logged in as User" do
110
+ login_user
111
+
112
+ it "should not assign the requested agent_merge as @agent_merge" do
113
+ get :new
114
+ assigns(:agent_merge).should_not be_valid
115
+ response.should be_forbidden
116
+ end
117
+ end
118
+
119
+ describe "When not logged in" do
120
+ it "should not assign the requested agent_merge as @agent_merge" do
121
+ get :new
122
+ assigns(:agent_merge).should_not be_valid
123
+ response.should redirect_to(new_user_session_url)
124
+ end
125
+ end
126
+ end
127
+
128
+ describe "GET edit" do
129
+ describe "When logged in as Administrator" do
130
+ login_admin
131
+
132
+ it "assigns the requested agent_merge as @agent_merge" do
133
+ agent_merge = FactoryGirl.create(:agent_merge)
134
+ get :edit, :id => agent_merge.id
135
+ assigns(:agent_merge).should eq(agent_merge)
136
+ end
137
+ end
138
+
139
+ describe "When logged in as Librarian" do
140
+ login_librarian
141
+
142
+ it "assigns the requested agent_merge as @agent_merge" do
143
+ agent_merge = FactoryGirl.create(:agent_merge)
144
+ get :edit, :id => agent_merge.id
145
+ assigns(:agent_merge).should eq(agent_merge)
146
+ end
147
+ end
148
+
149
+ describe "When logged in as User" do
150
+ login_user
151
+
152
+ it "assigns the requested agent_merge as @agent_merge" do
153
+ agent_merge = FactoryGirl.create(:agent_merge)
154
+ get :edit, :id => agent_merge.id
155
+ response.should be_forbidden
156
+ end
157
+ end
158
+
159
+ describe "When not logged in" do
160
+ it "should not assign the requested agent_merge as @agent_merge" do
161
+ agent_merge = FactoryGirl.create(:agent_merge)
162
+ get :edit, :id => agent_merge.id
163
+ response.should redirect_to(new_user_session_url)
164
+ end
165
+ end
166
+ end
167
+
168
+ describe "POST create" do
169
+ before(:each) do
170
+ @attrs = FactoryGirl.attributes_for(:agent_merge)
171
+ @invalid_attrs = {:agent_merge_list_id => ''}
172
+ end
173
+
174
+ describe "When logged in as Administrator" do
175
+ login_admin
176
+
177
+ describe "with valid params" do
178
+ it "assigns a newly created agent_merge as @agent_merge" do
179
+ post :create, :agent_merge => @attrs
180
+ assigns(:agent_merge).should be_valid
181
+ end
182
+
183
+ it "redirects to the created agent" do
184
+ post :create, :agent_merge => @attrs
185
+ response.should redirect_to(assigns(:agent_merge))
186
+ end
187
+ end
188
+
189
+ describe "with invalid params" do
190
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
191
+ post :create, :agent_merge => @invalid_attrs
192
+ assigns(:agent_merge).should_not be_valid
193
+ end
194
+
195
+ it "re-renders the 'new' template" do
196
+ post :create, :agent_merge => @invalid_attrs
197
+ response.should render_template("new")
198
+ end
199
+ end
200
+ end
201
+
202
+ describe "When logged in as Librarian" do
203
+ login_librarian
204
+
205
+ describe "with valid params" do
206
+ it "assigns a newly created agent_merge as @agent_merge" do
207
+ post :create, :agent_merge => @attrs
208
+ assigns(:agent_merge).should be_valid
209
+ end
210
+
211
+ it "redirects to the created agent" do
212
+ post :create, :agent_merge => @attrs
213
+ response.should redirect_to(assigns(:agent_merge))
214
+ end
215
+ end
216
+
217
+ describe "with invalid params" do
218
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
219
+ post :create, :agent_merge => @invalid_attrs
220
+ assigns(:agent_merge).should_not be_valid
221
+ end
222
+
223
+ it "re-renders the 'new' template" do
224
+ post :create, :agent_merge => @invalid_attrs
225
+ response.should render_template("new")
226
+ end
227
+ end
228
+ end
229
+
230
+ describe "When logged in as User" do
231
+ login_user
232
+
233
+ describe "with valid params" do
234
+ it "assigns a newly created agent_merge as @agent_merge" do
235
+ post :create, :agent_merge => @attrs
236
+ assigns(:agent_merge).should be_valid
237
+ end
238
+
239
+ it "should be forbidden" do
240
+ post :create, :agent_merge => @attrs
241
+ response.should be_forbidden
242
+ end
243
+ end
244
+
245
+ describe "with invalid params" do
246
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
247
+ post :create, :agent_merge => @invalid_attrs
248
+ assigns(:agent_merge).should_not be_valid
249
+ end
250
+
251
+ it "should be forbidden" do
252
+ post :create, :agent_merge => @invalid_attrs
253
+ response.should be_forbidden
254
+ end
255
+ end
256
+ end
257
+
258
+ describe "When not logged in" do
259
+ describe "with valid params" do
260
+ it "assigns a newly created agent_merge as @agent_merge" do
261
+ post :create, :agent_merge => @attrs
262
+ assigns(:agent_merge).should be_valid
263
+ end
264
+
265
+ it "should be forbidden" do
266
+ post :create, :agent_merge => @attrs
267
+ response.should redirect_to(new_user_session_url)
268
+ end
269
+ end
270
+
271
+ describe "with invalid params" do
272
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
273
+ post :create, :agent_merge => @invalid_attrs
274
+ assigns(:agent_merge).should_not be_valid
275
+ end
276
+
277
+ it "should be forbidden" do
278
+ post :create, :agent_merge => @invalid_attrs
279
+ response.should redirect_to(new_user_session_url)
280
+ end
281
+ end
282
+ end
283
+ end
284
+
285
+ describe "PUT update" do
286
+ before(:each) do
287
+ @agent_merge = FactoryGirl.create(:agent_merge)
288
+ @attrs = FactoryGirl.attributes_for(:agent_merge)
289
+ @invalid_attrs = {:agent_merge_list_id => ''}
290
+ end
291
+
292
+ describe "When logged in as Administrator" do
293
+ login_admin
294
+
295
+ describe "with valid params" do
296
+ it "updates the requested agent_merge" do
297
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
298
+ end
299
+
300
+ it "assigns the requested agent_merge as @agent_merge" do
301
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
302
+ assigns(:agent_merge).should eq(@agent_merge)
303
+ response.should redirect_to(@agent_merge)
304
+ end
305
+ end
306
+
307
+ describe "with invalid params" do
308
+ it "assigns the requested agent_merge as @agent_merge" do
309
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
310
+ response.should render_template("edit")
311
+ end
312
+ end
313
+ end
314
+
315
+ describe "When logged in as Librarian" do
316
+ login_librarian
317
+
318
+ describe "with valid params" do
319
+ it "updates the requested agent_merge" do
320
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
321
+ end
322
+
323
+ it "assigns the requested agent_merge as @agent_merge" do
324
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
325
+ assigns(:agent_merge).should eq(@agent_merge)
326
+ response.should redirect_to(@agent_merge)
327
+ end
328
+ end
329
+
330
+ describe "with invalid params" do
331
+ it "assigns the requested agent_merge as @agent_merge" do
332
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
333
+ response.should render_template("edit")
334
+ end
335
+ end
336
+ end
337
+
338
+ describe "When logged in as User" do
339
+ login_user
340
+
341
+ describe "with valid params" do
342
+ it "updates the requested agent_merge" do
343
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
344
+ end
345
+
346
+ it "assigns the requested agent_merge as @agent_merge" do
347
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
348
+ assigns(:agent_merge).should eq(@agent_merge)
349
+ response.should be_forbidden
350
+ end
351
+ end
352
+
353
+ describe "with invalid params" do
354
+ it "assigns the requested agent_merge as @agent_merge" do
355
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
356
+ response.should be_forbidden
357
+ end
358
+ end
359
+ end
360
+
361
+ describe "When not logged in" do
362
+ describe "with valid params" do
363
+ it "updates the requested agent_merge" do
364
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
365
+ end
366
+
367
+ it "should be forbidden" do
368
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
369
+ response.should redirect_to(new_user_session_url)
370
+ end
371
+ end
372
+
373
+ describe "with invalid params" do
374
+ it "assigns the requested agent_merge as @agent_merge" do
375
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
376
+ response.should redirect_to(new_user_session_url)
377
+ end
378
+ end
379
+ end
380
+ end
381
+
382
+ describe "DELETE destroy" do
383
+ before(:each) do
384
+ @agent_merge = FactoryGirl.create(:agent_merge)
385
+ end
386
+
387
+ describe "When logged in as Administrator" do
388
+ login_admin
389
+
390
+ it "destroys the requested agent_merge" do
391
+ delete :destroy, :id => @agent_merge.id
392
+ end
393
+
394
+ it "redirects to the agent_merges list" do
395
+ delete :destroy, :id => @agent_merge.id
396
+ response.should redirect_to(agent_merges_url)
397
+ end
398
+ end
399
+
400
+ describe "When logged in as Librarian" do
401
+ login_librarian
402
+
403
+ it "destroys the requested agent_merge" do
404
+ delete :destroy, :id => @agent_merge.id
405
+ end
406
+
407
+ it "redirects to the agent_merges list" do
408
+ delete :destroy, :id => @agent_merge.id
409
+ response.should redirect_to(agent_merges_url)
410
+ end
411
+ end
412
+
413
+ describe "When logged in as User" do
414
+ login_user
415
+
416
+ it "destroys the requested agent_merge" do
417
+ delete :destroy, :id => @agent_merge.id
418
+ end
419
+
420
+ it "should be forbidden" do
421
+ delete :destroy, :id => @agent_merge.id
422
+ response.should be_forbidden
423
+ end
424
+ end
425
+
426
+ describe "When not logged in" do
427
+ it "destroys the requested agent_merge" do
428
+ delete :destroy, :id => @agent_merge.id
429
+ end
430
+
431
+ it "should be forbidden" do
432
+ delete :destroy, :id => @agent_merge.id
433
+ response.should redirect_to(new_user_session_url)
434
+ end
435
+ end
436
+ end
437
+ end
@@ -0,0 +1,439 @@
1
+ require 'spec_helper'
2
+ require 'sunspot/rails/spec_helper'
3
+
4
+ describe SeriesStatementMergeListsController do
5
+ disconnect_sunspot
6
+
7
+ describe "GET index" do
8
+ describe "When logged in as Administrator" do
9
+ login_admin
10
+
11
+ it "assigns all series_statement_merge_lists as @series_statement_merge_lists" do
12
+ get :index
13
+ assigns(:series_statement_merge_lists).should eq(SeriesStatementMergeList.page(1))
14
+ end
15
+ end
16
+
17
+ describe "When logged in as Librarian" do
18
+ login_librarian
19
+
20
+ it "assigns all series_statement_merge_lists as @series_statement_merge_lists" do
21
+ get :index
22
+ assigns(:series_statement_merge_lists).should eq(SeriesStatementMergeList.page(1))
23
+ end
24
+ end
25
+
26
+ describe "When logged in as User" do
27
+ login_user
28
+
29
+ it "assigns empty as @series_statement_merge_lists" do
30
+ get :index
31
+ assigns(:series_statement_merge_lists).should be_empty
32
+ end
33
+ end
34
+
35
+ describe "When not logged in" do
36
+ it "assigns empty as @series_statement_merge_lists" do
37
+ get :index
38
+ assigns(:series_statement_merge_lists).should be_empty
39
+ end
40
+ end
41
+ end
42
+
43
+ describe "GET show" do
44
+ describe "When logged in as Administrator" do
45
+ login_admin
46
+
47
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
48
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
49
+ get :show, :id => series_statement_merge_list.id
50
+ assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
51
+ end
52
+ end
53
+
54
+ describe "When logged in as Librarian" do
55
+ login_librarian
56
+
57
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
58
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
59
+ get :show, :id => series_statement_merge_list.id
60
+ assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
61
+ end
62
+ end
63
+
64
+ describe "When logged in as User" do
65
+ login_user
66
+
67
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
68
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
69
+ get :show, :id => series_statement_merge_list.id
70
+ assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
71
+ end
72
+ end
73
+
74
+ describe "When not logged in" do
75
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
76
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
77
+ get :show, :id => series_statement_merge_list.id
78
+ assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
79
+ end
80
+ end
81
+ end
82
+
83
+ describe "GET new" do
84
+ describe "When logged in as Administrator" do
85
+ login_admin
86
+
87
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
88
+ get :new
89
+ assigns(:series_statement_merge_list).should_not be_valid
90
+ end
91
+ end
92
+
93
+ describe "When logged in as Librarian" do
94
+ login_librarian
95
+
96
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
97
+ get :new
98
+ assigns(:series_statement_merge_list).should_not be_valid
99
+ end
100
+ end
101
+
102
+ describe "When logged in as User" do
103
+ login_user
104
+
105
+ it "should not assign the requested series_statement_merge_list as @series_statement_merge_list" do
106
+ get :new
107
+ assigns(:series_statement_merge_list).should_not be_valid
108
+ response.should be_forbidden
109
+ end
110
+ end
111
+
112
+ describe "When not logged in" do
113
+ it "should not assign the requested series_statement_merge_list as @series_statement_merge_list" do
114
+ get :new
115
+ assigns(:series_statement_merge_list).should_not be_valid
116
+ response.should redirect_to(new_user_session_url)
117
+ end
118
+ end
119
+ end
120
+
121
+ describe "GET edit" do
122
+ describe "When logged in as Administrator" do
123
+ login_admin
124
+
125
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
126
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
127
+ get :edit, :id => series_statement_merge_list.id
128
+ assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
129
+ end
130
+ end
131
+
132
+ describe "When logged in as Librarian" do
133
+ login_librarian
134
+
135
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
136
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
137
+ get :edit, :id => series_statement_merge_list.id
138
+ assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
139
+ end
140
+ end
141
+
142
+ describe "When logged in as User" do
143
+ login_user
144
+
145
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
146
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
147
+ get :edit, :id => series_statement_merge_list.id
148
+ response.should be_forbidden
149
+ end
150
+ end
151
+
152
+ describe "When not logged in" do
153
+ it "should not assign the requested series_statement_merge_list as @series_statement_merge_list" do
154
+ series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
155
+ get :edit, :id => series_statement_merge_list.id
156
+ response.should redirect_to(new_user_session_url)
157
+ end
158
+ end
159
+ end
160
+
161
+ describe "POST create" do
162
+ before(:each) do
163
+ @attrs = FactoryGirl.attributes_for(:series_statement_merge_list)
164
+ @invalid_attrs = {:title => ''}
165
+ end
166
+
167
+ describe "When logged in as Administrator" do
168
+ login_admin
169
+
170
+ describe "with valid params" do
171
+ it "assigns a newly created series_statement_merge_list as @series_statement_merge_list" do
172
+ post :create, :series_statement_merge_list => @attrs
173
+ assigns(:series_statement_merge_list).should be_valid
174
+ end
175
+
176
+ it "redirects to the created series_statement_merge_list" do
177
+ post :create, :series_statement_merge_list => @attrs
178
+ response.should redirect_to(series_statement_merge_list_url(assigns(:series_statement_merge_list)))
179
+ end
180
+ end
181
+
182
+ describe "with invalid params" do
183
+ it "assigns a newly created but unsaved series_statement_merge_list as @series_statement_merge_list" do
184
+ post :create, :series_statement_merge_list => @invalid_attrs
185
+ assigns(:series_statement_merge_list).should_not be_valid
186
+ end
187
+
188
+ it "re-renders the 'new' template" do
189
+ post :create, :series_statement_merge_list => @invalid_attrs
190
+ response.should render_template("new")
191
+ end
192
+ end
193
+ end
194
+
195
+ describe "When logged in as Librarian" do
196
+ login_librarian
197
+
198
+ describe "with valid params" do
199
+ it "assigns a newly created series_statement_merge_list as @series_statement_merge_list" do
200
+ post :create, :series_statement_merge_list => @attrs
201
+ assigns(:series_statement_merge_list).should be_valid
202
+ end
203
+
204
+ it "redirects to the created series_statement_merge_list" do
205
+ post :create, :series_statement_merge_list => @attrs
206
+ response.should redirect_to(series_statement_merge_list_url(assigns(:series_statement_merge_list)))
207
+ end
208
+ end
209
+
210
+ describe "with invalid params" do
211
+ it "assigns a newly created but unsaved series_statement_merge_list as @series_statement_merge_list" do
212
+ post :create, :series_statement_merge_list => @invalid_attrs
213
+ assigns(:series_statement_merge_list).should_not be_valid
214
+ end
215
+
216
+ it "re-renders the 'new' template" do
217
+ post :create, :series_statement_merge_list => @invalid_attrs
218
+ response.should render_template("new")
219
+ end
220
+ end
221
+ end
222
+
223
+ describe "When logged in as User" do
224
+ login_user
225
+
226
+ describe "with valid params" do
227
+ it "assigns a newly created series_statement_merge_list as @series_statement_merge_list" do
228
+ post :create, :series_statement_merge_list => @attrs
229
+ assigns(:series_statement_merge_list).should be_valid
230
+ end
231
+
232
+ it "should be forbidden" do
233
+ post :create, :series_statement_merge_list => @attrs
234
+ response.should be_forbidden
235
+ end
236
+ end
237
+
238
+ describe "with invalid params" do
239
+ it "assigns a newly created but unsaved series_statement_merge_list as @series_statement_merge_list" do
240
+ post :create, :series_statement_merge_list => @invalid_attrs
241
+ assigns(:series_statement_merge_list).should_not be_valid
242
+ end
243
+
244
+ it "should be forbidden" do
245
+ post :create, :series_statement_merge_list => @invalid_attrs
246
+ response.should be_forbidden
247
+ end
248
+ end
249
+ end
250
+
251
+ describe "When not logged in" do
252
+ describe "with valid params" do
253
+ it "assigns a newly created series_statement_merge_list as @series_statement_merge_list" do
254
+ post :create, :series_statement_merge_list => @attrs
255
+ assigns(:series_statement_merge_list).should be_valid
256
+ end
257
+
258
+ it "should be forbidden" do
259
+ post :create, :series_statement_merge_list => @attrs
260
+ response.should redirect_to(new_user_session_url)
261
+ end
262
+ end
263
+
264
+ describe "with invalid params" do
265
+ it "assigns a newly created but unsaved series_statement_merge_list as @series_statement_merge_list" do
266
+ post :create, :series_statement_merge_list => @invalid_attrs
267
+ assigns(:series_statement_merge_list).should_not be_valid
268
+ end
269
+
270
+ it "should be forbidden" do
271
+ post :create, :series_statement_merge_list => @invalid_attrs
272
+ response.should redirect_to(new_user_session_url)
273
+ end
274
+ end
275
+ end
276
+ end
277
+
278
+ describe "PUT update" do
279
+ before(:each) do
280
+ @series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
281
+ @attrs = FactoryGirl.attributes_for(:series_statement_merge_list)
282
+ @invalid_attrs = {:title => ''}
283
+ end
284
+
285
+ describe "When logged in as Administrator" do
286
+ login_admin
287
+
288
+ describe "with valid params" do
289
+ it "updates the requested series_statement_merge_list" do
290
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
291
+ end
292
+
293
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
294
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
295
+ assigns(:series_statement_merge_list).should eq(@series_statement_merge_list)
296
+ response.should redirect_to(@series_statement_merge_list)
297
+ end
298
+ end
299
+
300
+ describe "with invalid params" do
301
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
302
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @invalid_attrs
303
+ end
304
+
305
+ it "re-renders the 'edit' template" do
306
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @invalid_attrs
307
+ response.should render_template("edit")
308
+ end
309
+ end
310
+ end
311
+
312
+ describe "When logged in as Librarian" do
313
+ login_librarian
314
+
315
+ describe "with valid params" do
316
+ it "updates the requested series_statement_merge_list" do
317
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
318
+ end
319
+
320
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
321
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
322
+ assigns(:series_statement_merge_list).should eq(@series_statement_merge_list)
323
+ response.should redirect_to(@series_statement_merge_list)
324
+ end
325
+ end
326
+
327
+ describe "with invalid params" do
328
+ it "assigns the series_statement_merge_list as @series_statement_merge_list" do
329
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @invalid_attrs
330
+ assigns(:series_statement_merge_list).should_not be_valid
331
+ end
332
+
333
+ it "re-renders the 'edit' template" do
334
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @invalid_attrs
335
+ response.should render_template("edit")
336
+ end
337
+ end
338
+ end
339
+
340
+ describe "When logged in as User" do
341
+ login_user
342
+
343
+ describe "with valid params" do
344
+ it "updates the requested series_statement_merge_list" do
345
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
346
+ end
347
+
348
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
349
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
350
+ assigns(:series_statement_merge_list).should eq(@series_statement_merge_list)
351
+ response.should be_forbidden
352
+ end
353
+ end
354
+
355
+ describe "with invalid params" do
356
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
357
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @invalid_attrs
358
+ response.should be_forbidden
359
+ end
360
+ end
361
+ end
362
+
363
+ describe "When not logged in" do
364
+ describe "with valid params" do
365
+ it "updates the requested series_statement_merge_list" do
366
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
367
+ end
368
+
369
+ it "should be forbidden" do
370
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @attrs
371
+ response.should redirect_to(new_user_session_url)
372
+ end
373
+ end
374
+
375
+ describe "with invalid params" do
376
+ it "assigns the requested series_statement_merge_list as @series_statement_merge_list" do
377
+ put :update, :id => @series_statement_merge_list.id, :series_statement_merge_list => @invalid_attrs
378
+ response.should redirect_to(new_user_session_url)
379
+ end
380
+ end
381
+ end
382
+ end
383
+
384
+ describe "DELETE destroy" do
385
+ before(:each) do
386
+ @series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
387
+ end
388
+
389
+ describe "When logged in as Administrator" do
390
+ login_admin
391
+
392
+ it "destroys the requested series_statement_merge_list" do
393
+ delete :destroy, :id => @series_statement_merge_list.id
394
+ end
395
+
396
+ it "redirects to the series_statement_merge_lists list" do
397
+ delete :destroy, :id => @series_statement_merge_list.id
398
+ response.should redirect_to(series_statement_merge_lists_url)
399
+ end
400
+ end
401
+
402
+ describe "When logged in as Librarian" do
403
+ login_librarian
404
+
405
+ it "destroys the requested series_statement_merge_list" do
406
+ delete :destroy, :id => @series_statement_merge_list.id
407
+ end
408
+
409
+ it "redirects to the series_statement_merge_lists list" do
410
+ delete :destroy, :id => @series_statement_merge_list.id
411
+ response.should redirect_to(series_statement_merge_lists_url)
412
+ end
413
+ end
414
+
415
+ describe "When logged in as User" do
416
+ login_user
417
+
418
+ it "destroys the requested series_statement_merge_list" do
419
+ delete :destroy, :id => @series_statement_merge_list.id
420
+ end
421
+
422
+ it "should be forbidden" do
423
+ delete :destroy, :id => @series_statement_merge_list.id
424
+ response.should be_forbidden
425
+ end
426
+ end
427
+
428
+ describe "When not logged in" do
429
+ it "destroys the requested series_statement_merge_list" do
430
+ delete :destroy, :id => @series_statement_merge_list.id
431
+ end
432
+
433
+ it "should be forbidden" do
434
+ delete :destroy, :id => @series_statement_merge_list.id
435
+ response.should redirect_to(new_user_session_url)
436
+ end
437
+ end
438
+ end
439
+ end