enju_biblio 0.1.3 → 0.2.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (342) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +3 -3
  3. data/app/controllers/agent_import_files_controller.rb +13 -3
  4. data/app/controllers/agent_import_results_controller.rb +12 -1
  5. data/app/controllers/agent_merge_lists_controller.rb +11 -1
  6. data/app/controllers/agent_merges_controller.rb +12 -2
  7. data/app/controllers/agent_relationship_types_controller.rb +13 -2
  8. data/app/controllers/agent_relationships_controller.rb +13 -4
  9. data/app/controllers/agent_types_controller.rb +13 -2
  10. data/app/controllers/agents_controller.rb +18 -12
  11. data/app/controllers/carrier_types_controller.rb +12 -2
  12. data/app/controllers/concerns/enju_biblio/controller.rb +99 -0
  13. data/app/controllers/content_types_controller.rb +12 -1
  14. data/app/controllers/countries_controller.rb +12 -1
  15. data/app/controllers/create_types_controller.rb +13 -2
  16. data/app/controllers/creates_controller.rb +13 -4
  17. data/app/controllers/donates_controller.rb +11 -1
  18. data/app/controllers/form_of_works_controller.rb +13 -2
  19. data/app/controllers/frequencies_controller.rb +13 -2
  20. data/app/controllers/identifier_types_controller.rb +13 -2
  21. data/app/controllers/import_requests_controller.rb +19 -9
  22. data/app/controllers/items_controller.rb +25 -13
  23. data/app/controllers/languages_controller.rb +12 -1
  24. data/app/controllers/licenses_controller.rb +13 -2
  25. data/app/controllers/manifestation_relationship_types_controller.rb +12 -1
  26. data/app/controllers/manifestation_relationships_controller.rb +13 -4
  27. data/app/controllers/manifestations_controller.rb +58 -30
  28. data/app/controllers/medium_of_performances_controller.rb +13 -2
  29. data/app/controllers/owns_controller.rb +12 -3
  30. data/app/controllers/picture_files_controller.rb +13 -3
  31. data/app/controllers/produce_types_controller.rb +13 -2
  32. data/app/controllers/produces_controller.rb +13 -4
  33. data/app/controllers/realize_types_controller.rb +13 -2
  34. data/app/controllers/realizes_controller.rb +13 -4
  35. data/app/controllers/resource_export_files_controller.rb +13 -3
  36. data/app/controllers/resource_import_files_controller.rb +14 -4
  37. data/app/controllers/resource_import_results_controller.rb +12 -1
  38. data/app/controllers/series_statement_merge_lists_controller.rb +11 -1
  39. data/app/controllers/series_statement_merges_controller.rb +12 -2
  40. data/app/controllers/series_statements_controller.rb +13 -5
  41. data/app/helpers/manifestations_helper.rb +8 -8
  42. data/app/jobs/agent_import_file_job.rb +7 -0
  43. data/app/jobs/resource_export_file_job.rb +7 -0
  44. data/app/jobs/resource_import_file_job.rb +7 -0
  45. data/app/models/agent.rb +23 -1
  46. data/app/models/agent_import_file.rb +0 -1
  47. data/app/models/carrier_type.rb +0 -1
  48. data/app/models/identifier.rb +1 -1
  49. data/app/models/item.rb +2 -9
  50. data/app/models/manifestation.rb +180 -75
  51. data/app/models/picture_file.rb +1 -1
  52. data/app/models/resource_export_file.rb +5 -3
  53. data/app/models/resource_import_file.rb +34 -50
  54. data/app/models/series_statement.rb +8 -1
  55. data/app/policies/agent_import_file_policy.rb +21 -0
  56. data/app/policies/agent_import_result_policy.rb +21 -0
  57. data/app/policies/agent_merge_list_policy.rb +25 -0
  58. data/app/policies/agent_merge_policy.rb +25 -0
  59. data/app/policies/agent_policy.rb +30 -0
  60. data/app/policies/agent_relationship_policy.rb +21 -0
  61. data/app/policies/agent_relationship_type_policy.rb +21 -0
  62. data/app/policies/agent_type_policy.rb +23 -0
  63. data/app/policies/carrier_type_policy.rb +23 -0
  64. data/app/policies/content_type_policy.rb +23 -0
  65. data/app/policies/country_policy.rb +21 -0
  66. data/app/policies/create_policy.rb +21 -0
  67. data/app/policies/create_type_policy.rb +21 -0
  68. data/app/policies/donate_policy.rb +21 -0
  69. data/app/policies/form_of_work_policy.rb +21 -0
  70. data/app/policies/frequency_policy.rb +23 -0
  71. data/app/policies/identifier_type_policy.rb +23 -0
  72. data/app/policies/import_request_policy.rb +21 -0
  73. data/app/policies/item_policy.rb +27 -0
  74. data/app/policies/language_policy.rb +21 -0
  75. data/app/policies/license_policy.rb +21 -0
  76. data/app/policies/manifestation_policy.rb +67 -0
  77. data/app/policies/manifestation_relationship_policy.rb +21 -0
  78. data/app/policies/manifestation_relationship_type_policy.rb +21 -0
  79. data/app/policies/medium_of_performance_policy.rb +21 -0
  80. data/app/policies/own_policy.rb +21 -0
  81. data/app/policies/picture_file_policy.rb +32 -0
  82. data/app/policies/produce_policy.rb +21 -0
  83. data/app/policies/produce_type_policy.rb +21 -0
  84. data/app/policies/realize_policy.rb +21 -0
  85. data/app/policies/realize_type_policy.rb +21 -0
  86. data/app/policies/resource_export_file_policy.rb +21 -0
  87. data/app/policies/resource_import_file_policy.rb +21 -0
  88. data/app/policies/resource_import_result_policy.rb +21 -0
  89. data/app/policies/series_statement_merge_list_policy.rb +25 -0
  90. data/app/policies/series_statement_merge_policy.rb +25 -0
  91. data/app/policies/series_statement_policy.rb +25 -0
  92. data/app/views/agent_relationship_types/index.html.erb +4 -4
  93. data/app/views/agent_types/index.html.erb +4 -4
  94. data/app/views/agent_types/show.html.erb +1 -1
  95. data/app/views/agents/_agent.html.erb +2 -2
  96. data/app/views/agents/_index.html.erb +1 -1
  97. data/app/views/agents/_index_agent.html.erb +4 -4
  98. data/app/views/agents/_index_agent_merge_list.html.erb +2 -2
  99. data/app/views/agents/_index_expression.html.erb +3 -3
  100. data/app/views/agents/_index_manifestation.html.erb +3 -3
  101. data/app/views/agents/_index_work.html.erb +3 -3
  102. data/app/views/agents/edit.html.erb +1 -1
  103. data/app/views/agents/{index.mobile.erb → index.html+phone.erb} +0 -0
  104. data/app/views/agents/index.json.jbuilder +5 -0
  105. data/app/views/agents/index.rss.builder +2 -2
  106. data/app/views/agents/{show.mobile.erb → show.html+phone.erb} +0 -0
  107. data/app/views/agents/show.html.erb +3 -3
  108. data/app/views/carrier_types/_form.html.erb +1 -1
  109. data/app/views/carrier_types/index.html.erb +4 -4
  110. data/app/views/carrier_types/show.html.erb +1 -1
  111. data/app/views/content_types/index.html.erb +4 -4
  112. data/app/views/content_types/show.html.erb +1 -1
  113. data/app/views/countries/index.html.erb +3 -3
  114. data/app/views/countries/show.html.erb +1 -1
  115. data/app/views/create_types/index.html.erb +4 -4
  116. data/app/views/creates/_index.html.erb +2 -2
  117. data/app/views/creates/_index_agent.html.erb +3 -3
  118. data/app/views/creates/_index_work.html.erb +2 -2
  119. data/app/views/donates/index.html.erb +2 -2
  120. data/app/views/form_of_works/index.html.erb +4 -4
  121. data/app/views/form_of_works/show.html.erb +1 -1
  122. data/app/views/frequencies/index.html.erb +4 -4
  123. data/app/views/frequencies/show.html.erb +1 -1
  124. data/app/views/identifier_types/index.html.erb +4 -4
  125. data/app/views/identifier_types/show.html.erb +1 -1
  126. data/app/views/import_requests/index.html.erb +1 -1
  127. data/app/views/items/{_shelf_picture.mobile.erb → _shelf_picture.html+phone.erb} +0 -0
  128. data/app/views/items/edit.html.erb +2 -2
  129. data/app/views/items/{index.mobile.erb → index.html+phone.erb} +1 -1
  130. data/app/views/items/index.html.erb +2 -2
  131. data/app/views/items/new.html.erb +1 -5
  132. data/app/views/items/{show.mobile.erb → show.html+phone.erb} +0 -0
  133. data/app/views/items/show.html.erb +10 -6
  134. data/app/views/languages/index.html.erb +3 -3
  135. data/app/views/languages/show.html.erb +1 -1
  136. data/app/views/layouts/{agents.mobile.erb → agents.html+phone.erb} +1 -1
  137. data/app/views/layouts/agents.html.erb +2 -2
  138. data/app/views/layouts/{manifestations.mobile.erb → manifestations.html+phone.erb} +1 -1
  139. data/app/views/layouts/manifestations.html.erb +2 -2
  140. data/app/views/licenses/index.html.erb +4 -4
  141. data/app/views/manifestation_relationship_types/index.html.erb +4 -4
  142. data/app/views/manifestations/_attachment_file.html.erb +1 -1
  143. data/app/views/manifestations/_carrier_type_facet.html.erb +1 -1
  144. data/app/views/manifestations/_classification_facet.html.erb +2 -2
  145. data/app/views/manifestations/_contributor_fields.html.erb +4 -0
  146. data/app/views/manifestations/_creator_fields.html.erb +5 -0
  147. data/app/views/manifestations/_edit_detail.html.erb +1 -1
  148. data/app/views/manifestations/_export_list.html.erb +3 -3
  149. data/app/views/manifestations/_form.html.erb +25 -30
  150. data/app/views/manifestations/_holding.html.erb +6 -8
  151. data/app/views/manifestations/_identifier_fields.html.erb +5 -0
  152. data/app/views/manifestations/_index_form_contributor.html.erb +2 -2
  153. data/app/views/manifestations/_index_form_creator.html.erb +2 -2
  154. data/app/views/manifestations/_index_form_item.html.erb +2 -2
  155. data/app/views/manifestations/_index_form_manifestation.html.erb +2 -2
  156. data/app/views/manifestations/_index_form_parent.html.erb +1 -1
  157. data/app/views/manifestations/_index_form_publisher.html.erb +2 -2
  158. data/app/views/manifestations/_index_form_series_statement.html.erb +2 -2
  159. data/app/views/manifestations/_language_facet.html.erb +1 -1
  160. data/app/views/manifestations/_library_facet.html.erb +1 -1
  161. data/app/views/manifestations/_manifestation.html.erb +6 -2
  162. data/app/views/manifestations/_manifestation.txt.erb +1 -1
  163. data/app/views/manifestations/_paginate_id_store.html.erb +8 -6
  164. data/app/views/manifestations/_pub_year_facet.html.erb +1 -1
  165. data/app/views/manifestations/_publisher_fields.html.erb +4 -0
  166. data/app/views/manifestations/_reservable_facet.html.erb +2 -2
  167. data/app/views/manifestations/_series_statement_fields.html.erb +13 -0
  168. data/app/views/manifestations/_show.rdf.builder +3 -87
  169. data/app/views/manifestations/{_show_creators.mobile.erb → _show_creators.html+phone.erb} +0 -0
  170. data/app/views/manifestations/_show_creators.html.erb +0 -1
  171. data/app/views/manifestations/_show_detail_librarian.html.erb +20 -22
  172. data/app/views/manifestations/_show_detail_user.html.erb +13 -15
  173. data/app/views/manifestations/{_show_holding.mobile.erb → _show_holding.html+phone.erb} +0 -0
  174. data/app/views/manifestations/_show_holding.html.erb +1 -1
  175. data/app/views/manifestations/{_show_index.mobile.erb → _show_index.html+phone.erb} +0 -0
  176. data/app/views/manifestations/_submenu_parent.html.erb +3 -3
  177. data/app/views/manifestations/{_title.mobile.erb → _title.html+phone.erb} +0 -0
  178. data/app/views/manifestations/edit.html.erb +2 -6
  179. data/app/views/manifestations/{index.mobile.erb → index.html+phone.erb} +0 -0
  180. data/app/views/manifestations/index.html.erb +40 -24
  181. data/app/views/manifestations/index.rdf.builder +5 -3
  182. data/app/views/manifestations/index.rss.builder +2 -2
  183. data/app/views/manifestations/index.txt.erb +1 -2
  184. data/app/views/manifestations/{show.mobile.erb → show.html+phone.erb} +1 -1
  185. data/app/views/manifestations/show.html.erb +1 -1
  186. data/app/views/manifestations/show.txt.erb +1 -2
  187. data/app/views/medium_of_performances/index.html.erb +4 -4
  188. data/app/views/owns/index.html.erb +2 -2
  189. data/app/views/picture_files/_index.html.erb +3 -3
  190. data/app/views/picture_files/_index_agent.html.erb +4 -4
  191. data/app/views/picture_files/_index_manifestation.html.erb +4 -4
  192. data/app/views/picture_files/{_link.mobile.erb → _link.html+phone.erb} +0 -0
  193. data/app/views/picture_files/{show.mobile.erb → show.html+phone.erb} +0 -0
  194. data/app/views/produce_types/index.html.erb +4 -4
  195. data/app/views/produces/_index.html.erb +2 -2
  196. data/app/views/produces/_index_agent.html.erb +2 -2
  197. data/app/views/produces/_index_manifestation.html.erb +2 -2
  198. data/app/views/realize_types/index.html.erb +4 -4
  199. data/app/views/realizes/_index.html.erb +2 -2
  200. data/app/views/realizes/_index_agent.html.erb +2 -2
  201. data/app/views/realizes/_index_expression.html.erb +2 -2
  202. data/app/views/series_statement_merges/show.html.erb +0 -2
  203. data/app/views/series_statements/_index.html.erb +4 -4
  204. data/app/views/series_statements/_index_series_statement_merge_list.html.erb +2 -2
  205. data/app/views/series_statements/show.html.erb +1 -1
  206. data/config/locales/translation_en.yml +13 -0
  207. data/config/locales/translation_ja.yml +13 -0
  208. data/config/routes.rb +3 -43
  209. data/lib/enju_biblio/engine.rb +0 -1
  210. data/lib/enju_biblio/version.rb +1 -1
  211. data/lib/enju_biblio.rb +0 -107
  212. data/lib/tasks/enju_biblio_tasks.rake +1 -1
  213. data/spec/cassette_library/ImportRequest/import/should_import_bibliographic_record.yml +43 -43
  214. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_isbn_which_is_already_imported/redirects_to_the_created_import_request.yml +45 -45
  215. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +50 -50
  216. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/redirects_to_the_created_import_request.yml +44 -44
  217. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +48 -48
  218. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/redirects_to_the_created_import_request.yml +41 -41
  219. data/spec/cassette_library/ResourceImportFile/should_import_in_background.yml +50 -50
  220. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/ISBN_import/with_record_not_found/should_record_an_error_message.yml +49 -49
  221. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_has_only_isbn/should_be_imported.yml +45 -45
  222. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_shift_jis/should_be_imported.yml +50 -50
  223. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_be_imported.yml +48 -48
  224. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_be_searchable_right_after_the_import.yml +512 -0
  225. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_send_message_when_import_is_completed.yml +42 -42
  226. data/spec/controllers/agent_import_files_controller_spec.rb +5 -5
  227. data/spec/controllers/agent_import_results_controller_spec.rb +3 -3
  228. data/spec/controllers/agent_merge_lists_controller_spec.rb +9 -9
  229. data/spec/controllers/agent_merges_controller_spec.rb +9 -9
  230. data/spec/controllers/agent_relationship_types_controller_spec.rb +14 -14
  231. data/spec/controllers/agent_relationships_controller_spec.rb +9 -9
  232. data/spec/controllers/agent_types_controller_spec.rb +2 -2
  233. data/spec/controllers/agents_controller_spec.rb +8 -8
  234. data/spec/controllers/carrier_types_controller_spec.rb +1 -1
  235. data/spec/controllers/content_types_controller_spec.rb +1 -1
  236. data/spec/controllers/countries_controller_spec.rb +10 -10
  237. data/spec/controllers/create_types_controller_spec.rb +2 -2
  238. data/spec/controllers/creates_controller_spec.rb +7 -7
  239. data/spec/controllers/donates_controller_spec.rb +9 -9
  240. data/spec/controllers/form_of_works_controller_spec.rb +2 -2
  241. data/spec/controllers/frequencies_controller_spec.rb +2 -2
  242. data/spec/controllers/identifier_types_controller_spec.rb +2 -2
  243. data/spec/controllers/import_requests_controller_spec.rb +9 -9
  244. data/spec/controllers/items_controller_spec.rb +13 -7
  245. data/spec/controllers/languages_controller_spec.rb +8 -8
  246. data/spec/controllers/licenses_controller_spec.rb +2 -2
  247. data/spec/controllers/manifestation_relationship_types_controller_spec.rb +10 -10
  248. data/spec/controllers/manifestation_relationships_controller_spec.rb +9 -9
  249. data/spec/controllers/manifestations_controller_spec.rb +86 -12
  250. data/spec/controllers/medium_of_performances_controller_spec.rb +2 -2
  251. data/spec/controllers/owns_controller_spec.rb +7 -7
  252. data/spec/controllers/picture_files_controller_spec.rb +9 -9
  253. data/spec/controllers/produce_types_controller_spec.rb +2 -2
  254. data/spec/controllers/produces_controller_spec.rb +7 -7
  255. data/spec/controllers/realize_types_controller_spec.rb +2 -2
  256. data/spec/controllers/realizes_controller_spec.rb +7 -7
  257. data/spec/controllers/resource_export_files_controller_spec.rb +9 -15
  258. data/spec/controllers/resource_import_files_controller_spec.rb +7 -7
  259. data/spec/controllers/resource_import_results_controller_spec.rb +3 -3
  260. data/spec/controllers/series_statement_merge_lists_controller_spec.rb +9 -9
  261. data/spec/controllers/series_statement_merges_controller_spec.rb +9 -9
  262. data/spec/controllers/series_statements_controller_spec.rb +7 -7
  263. data/spec/dummy/app/assets/javascripts/application.js +0 -2
  264. data/spec/dummy/app/controllers/application_controller.rb +10 -6
  265. data/spec/dummy/app/models/user.rb +4 -4
  266. data/spec/dummy/config/application.rb +13 -41
  267. data/spec/dummy/config/environments/development.rb +22 -18
  268. data/spec/dummy/config/environments/production.rb +46 -34
  269. data/spec/dummy/config/environments/test.rb +19 -14
  270. data/spec/dummy/config/initializers/assets.rb +1 -1
  271. data/spec/dummy/config/initializers/enju_leaf.rb +8 -0
  272. data/spec/dummy/config/routes.rb +3 -0
  273. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +13 -0
  274. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +13 -0
  275. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +9 -0
  276. data/spec/dummy/db/schema.rb +27 -2
  277. data/spec/factories/classification_type.rb +5 -0
  278. data/spec/factories/reserve.rb +12 -0
  279. data/spec/factories/role.rb +9 -0
  280. data/spec/factories/subject.rb +7 -0
  281. data/spec/factories/subject_heading_type.rb +5 -0
  282. data/spec/factories/subject_heading_type_has_subject.rb +6 -0
  283. data/spec/factories/subject_type.rb +5 -0
  284. data/spec/fixtures/checked_items.yml +4 -4
  285. data/spec/fixtures/checkouts.yml +12 -12
  286. data/spec/fixtures/classification_types.yml +1 -1
  287. data/spec/fixtures/classifications.yml +1 -0
  288. data/spec/fixtures/manifestations.yml +4 -4
  289. data/spec/fixtures/reserves.yml +16 -16
  290. data/spec/fixtures/subjects.yml +79 -0
  291. data/spec/models/agent_import_file_spec.rb +1 -1
  292. data/spec/models/manifestation_spec.rb +27 -13
  293. data/spec/models/resource_export_file_spec.rb +15 -2
  294. data/spec/models/resource_import_file_spec.rb +29 -9
  295. data/spec/models/series_statement_merge_list_spec.rb +1 -1
  296. data/spec/policies/manifestation_policy_spec.rb +24 -0
  297. data/spec/rails_helper.rb +82 -0
  298. data/spec/spec_helper.rb +81 -56
  299. data/spec/support/devise.rb +2 -2
  300. data/spec/support/vcr.rb +8 -0
  301. data/spec/views/agent_types/index.html.erb_spec.rb +2 -1
  302. data/spec/views/agent_types/show.html.erb_spec.rb +1 -0
  303. data/spec/views/create_types/index.html.erb_spec.rb +2 -1
  304. data/spec/views/creates/edit.html.erb_spec.rb +0 -3
  305. data/spec/views/creates/index.html.erb_spec.rb +2 -4
  306. data/spec/views/creates/new.html.erb_spec.rb +0 -3
  307. data/spec/views/creates/show.html.erb_spec.rb +0 -3
  308. data/spec/views/import_requests/index.html.erb_spec.rb +3 -2
  309. data/spec/views/manifestations/index.html.erb_spec.rb +25 -0
  310. data/spec/views/manifestations/index.rdf.builder_spec.rb +23 -0
  311. data/spec/views/manifestations/index.txt.erb_spec.rb +17 -0
  312. data/spec/views/manifestations/show.html.erb_spec.rb +2 -3
  313. data/spec/views/manifestations/show.txt.erb_spec.rb +16 -0
  314. data/spec/views/owns/edit.html.erb_spec.rb +0 -3
  315. data/spec/views/owns/index.html.erb_spec.rb +2 -4
  316. data/spec/views/owns/new.html.erb_spec.rb +0 -3
  317. data/spec/views/owns/show.html.erb_spec.rb +0 -3
  318. data/spec/views/produce_types/index.html.erb_spec.rb +2 -1
  319. data/spec/views/produces/edit.html.erb_spec.rb +0 -3
  320. data/spec/views/produces/index.html.erb_spec.rb +2 -4
  321. data/spec/views/produces/new.html.erb_spec.rb +0 -3
  322. data/spec/views/produces/show.html.erb_spec.rb +0 -3
  323. data/spec/views/realize_types/index.html.erb_spec.rb +2 -1
  324. data/spec/views/realizes/edit.html.erb_spec.rb +0 -3
  325. data/spec/views/realizes/index.html.erb_spec.rb +2 -4
  326. data/spec/views/realizes/new.html.erb_spec.rb +0 -3
  327. data/spec/views/realizes/show.html.erb_spec.rb +0 -3
  328. data/spec/views/resource_import_files/index.html.erb_spec.rb +0 -3
  329. data/spec/views/resource_import_files/{show.html.erb_spec.erb → show.html.erb_spec.rb} +0 -3
  330. data/spec/views/resource_import_results/index.html.erb_spec.rb +0 -3
  331. data/spec/views/resource_import_results/{show.html.erb_spec.erb → show.html.erb_spec.rb} +1 -4
  332. data/spec/views/series_statement_merge_lists/index.html.erb_spec.rb +1 -1
  333. data/spec/views/series_statement_merges/edit.html.erb_spec.rb +0 -3
  334. data/spec/views/series_statement_merges/index.html.erb_spec.rb +0 -3
  335. data/spec/views/series_statement_merges/new.html.erb_spec.rb +0 -3
  336. data/spec/views/series_statement_merges/show.html.erb_spec.rb +0 -3
  337. metadata +170 -131
  338. data/app/models/enju_biblio/ability.rb +0 -238
  339. data/app/workers/agent_import_file_queue.rb +0 -7
  340. data/app/workers/resource_export_file_queue.rb +0 -7
  341. data/app/workers/resource_import_file_queue.rb +0 -7
  342. data/spec/dummy/config/application.yml +0 -42
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe CountriesController do
@@ -105,7 +105,7 @@ describe CountriesController do
105
105
 
106
106
  it "assigns the requested country as @country" do
107
107
  get :new
108
- assigns(:country).should_not be_valid
108
+ assigns(:country).should be_nil
109
109
  expect(response).to be_forbidden
110
110
  end
111
111
  end
@@ -115,7 +115,7 @@ describe CountriesController do
115
115
 
116
116
  it "assigns the requested country as @country" do
117
117
  get :new
118
- assigns(:country).should_not be_valid
118
+ assigns(:country).should be_nil
119
119
  expect(response).to be_forbidden
120
120
  end
121
121
  end
@@ -123,7 +123,7 @@ describe CountriesController do
123
123
  describe "When not logged in" do
124
124
  it "should not assign the requested country as @country" do
125
125
  get :new
126
- assigns(:country).should_not be_valid
126
+ assigns(:country).should be_nil
127
127
  expect(response).to redirect_to(new_user_session_url)
128
128
  end
129
129
  end
@@ -209,7 +209,7 @@ describe CountriesController do
209
209
  describe "with valid params" do
210
210
  it "assigns a newly created country as @country" do
211
211
  post :create, :country => @attrs
212
- assigns(:country).should be_valid
212
+ assigns(:country).should be_nil
213
213
  end
214
214
 
215
215
  it "should be forbidden" do
@@ -221,7 +221,7 @@ describe CountriesController do
221
221
  describe "with invalid params" do
222
222
  it "assigns a newly created but unsaved country as @country" do
223
223
  post :create, :country => @invalid_attrs
224
- assigns(:country).should_not be_valid
224
+ assigns(:country).should be_nil
225
225
  end
226
226
 
227
227
  it "should be forbidden" do
@@ -237,7 +237,7 @@ describe CountriesController do
237
237
  describe "with valid params" do
238
238
  it "assigns a newly created country as @country" do
239
239
  post :create, :country => @attrs
240
- assigns(:country).should be_valid
240
+ assigns(:country).should be_nil
241
241
  end
242
242
 
243
243
  it "should be forbidden" do
@@ -249,7 +249,7 @@ describe CountriesController do
249
249
  describe "with invalid params" do
250
250
  it "assigns a newly created but unsaved country as @country" do
251
251
  post :create, :country => @invalid_attrs
252
- assigns(:country).should_not be_valid
252
+ assigns(:country).should be_nil
253
253
  end
254
254
 
255
255
  it "should be forbidden" do
@@ -263,7 +263,7 @@ describe CountriesController do
263
263
  describe "with valid params" do
264
264
  it "assigns a newly created country as @country" do
265
265
  post :create, :country => @attrs
266
- assigns(:country).should be_valid
266
+ assigns(:country).should be_nil
267
267
  end
268
268
 
269
269
  it "should be forbidden" do
@@ -275,7 +275,7 @@ describe CountriesController do
275
275
  describe "with invalid params" do
276
276
  it "assigns a newly created but unsaved country as @country" do
277
277
  post :create, :country => @invalid_attrs
278
- assigns(:country).should_not be_valid
278
+ assigns(:country).should be_nil
279
279
  end
280
280
 
281
281
  it "should be forbidden" do
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  # This spec was generated by rspec-rails when you ran the scaffold generator.
4
4
  # It demonstrates how one might use RSpec to specify the controller code that
@@ -33,7 +33,7 @@ describe CreateTypesController do
33
33
  it "assigns all create_types as @create_types" do
34
34
  create_type = CreateType.create! valid_attributes
35
35
  get :index
36
- expect(assigns(:create_types)).to eq(CreateType.all)
36
+ expect(assigns(:create_types)).to eq(CreateType.order(:position))
37
37
  end
38
38
  end
39
39
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe CreatesController do
@@ -113,7 +113,7 @@ describe CreatesController do
113
113
 
114
114
  it "should not assign the requested create as @create" do
115
115
  get :new
116
- expect(assigns(:create)).not_to be_valid
116
+ expect(assigns(:create)).to be_nil
117
117
  expect(response).to be_forbidden
118
118
  end
119
119
  end
@@ -121,7 +121,7 @@ describe CreatesController do
121
121
  describe "When not logged in" do
122
122
  it "should not assign the requested create as @create" do
123
123
  get :new
124
- expect(assigns(:create)).not_to be_valid
124
+ expect(assigns(:create)).to be_nil
125
125
  expect(response).to redirect_to(new_user_session_url)
126
126
  end
127
127
  end
@@ -235,7 +235,7 @@ describe CreatesController do
235
235
  describe "with valid params" do
236
236
  it "assigns a newly created create as @create" do
237
237
  post :create, :create => @attrs
238
- expect(assigns(:create)).to be_valid
238
+ expect(assigns(:create)).to be_nil
239
239
  end
240
240
 
241
241
  it "should be forbidden" do
@@ -247,7 +247,7 @@ describe CreatesController do
247
247
  describe "with invalid params" do
248
248
  it "assigns a newly created but unsaved create as @create" do
249
249
  post :create, :create => @invalid_attrs
250
- expect(assigns(:create)).not_to be_valid
250
+ expect(assigns(:create)).to be_nil
251
251
  end
252
252
 
253
253
  it "should be forbidden" do
@@ -261,7 +261,7 @@ describe CreatesController do
261
261
  describe "with valid params" do
262
262
  it "assigns a newly created create as @create" do
263
263
  post :create, :create => @attrs
264
- expect(assigns(:create)).to be_valid
264
+ expect(assigns(:create)).to be_nil
265
265
  end
266
266
 
267
267
  it "should be forbidden" do
@@ -273,7 +273,7 @@ describe CreatesController do
273
273
  describe "with invalid params" do
274
274
  it "assigns a newly created but unsaved create as @create" do
275
275
  post :create, :create => @invalid_attrs
276
- expect(assigns(:create)).not_to be_valid
276
+ expect(assigns(:create)).to be_nil
277
277
  end
278
278
 
279
279
  it "should be redirected to new session url" do
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe DonatesController do
@@ -33,14 +33,14 @@ describe DonatesController do
33
33
 
34
34
  it "assigns all donates as @donates" do
35
35
  get :index
36
- expect(assigns(:donates)).to be_empty
36
+ expect(assigns(:donates)).to be_nil
37
37
  end
38
38
  end
39
39
 
40
40
  describe "When not logged in" do
41
41
  it "assigns all donates as @donates" do
42
42
  get :index
43
- expect(assigns(:donates)).to be_empty
43
+ expect(assigns(:donates)).to be_nil
44
44
  end
45
45
  end
46
46
  end
@@ -109,7 +109,7 @@ describe DonatesController do
109
109
 
110
110
  it "should not assign the requested donate as @donate" do
111
111
  get :new
112
- expect(assigns(:donate)).not_to be_valid
112
+ expect(assigns(:donate)).to be_nil
113
113
  expect(response).to be_forbidden
114
114
  end
115
115
  end
@@ -117,7 +117,7 @@ describe DonatesController do
117
117
  describe "When not logged in" do
118
118
  it "should not assign the requested donate as @donate" do
119
119
  get :new
120
- expect(assigns(:donate)).not_to be_valid
120
+ expect(assigns(:donate)).to be_nil
121
121
  expect(response).to redirect_to(new_user_session_url)
122
122
  end
123
123
  end
@@ -231,7 +231,7 @@ describe DonatesController do
231
231
  describe "with valid params" do
232
232
  it "assigns a newly created donate as @donate" do
233
233
  post :create, :donate => @attrs
234
- expect(assigns(:donate)).to be_valid
234
+ expect(assigns(:donate)).to be_nil
235
235
  end
236
236
 
237
237
  it "should be forbidden" do
@@ -243,7 +243,7 @@ describe DonatesController do
243
243
  describe "with invalid params" do
244
244
  it "assigns a newly created but unsaved donate as @donate" do
245
245
  post :create, :donate => @invalid_attrs
246
- expect(assigns(:donate)).not_to be_valid
246
+ expect(assigns(:donate)).to be_nil
247
247
  end
248
248
 
249
249
  it "should be forbidden" do
@@ -257,7 +257,7 @@ describe DonatesController do
257
257
  describe "with valid params" do
258
258
  it "assigns a newly created donate as @donate" do
259
259
  post :create, :donate => @attrs
260
- expect(assigns(:donate)).to be_valid
260
+ expect(assigns(:donate)).to be_nil
261
261
  end
262
262
 
263
263
  it "should be forbidden" do
@@ -269,7 +269,7 @@ describe DonatesController do
269
269
  describe "with invalid params" do
270
270
  it "assigns a newly created but unsaved donate as @donate" do
271
271
  post :create, :donate => @invalid_attrs
272
- expect(assigns(:donate)).not_to be_valid
272
+ expect(assigns(:donate)).to be_nil
273
273
  end
274
274
 
275
275
  it "should be forbidden" do
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  # This spec was generated by rspec-rails when you ran the scaffold generator.
4
4
  # It demonstrates how one might use RSpec to specify the controller code that
@@ -33,7 +33,7 @@ describe FormOfWorksController do
33
33
  it "assigns all form_of_works as @form_of_works" do
34
34
  form_of_work = FormOfWork.create! valid_attributes
35
35
  get :index
36
- expect(assigns(:form_of_works)).to eq(FormOfWork.all)
36
+ expect(assigns(:form_of_works)).to eq(FormOfWork.order(:position))
37
37
  end
38
38
  end
39
39
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  # This spec was generated by rspec-rails when you ran the scaffold generator.
4
4
  # It demonstrates how one might use RSpec to specify the controller code that
@@ -33,7 +33,7 @@ describe FrequenciesController do
33
33
  it "assigns all frequencies as @frequencies" do
34
34
  frequency = Frequency.create! valid_attributes
35
35
  get :index
36
- assigns(:frequencies).should eq(Frequency.all)
36
+ assigns(:frequencies).should eq(Frequency.order(:position))
37
37
  end
38
38
  end
39
39
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  # This spec was generated by rspec-rails when you ran the scaffold generator.
4
4
  # It demonstrates how one might use RSpec to specify the controller code that
@@ -33,7 +33,7 @@ describe IdentifierTypesController do
33
33
  it "assigns all identifier_types as @identifier_types" do
34
34
  identifier_type = IdentifierType.create! valid_attributes
35
35
  get :index
36
- expect(assigns(:identifier_types)).to eq(IdentifierType.all)
36
+ expect(assigns(:identifier_types)).to eq(IdentifierType.order(:position))
37
37
  end
38
38
  end
39
39
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe ImportRequestsController do
@@ -29,14 +29,14 @@ describe ImportRequestsController do
29
29
 
30
30
  it "assigns empty as @import_requests" do
31
31
  get :index
32
- expect(assigns(:import_requests)).to be_empty
32
+ expect(assigns(:import_requests)).to be_nil
33
33
  end
34
34
  end
35
35
 
36
36
  describe "When not logged in" do
37
37
  it "assigns empty as @import_requests" do
38
38
  get :index
39
- expect(assigns(:import_requests)).to be_empty
39
+ expect(assigns(:import_requests)).to be_nil
40
40
  end
41
41
  end
42
42
  end
@@ -105,7 +105,7 @@ describe ImportRequestsController do
105
105
 
106
106
  it "should not assign the requested import_request as @import_request" do
107
107
  get :new
108
- expect(assigns(:import_request)).to_not be_valid
108
+ expect(assigns(:import_request)).to be_nil
109
109
  expect(response).to be_forbidden
110
110
  end
111
111
  end
@@ -113,7 +113,7 @@ describe ImportRequestsController do
113
113
  describe "When not logged in" do
114
114
  it "should not assign the requested import_request as @import_request" do
115
115
  get :new
116
- expect(assigns(:import_request)).to_not be_valid
116
+ expect(assigns(:import_request)).to be_nil
117
117
  expect(response).to redirect_to(new_user_session_url)
118
118
  end
119
119
  end
@@ -239,7 +239,7 @@ describe ImportRequestsController do
239
239
  describe "with valid params" do
240
240
  it "assigns a newly created import_request as @import_request" do
241
241
  post :create, :import_request => @attrs
242
- expect(assigns(:import_request)).to be_valid
242
+ expect(assigns(:import_request)).to be_nil
243
243
  end
244
244
 
245
245
  it "should be forbidden" do
@@ -251,7 +251,7 @@ describe ImportRequestsController do
251
251
  describe "with invalid params" do
252
252
  it "assigns a newly created but unsaved import_request as @import_request" do
253
253
  post :create, :import_request => @invalid_attrs
254
- expect(assigns(:import_request)).to_not be_valid
254
+ expect(assigns(:import_request)).to be_nil
255
255
  end
256
256
 
257
257
  it "should be forbidden" do
@@ -265,7 +265,7 @@ describe ImportRequestsController do
265
265
  describe "with valid params" do
266
266
  it "assigns a newly created import_request as @import_request" do
267
267
  post :create, :import_request => @attrs
268
- expect(assigns(:import_request)).to be_valid
268
+ expect(assigns(:import_request)).to be_nil
269
269
  end
270
270
 
271
271
  it "should be forbidden" do
@@ -277,7 +277,7 @@ describe ImportRequestsController do
277
277
  describe "with invalid params" do
278
278
  it "assigns a newly created but unsaved import_request as @import_request" do
279
279
  post :create, :import_request => @invalid_attrs
280
- expect(assigns(:import_request)).to_not be_valid
280
+ expect(assigns(:import_request)).to be_nil
281
281
  end
282
282
 
283
283
  it "should be forbidden" do
@@ -1,5 +1,5 @@
1
1
  # -*- encoding: utf-8 -*-
2
- require 'spec_helper'
2
+ require 'rails_helper'
3
3
 
4
4
  describe ItemsController do
5
5
  fixtures :all
@@ -181,6 +181,12 @@ describe ItemsController do
181
181
  get :new, :manifestation_id => @manifestation.id
182
182
  expect(response).to redirect_to(libraries_url)
183
183
  end
184
+
185
+ it "should not get new item for series_master" do
186
+ manifestation_serial = FactoryGirl.create(:manifestation_serial)
187
+ get :new, :manifestation_id => manifestation_serial.id
188
+ expect(response).to redirect_to(manifestations_url(parent_id: manifestation_serial.id))
189
+ end
184
190
  end
185
191
 
186
192
  describe "When logged in as Librarian" do
@@ -198,7 +204,7 @@ describe ItemsController do
198
204
 
199
205
  it "should not assign the requested item as @item" do
200
206
  get :new, :manifestation_id => @manifestation.id
201
- expect(assigns(:item)).to_not be_valid
207
+ expect(assigns(:item)).to be_nil
202
208
  expect(response).to be_forbidden
203
209
  end
204
210
  end
@@ -206,7 +212,7 @@ describe ItemsController do
206
212
  describe "When not logged in" do
207
213
  it "should not assign the requested item as @item" do
208
214
  get :new, :manifestation_id => @manifestation.id
209
- expect(assigns(:item)).to_not be_valid
215
+ expect(assigns(:item)).to be_nil
210
216
  expect(response).to redirect_to(new_user_session_url)
211
217
  end
212
218
  end
@@ -359,7 +365,7 @@ describe ItemsController do
359
365
  describe "with valid params" do
360
366
  it "assigns a newly created item as @item" do
361
367
  post :create, :item => @attrs
362
- expect(assigns(:item)).to be_valid
368
+ expect(assigns(:item)).to be_nil
363
369
  end
364
370
 
365
371
  it "should be forbidden" do
@@ -371,7 +377,7 @@ describe ItemsController do
371
377
  describe "with invalid params" do
372
378
  it "assigns a newly created but unsaved item as @item" do
373
379
  post :create, :item => @invalid_attrs
374
- expect(assigns(:item)).to_not be_valid
380
+ expect(assigns(:item)).to be_nil
375
381
  end
376
382
 
377
383
  it "should be forbidden" do
@@ -385,7 +391,7 @@ describe ItemsController do
385
391
  describe "with valid params" do
386
392
  it "assigns a newly created item as @item" do
387
393
  post :create, :item => @attrs
388
- expect(assigns(:item)).to be_valid
394
+ expect(assigns(:item)).to be_nil
389
395
  end
390
396
 
391
397
  it "should be forbidden" do
@@ -397,7 +403,7 @@ describe ItemsController do
397
403
  describe "with invalid params" do
398
404
  it "assigns a newly created but unsaved item as @item" do
399
405
  post :create, :item => @invalid_attrs
400
- expect(assigns(:item)).to_not be_valid
406
+ expect(assigns(:item)).to be_nil
401
407
  end
402
408
 
403
409
  it "should be forbidden" do
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe LanguagesController do
@@ -84,7 +84,7 @@ describe LanguagesController do
84
84
  describe "When not logged in" do
85
85
  it "should not assign the requested language as @language" do
86
86
  get :new
87
- expect(assigns(:language)).to_not be_valid
87
+ expect(assigns(:language)).to be_nil
88
88
  response.should redirect_to(new_user_session_url)
89
89
  end
90
90
  end
@@ -152,7 +152,7 @@ describe LanguagesController do
152
152
  describe "with valid params" do
153
153
  it "assigns a newly created language as @language" do
154
154
  post :create, :language => @attrs
155
- expect(assigns(:language)).to be_valid
155
+ expect(assigns(:language)).to be_nil
156
156
  end
157
157
 
158
158
  it "should be forbidden" do
@@ -164,7 +164,7 @@ describe LanguagesController do
164
164
  describe "with invalid params" do
165
165
  it "assigns a newly created but unsaved language as @language" do
166
166
  post :create, :language => @invalid_attrs
167
- expect(assigns(:language)).to_not be_valid
167
+ expect(assigns(:language)).to be_nil
168
168
  end
169
169
 
170
170
  it "should be forbidden" do
@@ -180,7 +180,7 @@ describe LanguagesController do
180
180
  describe "with valid params" do
181
181
  it "assigns a newly created language as @language" do
182
182
  post :create, :language => @attrs
183
- expect(assigns(:language)).to be_valid
183
+ expect(assigns(:language)).to be_nil
184
184
  end
185
185
 
186
186
  it "should be forbidden" do
@@ -192,7 +192,7 @@ describe LanguagesController do
192
192
  describe "with invalid params" do
193
193
  it "assigns a newly created but unsaved language as @language" do
194
194
  post :create, :language => @invalid_attrs
195
- expect(assigns(:language)).to_not be_valid
195
+ expect(assigns(:language)).to be_nil
196
196
  end
197
197
 
198
198
  it "should be forbidden" do
@@ -206,7 +206,7 @@ describe LanguagesController do
206
206
  describe "with valid params" do
207
207
  it "assigns a newly created language as @language" do
208
208
  post :create, :language => @attrs
209
- expect(assigns(:language)).to be_valid
209
+ expect(assigns(:language)).to be_nil
210
210
  end
211
211
 
212
212
  it "should be forbidden" do
@@ -218,7 +218,7 @@ describe LanguagesController do
218
218
  describe "with invalid params" do
219
219
  it "assigns a newly created but unsaved language as @language" do
220
220
  post :create, :language => @invalid_attrs
221
- expect(assigns(:language)).to_not be_valid
221
+ expect(assigns(:language)).to be_nil
222
222
  end
223
223
 
224
224
  it "should be forbidden" do
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  # This spec was generated by rspec-rails when you ran the scaffold generator.
4
4
  # It demonstrates how one might use RSpec to specify the controller code that
@@ -33,7 +33,7 @@ describe LicensesController do
33
33
  it "assigns all licenses as @licenses" do
34
34
  license = License.create! valid_attributes
35
35
  get :index
36
- expect(assigns(:licenses)).to eq(License.all)
36
+ expect(assigns(:licenses)).to eq(License.order(:position))
37
37
  end
38
38
  end
39
39
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe ManifestationRelationshipTypesController do
@@ -105,7 +105,7 @@ describe ManifestationRelationshipTypesController do
105
105
 
106
106
  it "should not assign the requested manifestation_relationship_type as @manifestation_relationship_type" do
107
107
  get :new
108
- expect(assigns(:manifestation_relationship_type)).not_to be_valid
108
+ expect(assigns(:manifestation_relationship_type)).to be_nil
109
109
  expect(response).to be_forbidden
110
110
  end
111
111
  end
@@ -115,7 +115,7 @@ describe ManifestationRelationshipTypesController do
115
115
 
116
116
  it "should not assign the requested manifestation_relationship_type as @manifestation_relationship_type" do
117
117
  get :new
118
- expect(assigns(:manifestation_relationship_type)).not_to be_valid
118
+ expect(assigns(:manifestation_relationship_type)).to be_nil
119
119
  expect(response).to be_forbidden
120
120
  end
121
121
  end
@@ -123,7 +123,7 @@ describe ManifestationRelationshipTypesController do
123
123
  describe "When not logged in" do
124
124
  it "should not assign the requested manifestation_relationship_type as @manifestation_relationship_type" do
125
125
  get :new
126
- expect(assigns(:manifestation_relationship_type)).not_to be_valid
126
+ expect(assigns(:manifestation_relationship_type)).to be_nil
127
127
  expect(response).to redirect_to(new_user_session_url)
128
128
  end
129
129
  end
@@ -209,7 +209,7 @@ describe ManifestationRelationshipTypesController do
209
209
  describe "with valid params" do
210
210
  it "assigns a newly created manifestation_relationship_type as @manifestation_relationship_type" do
211
211
  post :create, :manifestation_relationship_type => @attrs
212
- expect(assigns(:manifestation_relationship_type)).to be_valid
212
+ expect(assigns(:manifestation_relationship_type)).to be_nil
213
213
  end
214
214
 
215
215
  it "should be forbidden" do
@@ -221,7 +221,7 @@ describe ManifestationRelationshipTypesController do
221
221
  describe "with invalid params" do
222
222
  it "assigns a newly created but unsaved manifestation_relationship_type as @manifestation_relationship_type" do
223
223
  post :create, :manifestation_relationship_type => @invalid_attrs
224
- expect(assigns(:manifestation_relationship_type)).not_to be_valid
224
+ expect(assigns(:manifestation_relationship_type)).to be_nil
225
225
  end
226
226
 
227
227
  it "should be forbidden" do
@@ -237,7 +237,7 @@ describe ManifestationRelationshipTypesController do
237
237
  describe "with valid params" do
238
238
  it "assigns a newly created manifestation_relationship_type as @manifestation_relationship_type" do
239
239
  post :create, :manifestation_relationship_type => @attrs
240
- expect(assigns(:manifestation_relationship_type)).to be_valid
240
+ expect(assigns(:manifestation_relationship_type)).to be_nil
241
241
  end
242
242
 
243
243
  it "should be forbidden" do
@@ -249,7 +249,7 @@ describe ManifestationRelationshipTypesController do
249
249
  describe "with invalid params" do
250
250
  it "assigns a newly created but unsaved manifestation_relationship_type as @manifestation_relationship_type" do
251
251
  post :create, :manifestation_relationship_type => @invalid_attrs
252
- expect(assigns(:manifestation_relationship_type)).not_to be_valid
252
+ expect(assigns(:manifestation_relationship_type)).to be_nil
253
253
  end
254
254
 
255
255
  it "should be forbidden" do
@@ -263,7 +263,7 @@ describe ManifestationRelationshipTypesController do
263
263
  describe "with valid params" do
264
264
  it "assigns a newly created manifestation_relationship_type as @manifestation_relationship_type" do
265
265
  post :create, :manifestation_relationship_type => @attrs
266
- expect(assigns(:manifestation_relationship_type)).to be_valid
266
+ expect(assigns(:manifestation_relationship_type)).to be_nil
267
267
  end
268
268
 
269
269
  it "should be forbidden" do
@@ -275,7 +275,7 @@ describe ManifestationRelationshipTypesController do
275
275
  describe "with invalid params" do
276
276
  it "assigns a newly created but unsaved manifestation_relationship_type as @manifestation_relationship_type" do
277
277
  post :create, :manifestation_relationship_type => @invalid_attrs
278
- expect(assigns(:manifestation_relationship_type)).not_to be_valid
278
+ expect(assigns(:manifestation_relationship_type)).to be_nil
279
279
  end
280
280
 
281
281
  it "should be forbidden" do
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'sunspot/rails/spec_helper'
3
3
 
4
4
  describe ManifestationRelationshipsController do
@@ -95,7 +95,7 @@ describe ManifestationRelationshipsController do
95
95
 
96
96
  it "assigns the requested manifestation_relationship as @manifestation_relationship" do
97
97
  get :new
98
- expect(assigns(:manifestation_relationship)).not_to be_valid
98
+ expect(assigns(:manifestation_relationship)).to be_nil
99
99
  expect(response).to redirect_to manifestations_url
100
100
  end
101
101
  end
@@ -105,7 +105,7 @@ describe ManifestationRelationshipsController do
105
105
 
106
106
  it "should not assign the requested manifestation_relationship as @manifestation_relationship" do
107
107
  get :new
108
- expect(assigns(:manifestation_relationship)).not_to be_valid
108
+ expect(assigns(:manifestation_relationship)).to be_nil
109
109
  expect(response).to redirect_to manifestations_url
110
110
  end
111
111
  end
@@ -115,7 +115,7 @@ describe ManifestationRelationshipsController do
115
115
 
116
116
  it "should not assign the requested manifestation_relationship as @manifestation_relationship" do
117
117
  get :new
118
- expect(assigns(:manifestation_relationship)).not_to be_valid
118
+ expect(assigns(:manifestation_relationship)).to be_nil
119
119
  expect(response).to be_forbidden
120
120
  end
121
121
  end
@@ -123,7 +123,7 @@ describe ManifestationRelationshipsController do
123
123
  describe "When not logged in" do
124
124
  it "should not assign the requested manifestation_relationship as @manifestation_relationship" do
125
125
  get :new
126
- expect(assigns(:manifestation_relationship)).not_to be_valid
126
+ expect(assigns(:manifestation_relationship)).to be_nil
127
127
  expect(response).to redirect_to(new_user_session_url)
128
128
  end
129
129
  end
@@ -237,7 +237,7 @@ describe ManifestationRelationshipsController do
237
237
  describe "with valid params" do
238
238
  it "assigns a newly created manifestation_relationship as @manifestation_relationship" do
239
239
  post :create, :manifestation_relationship => @attrs
240
- expect(assigns(:manifestation_relationship)).to be_valid
240
+ expect(assigns(:manifestation_relationship)).to be_nil
241
241
  end
242
242
 
243
243
  it "should be forbidden" do
@@ -249,7 +249,7 @@ describe ManifestationRelationshipsController do
249
249
  describe "with invalid params" do
250
250
  it "assigns a newly created but unsaved manifestation_relationship as @manifestation_relationship" do
251
251
  post :create, :manifestation_relationship => @invalid_attrs
252
- expect(assigns(:manifestation_relationship)).not_to be_valid
252
+ expect(assigns(:manifestation_relationship)).to be_nil
253
253
  end
254
254
 
255
255
  it "should be forbidden" do
@@ -263,7 +263,7 @@ describe ManifestationRelationshipsController do
263
263
  describe "with valid params" do
264
264
  it "assigns a newly created manifestation_relationship as @manifestation_relationship" do
265
265
  post :create, :manifestation_relationship => @attrs
266
- expect(assigns(:manifestation_relationship)).to be_valid
266
+ expect(assigns(:manifestation_relationship)).to be_nil
267
267
  end
268
268
 
269
269
  it "should be forbidden" do
@@ -275,7 +275,7 @@ describe ManifestationRelationshipsController do
275
275
  describe "with invalid params" do
276
276
  it "assigns a newly created but unsaved manifestation_relationship as @manifestation_relationship" do
277
277
  post :create, :manifestation_relationship => @invalid_attrs
278
- expect(assigns(:manifestation_relationship)).not_to be_valid
278
+ expect(assigns(:manifestation_relationship)).to be_nil
279
279
  end
280
280
 
281
281
  it "should be forbidden" do