enju_subject 0.2.3 → 0.3.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +4 -4
- data/app/models/classification.rb +1 -1
- data/app/models/subject.rb +1 -1
- data/app/views/subjects/index.rss.builder +3 -3
- data/db/migrate/029_create_subjects.rb +1 -1
- data/db/migrate/142_create_classifications.rb +3 -3
- data/db/migrate/144_create_classification_types.rb +2 -2
- data/db/migrate/145_create_subject_heading_types.rb +2 -2
- data/db/migrate/146_create_subject_types.rb +2 -2
- data/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb +1 -1
- data/db/migrate/20120406020752_add_url_to_subject.rb +1 -1
- data/db/migrate/20130504133816_add_manifestation_id_to_subject.rb +1 -1
- data/db/migrate/20130504143515_add_manifestation_id_to_classification.rb +1 -1
- data/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb +1 -1
- data/db/migrate/20150923173139_add_url_to_classification.rb +1 -1
- data/db/migrate/20150925092505_add_label_to_classification.rb +1 -1
- data/lib/enju_subject/version.rb +1 -1
- data/lib/tasks/enju_subject_tasks.rake +1 -1
- data/spec/controllers/classification_types_controller_spec.rb +45 -45
- data/spec/controllers/classifications_controller_spec.rb +45 -45
- data/spec/controllers/subject_heading_types_controller_spec.rb +45 -45
- data/spec/controllers/subject_types_controller_spec.rb +45 -45
- data/spec/controllers/subjects_controller_spec.rb +44 -44
- data/spec/dummy/app/helpers/application_helper.rb +1 -19
- data/spec/dummy/app/models/user.rb +1 -1
- data/spec/dummy/bin/rails +1 -1
- data/spec/dummy/bin/setup +21 -12
- data/spec/dummy/bin/update +29 -0
- data/spec/dummy/bin/yarn +11 -0
- data/spec/dummy/config/application.rb +6 -16
- data/spec/dummy/config/cable.yml +10 -0
- data/spec/dummy/config/environment.rb +4 -4
- data/spec/dummy/config/environments/test.rb +1 -1
- data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
- data/spec/dummy/config/initializers/assets.rb +14 -0
- data/spec/dummy/config/initializers/cookies_serializer.rb +5 -0
- data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
- data/spec/dummy/config/puma.rb +56 -0
- data/spec/dummy/config/secrets.yml +32 -0
- data/spec/dummy/config/spring.rb +6 -0
- data/spec/dummy/config/sunspot.yml +23 -0
- data/spec/dummy/db/migrate/001_create_agents.rb +7 -7
- data/spec/dummy/db/migrate/002_devise_create_users.rb +6 -6
- data/spec/dummy/db/migrate/005_create_manifestations.rb +10 -10
- data/spec/dummy/db/migrate/006_create_items.rb +6 -6
- data/spec/dummy/db/migrate/012_create_owns.rb +3 -3
- data/spec/dummy/db/migrate/015_create_creates.rb +3 -3
- data/spec/dummy/db/migrate/041_create_roles.rb +3 -3
- data/spec/dummy/db/migrate/047_create_produces.rb +3 -3
- data/spec/dummy/db/migrate/059_create_libraries.rb +8 -8
- data/spec/dummy/db/migrate/069_create_shelves.rb +4 -4
- data/spec/dummy/db/migrate/073_create_carrier_types.rb +2 -2
- data/spec/dummy/db/migrate/077_create_user_groups.rb +2 -2
- data/spec/dummy/db/migrate/080_create_library_groups.rb +3 -3
- data/spec/dummy/db/migrate/112_create_frequencies.rb +2 -2
- data/spec/dummy/db/migrate/117_create_form_of_works.rb +2 -2
- data/spec/dummy/db/migrate/120_create_baskets.rb +2 -2
- data/spec/dummy/db/migrate/124_create_bookstores.rb +2 -2
- data/spec/dummy/db/migrate/125_create_donates.rb +3 -3
- data/spec/dummy/db/migrate/130_create_request_status_types.rb +2 -2
- data/spec/dummy/db/migrate/131_create_request_types.rb +2 -2
- data/spec/dummy/db/migrate/133_create_agent_merges.rb +2 -2
- data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
- data/spec/dummy/db/migrate/149_create_message_templates.rb +6 -6
- data/spec/dummy/db/migrate/154_create_messages.rb +3 -3
- data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +1 -1
- data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +3 -3
- data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +4 -4
- data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +2 -2
- data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +3 -3
- data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +5 -5
- data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +6 -6
- data/spec/dummy/db/migrate/20081025083323_create_countries.rb +5 -5
- data/spec/dummy/db/migrate/20081025083905_create_languages.rb +6 -6
- data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +2 -2
- data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20090719201843_create_extents.rb +2 -2
- data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +2 -2
- data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +2 -2
- data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +2 -2
- data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
- data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +2 -2
- data/spec/dummy/db/migrate/20091202124834_create_versions.rb +4 -4
- data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
- data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +1 -1
- data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
- data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
- data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +1 -1
- data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb +1 -1
- data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
- data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +2 -2
- data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
- data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
- data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +2 -2
- data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
- data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +2 -2
- data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
- data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
- data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +1 -1
- data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
- data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
- data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
- data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
- data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
- data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +1 -1
- data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
- data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +2 -2
- data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +1 -1
- data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +2 -2
- data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +4 -4
- data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
- data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
- data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +3 -3
- data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +1 -1
- data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +2 -2
- data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +1 -1
- data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +1 -1
- data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
- data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
- data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -1
- data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +1 -1
- data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
- data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
- data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
- data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +1 -1
- data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +1 -1
- data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb +1 -1
- data/spec/dummy/db/schema.rb +645 -694
- data/spec/factories/profile.rb +1 -1
- data/spec/rails_helper.rb +1 -14
- data/spec/requests/subjects_spec.rb +1 -1
- data/spec/routing/subject_heading_types_routing_spec.rb +7 -7
- data/spec/routing/subject_types_routing_spec.rb +7 -7
- data/spec/routing/subjects_routing_spec.rb +7 -7
- metadata +37 -32
- data/lib/enju_subject/expire_editable_fragment.rb +0 -56
- data/lib/enju_subject/master_model.rb +0 -41
- data/lib/enju_subject/page_sweeper.rb +0 -45
@@ -57,7 +57,7 @@ describe SubjectTypesController do
|
|
57
57
|
|
58
58
|
it 'assigns the requested subject_type as @subject_type' do
|
59
59
|
subject_type = FactoryBot.create(:subject_type)
|
60
|
-
get :show, id: subject_type.id
|
60
|
+
get :show, params: { id: subject_type.id }
|
61
61
|
expect(assigns(:subject_type)).to eq(subject_type)
|
62
62
|
end
|
63
63
|
end
|
@@ -67,7 +67,7 @@ describe SubjectTypesController do
|
|
67
67
|
|
68
68
|
it 'assigns the requested subject_type as @subject_type' do
|
69
69
|
subject_type = FactoryBot.create(:subject_type)
|
70
|
-
get :show, id: subject_type.id
|
70
|
+
get :show, params: { id: subject_type.id }
|
71
71
|
expect(assigns(:subject_type)).to eq(subject_type)
|
72
72
|
end
|
73
73
|
end
|
@@ -77,7 +77,7 @@ describe SubjectTypesController do
|
|
77
77
|
|
78
78
|
it 'assigns the requested subject_type as @subject_type' do
|
79
79
|
subject_type = FactoryBot.create(:subject_type)
|
80
|
-
get :show, id: subject_type.id
|
80
|
+
get :show, params: { id: subject_type.id }
|
81
81
|
expect(assigns(:subject_type)).to eq(subject_type)
|
82
82
|
end
|
83
83
|
end
|
@@ -85,7 +85,7 @@ describe SubjectTypesController do
|
|
85
85
|
describe 'When not logged in' do
|
86
86
|
it 'assigns the requested subject_type as @subject_type' do
|
87
87
|
subject_type = FactoryBot.create(:subject_type)
|
88
|
-
get :show, id: subject_type.id
|
88
|
+
get :show, params: { id: subject_type.id }
|
89
89
|
expect(assigns(:subject_type)).to eq(subject_type)
|
90
90
|
end
|
91
91
|
end
|
@@ -137,7 +137,7 @@ describe SubjectTypesController do
|
|
137
137
|
|
138
138
|
it 'assigns the requested subject_type as @subject_type' do
|
139
139
|
subject_type = FactoryBot.create(:subject_type)
|
140
|
-
get :edit, id: subject_type.id
|
140
|
+
get :edit, params: { id: subject_type.id }
|
141
141
|
expect(assigns(:subject_type)).to eq(subject_type)
|
142
142
|
end
|
143
143
|
end
|
@@ -147,7 +147,7 @@ describe SubjectTypesController do
|
|
147
147
|
|
148
148
|
it 'assigns the requested subject_type as @subject_type' do
|
149
149
|
subject_type = FactoryBot.create(:subject_type)
|
150
|
-
get :edit, id: subject_type.id
|
150
|
+
get :edit, params: { id: subject_type.id }
|
151
151
|
response.should be_forbidden
|
152
152
|
end
|
153
153
|
end
|
@@ -157,7 +157,7 @@ describe SubjectTypesController do
|
|
157
157
|
|
158
158
|
it 'assigns the requested subject_type as @subject_type' do
|
159
159
|
subject_type = FactoryBot.create(:subject_type)
|
160
|
-
get :edit, id: subject_type.id
|
160
|
+
get :edit, params: { id: subject_type.id }
|
161
161
|
response.should be_forbidden
|
162
162
|
end
|
163
163
|
end
|
@@ -165,7 +165,7 @@ describe SubjectTypesController do
|
|
165
165
|
describe 'When not logged in' do
|
166
166
|
it 'should not assign the requested subject_type as @subject_type' do
|
167
167
|
subject_type = FactoryBot.create(:subject_type)
|
168
|
-
get :edit, id: subject_type.id
|
168
|
+
get :edit, params: { id: subject_type.id }
|
169
169
|
response.should redirect_to(new_user_session_url)
|
170
170
|
end
|
171
171
|
end
|
@@ -182,24 +182,24 @@ describe SubjectTypesController do
|
|
182
182
|
|
183
183
|
describe 'with valid params' do
|
184
184
|
it 'assigns a newly created subject_type as @subject_type' do
|
185
|
-
post :create, subject_type: @attrs
|
185
|
+
post :create, params: { subject_type: @attrs }
|
186
186
|
expect(assigns(:subject_type)).to be_valid
|
187
187
|
end
|
188
188
|
|
189
189
|
it 'redirects to the created agent' do
|
190
|
-
post :create, subject_type: @attrs
|
190
|
+
post :create, params: { subject_type: @attrs }
|
191
191
|
response.should redirect_to(assigns(:subject_type))
|
192
192
|
end
|
193
193
|
end
|
194
194
|
|
195
195
|
describe 'with invalid params' do
|
196
196
|
it 'assigns a newly created but unsaved subject_type as @subject_type' do
|
197
|
-
post :create, subject_type: @invalid_attrs
|
197
|
+
post :create, params: { subject_type: @invalid_attrs }
|
198
198
|
expect(assigns(:subject_type)).not_to be_valid
|
199
199
|
end
|
200
200
|
|
201
201
|
it 'should be successful' do
|
202
|
-
post :create, subject_type: @invalid_attrs
|
202
|
+
post :create, params: { subject_type: @invalid_attrs }
|
203
203
|
response.should be_success
|
204
204
|
end
|
205
205
|
end
|
@@ -210,24 +210,24 @@ describe SubjectTypesController do
|
|
210
210
|
|
211
211
|
describe 'with valid params' do
|
212
212
|
it 'assigns a newly created subject_type as @subject_type' do
|
213
|
-
post :create, subject_type: @attrs
|
213
|
+
post :create, params: { subject_type: @attrs }
|
214
214
|
expect(assigns(:subject_type)).to be_nil
|
215
215
|
end
|
216
216
|
|
217
217
|
it 'should be forbidden' do
|
218
|
-
post :create, subject_type: @attrs
|
218
|
+
post :create, params: { subject_type: @attrs }
|
219
219
|
response.should be_forbidden
|
220
220
|
end
|
221
221
|
end
|
222
222
|
|
223
223
|
describe 'with invalid params' do
|
224
224
|
it 'assigns a newly created but unsaved subject_type as @subject_type' do
|
225
|
-
post :create, subject_type: @invalid_attrs
|
225
|
+
post :create, params: { subject_type: @invalid_attrs }
|
226
226
|
expect(assigns(:subject_type)).to be_nil
|
227
227
|
end
|
228
228
|
|
229
229
|
it 'should be forbidden' do
|
230
|
-
post :create, subject_type: @invalid_attrs
|
230
|
+
post :create, params: { subject_type: @invalid_attrs }
|
231
231
|
response.should be_forbidden
|
232
232
|
end
|
233
233
|
end
|
@@ -238,24 +238,24 @@ describe SubjectTypesController do
|
|
238
238
|
|
239
239
|
describe 'with valid params' do
|
240
240
|
it 'assigns a newly created subject_type as @subject_type' do
|
241
|
-
post :create, subject_type: @attrs
|
241
|
+
post :create, params: { subject_type: @attrs }
|
242
242
|
expect(assigns(:subject_type)).to be_nil
|
243
243
|
end
|
244
244
|
|
245
245
|
it 'should be forbidden' do
|
246
|
-
post :create, subject_type: @attrs
|
246
|
+
post :create, params: { subject_type: @attrs }
|
247
247
|
response.should be_forbidden
|
248
248
|
end
|
249
249
|
end
|
250
250
|
|
251
251
|
describe 'with invalid params' do
|
252
252
|
it 'assigns a newly created but unsaved subject_type as @subject_type' do
|
253
|
-
post :create, subject_type: @invalid_attrs
|
253
|
+
post :create, params: { subject_type: @invalid_attrs }
|
254
254
|
expect(assigns(:subject_type)).to be_nil
|
255
255
|
end
|
256
256
|
|
257
257
|
it 'should be forbidden' do
|
258
|
-
post :create, subject_type: @invalid_attrs
|
258
|
+
post :create, params: { subject_type: @invalid_attrs }
|
259
259
|
response.should be_forbidden
|
260
260
|
end
|
261
261
|
end
|
@@ -264,24 +264,24 @@ describe SubjectTypesController do
|
|
264
264
|
describe 'When not logged in' do
|
265
265
|
describe 'with valid params' do
|
266
266
|
it 'assigns a newly created subject_type as @subject_type' do
|
267
|
-
post :create, subject_type: @attrs
|
267
|
+
post :create, params: { subject_type: @attrs }
|
268
268
|
expect(assigns(:subject_type)).to be_nil
|
269
269
|
end
|
270
270
|
|
271
271
|
it 'should be forbidden' do
|
272
|
-
post :create, subject_type: @attrs
|
272
|
+
post :create, params: { subject_type: @attrs }
|
273
273
|
response.should redirect_to(new_user_session_url)
|
274
274
|
end
|
275
275
|
end
|
276
276
|
|
277
277
|
describe 'with invalid params' do
|
278
278
|
it 'assigns a newly created but unsaved subject_type as @subject_type' do
|
279
|
-
post :create, subject_type: @invalid_attrs
|
279
|
+
post :create, params: { subject_type: @invalid_attrs }
|
280
280
|
expect(assigns(:subject_type)).to be_nil
|
281
281
|
end
|
282
282
|
|
283
283
|
it 'should be forbidden' do
|
284
|
-
post :create, subject_type: @invalid_attrs
|
284
|
+
post :create, params: { subject_type: @invalid_attrs }
|
285
285
|
response.should redirect_to(new_user_session_url)
|
286
286
|
end
|
287
287
|
end
|
@@ -300,23 +300,23 @@ describe SubjectTypesController do
|
|
300
300
|
|
301
301
|
describe 'with valid params' do
|
302
302
|
it 'updates the requested subject_type' do
|
303
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
303
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
304
304
|
end
|
305
305
|
|
306
306
|
it 'assigns the requested subject_type as @subject_type' do
|
307
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
307
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
308
308
|
expect(assigns(:subject_type)).to eq(@subject_type)
|
309
309
|
end
|
310
310
|
|
311
311
|
it 'moves its position when specified' do
|
312
|
-
put :update, id: @subject_type.id, subject_type: @attrs, move: 'lower'
|
312
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs, move: 'lower' }
|
313
313
|
response.should redirect_to(subject_types_url)
|
314
314
|
end
|
315
315
|
end
|
316
316
|
|
317
317
|
describe 'with invalid params' do
|
318
318
|
it 'assigns the requested subject_type as @subject_type' do
|
319
|
-
put :update, id: @subject_type.id, subject_type: @invalid_attrs
|
319
|
+
put :update, params: { id: @subject_type.id, subject_type: @invalid_attrs }
|
320
320
|
response.should render_template('edit')
|
321
321
|
end
|
322
322
|
end
|
@@ -327,11 +327,11 @@ describe SubjectTypesController do
|
|
327
327
|
|
328
328
|
describe 'with valid params' do
|
329
329
|
it 'updates the requested subject_type' do
|
330
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
330
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
331
331
|
end
|
332
332
|
|
333
333
|
it 'assigns the requested subject_type as @subject_type' do
|
334
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
334
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
335
335
|
expect(assigns(:subject_type)).to eq(@subject_type)
|
336
336
|
response.should be_forbidden
|
337
337
|
end
|
@@ -339,7 +339,7 @@ describe SubjectTypesController do
|
|
339
339
|
|
340
340
|
describe 'with invalid params' do
|
341
341
|
it 'assigns the requested subject_type as @subject_type' do
|
342
|
-
put :update, id: @subject_type.id, subject_type: @invalid_attrs
|
342
|
+
put :update, params: { id: @subject_type.id, subject_type: @invalid_attrs }
|
343
343
|
response.should be_forbidden
|
344
344
|
end
|
345
345
|
end
|
@@ -350,11 +350,11 @@ describe SubjectTypesController do
|
|
350
350
|
|
351
351
|
describe 'with valid params' do
|
352
352
|
it 'updates the requested subject_type' do
|
353
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
353
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
354
354
|
end
|
355
355
|
|
356
356
|
it 'assigns the requested subject_type as @subject_type' do
|
357
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
357
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
358
358
|
expect(assigns(:subject_type)).to eq(@subject_type)
|
359
359
|
response.should be_forbidden
|
360
360
|
end
|
@@ -362,7 +362,7 @@ describe SubjectTypesController do
|
|
362
362
|
|
363
363
|
describe 'with invalid params' do
|
364
364
|
it 'assigns the requested subject_type as @subject_type' do
|
365
|
-
put :update, id: @subject_type.id, subject_type: @invalid_attrs
|
365
|
+
put :update, params: { id: @subject_type.id, subject_type: @invalid_attrs }
|
366
366
|
response.should be_forbidden
|
367
367
|
end
|
368
368
|
end
|
@@ -371,18 +371,18 @@ describe SubjectTypesController do
|
|
371
371
|
describe 'When not logged in' do
|
372
372
|
describe 'with valid params' do
|
373
373
|
it 'updates the requested subject_type' do
|
374
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
374
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
375
375
|
end
|
376
376
|
|
377
377
|
it 'should be forbidden' do
|
378
|
-
put :update, id: @subject_type.id, subject_type: @attrs
|
378
|
+
put :update, params: { id: @subject_type.id, subject_type: @attrs }
|
379
379
|
response.should redirect_to(new_user_session_url)
|
380
380
|
end
|
381
381
|
end
|
382
382
|
|
383
383
|
describe 'with invalid params' do
|
384
384
|
it 'assigns the requested subject_type as @subject_type' do
|
385
|
-
put :update, id: @subject_type.id, subject_type: @invalid_attrs
|
385
|
+
put :update, params: { id: @subject_type.id, subject_type: @invalid_attrs }
|
386
386
|
response.should redirect_to(new_user_session_url)
|
387
387
|
end
|
388
388
|
end
|
@@ -398,11 +398,11 @@ describe SubjectTypesController do
|
|
398
398
|
login_admin
|
399
399
|
|
400
400
|
it 'destroys the requested subject_type' do
|
401
|
-
delete :destroy, id: @subject_type.id
|
401
|
+
delete :destroy, params: { id: @subject_type.id }
|
402
402
|
end
|
403
403
|
|
404
404
|
it 'redirects to the subject_types list' do
|
405
|
-
delete :destroy, id: @subject_type.id
|
405
|
+
delete :destroy, params: { id: @subject_type.id }
|
406
406
|
response.should redirect_to(subject_types_url)
|
407
407
|
end
|
408
408
|
end
|
@@ -411,11 +411,11 @@ describe SubjectTypesController do
|
|
411
411
|
login_librarian
|
412
412
|
|
413
413
|
it 'destroys the requested subject_type' do
|
414
|
-
delete :destroy, id: @subject_type.id
|
414
|
+
delete :destroy, params: { id: @subject_type.id }
|
415
415
|
end
|
416
416
|
|
417
417
|
it 'should be forbidden' do
|
418
|
-
delete :destroy, id: @subject_type.id
|
418
|
+
delete :destroy, params: { id: @subject_type.id }
|
419
419
|
response.should be_forbidden
|
420
420
|
end
|
421
421
|
end
|
@@ -424,22 +424,22 @@ describe SubjectTypesController do
|
|
424
424
|
login_user
|
425
425
|
|
426
426
|
it 'destroys the requested subject_type' do
|
427
|
-
delete :destroy, id: @subject_type.id
|
427
|
+
delete :destroy, params: { id: @subject_type.id }
|
428
428
|
end
|
429
429
|
|
430
430
|
it 'should be forbidden' do
|
431
|
-
delete :destroy, id: @subject_type.id
|
431
|
+
delete :destroy, params: { id: @subject_type.id }
|
432
432
|
response.should be_forbidden
|
433
433
|
end
|
434
434
|
end
|
435
435
|
|
436
436
|
describe 'When not logged in' do
|
437
437
|
it 'destroys the requested subject_type' do
|
438
|
-
delete :destroy, id: @subject_type.id
|
438
|
+
delete :destroy, params: { id: @subject_type.id }
|
439
439
|
end
|
440
440
|
|
441
441
|
it 'should be forbidden' do
|
442
|
-
delete :destroy, id: @subject_type.id
|
442
|
+
delete :destroy, params: { id: @subject_type.id }
|
443
443
|
response.should redirect_to(new_user_session_url)
|
444
444
|
end
|
445
445
|
end
|
@@ -54,7 +54,7 @@ describe SubjectsController do
|
|
54
54
|
|
55
55
|
it 'assigns the requested subject as @subject' do
|
56
56
|
subject = FactoryBot.create(:subject)
|
57
|
-
get :show, id: subject.id
|
57
|
+
get :show, params: { id: subject.id }
|
58
58
|
expect(assigns(:subject)).to eq(subject)
|
59
59
|
end
|
60
60
|
end
|
@@ -64,7 +64,7 @@ describe SubjectsController do
|
|
64
64
|
|
65
65
|
it 'assigns the requested subject as @subject' do
|
66
66
|
subject = FactoryBot.create(:subject)
|
67
|
-
get :show, id: subject.id
|
67
|
+
get :show, params: { id: subject.id }
|
68
68
|
expect(assigns(:subject)).to eq(subject)
|
69
69
|
end
|
70
70
|
end
|
@@ -74,7 +74,7 @@ describe SubjectsController do
|
|
74
74
|
|
75
75
|
it 'assigns the requested subject as @subject' do
|
76
76
|
subject = FactoryBot.create(:subject)
|
77
|
-
get :show, id: subject.id
|
77
|
+
get :show, params: { id: subject.id }
|
78
78
|
expect(assigns(:subject)).to eq(subject)
|
79
79
|
end
|
80
80
|
end
|
@@ -82,7 +82,7 @@ describe SubjectsController do
|
|
82
82
|
describe 'When not logged in' do
|
83
83
|
it 'assigns the requested subject as @subject' do
|
84
84
|
subject = FactoryBot.create(:subject)
|
85
|
-
get :show, id: subject.id
|
85
|
+
get :show, params: { id: subject.id }
|
86
86
|
expect(assigns(:subject)).to eq(subject)
|
87
87
|
end
|
88
88
|
end
|
@@ -132,7 +132,7 @@ describe SubjectsController do
|
|
132
132
|
|
133
133
|
it 'assigns the requested subject as @subject' do
|
134
134
|
subject = FactoryBot.create(:subject)
|
135
|
-
get :edit, id: subject.id
|
135
|
+
get :edit, params: { id: subject.id }
|
136
136
|
expect(assigns(:subject)).to eq(subject)
|
137
137
|
end
|
138
138
|
end
|
@@ -142,7 +142,7 @@ describe SubjectsController do
|
|
142
142
|
|
143
143
|
it 'assigns the requested subject as @subject' do
|
144
144
|
subject = FactoryBot.create(:subject)
|
145
|
-
get :edit, id: subject.id
|
145
|
+
get :edit, params: { id: subject.id }
|
146
146
|
expect(assigns(:subject)).to eq(subject)
|
147
147
|
end
|
148
148
|
end
|
@@ -152,7 +152,7 @@ describe SubjectsController do
|
|
152
152
|
|
153
153
|
it 'assigns the requested subject as @subject' do
|
154
154
|
subject = FactoryBot.create(:subject)
|
155
|
-
get :edit, id: subject.id
|
155
|
+
get :edit, params: { id: subject.id }
|
156
156
|
response.should be_forbidden
|
157
157
|
end
|
158
158
|
end
|
@@ -160,7 +160,7 @@ describe SubjectsController do
|
|
160
160
|
describe 'When not logged in' do
|
161
161
|
it 'should not assign the requested subject as @subject' do
|
162
162
|
subject = FactoryBot.create(:subject)
|
163
|
-
get :edit, id: subject.id
|
163
|
+
get :edit, params: { id: subject.id }
|
164
164
|
response.should redirect_to(new_user_session_url)
|
165
165
|
end
|
166
166
|
end
|
@@ -177,24 +177,24 @@ describe SubjectsController do
|
|
177
177
|
|
178
178
|
describe 'with valid params' do
|
179
179
|
it 'assigns a newly created subject as @subject' do
|
180
|
-
post :create, subject: @attrs
|
180
|
+
post :create, params: { subject: @attrs }
|
181
181
|
expect(assigns(:subject)).to be_valid
|
182
182
|
end
|
183
183
|
|
184
184
|
it 'redirects to the created subject' do
|
185
|
-
post :create, subject: @attrs
|
185
|
+
post :create, params: { subject: @attrs }
|
186
186
|
response.should redirect_to(subject_url(assigns(:subject)))
|
187
187
|
end
|
188
188
|
end
|
189
189
|
|
190
190
|
describe 'with invalid params' do
|
191
191
|
it 'assigns a newly created but unsaved subject as @subject' do
|
192
|
-
post :create, subject: @invalid_attrs
|
192
|
+
post :create, params: { subject: @invalid_attrs }
|
193
193
|
expect(assigns(:subject)).not_to be_valid
|
194
194
|
end
|
195
195
|
|
196
196
|
it "re-renders the 'new' template" do
|
197
|
-
post :create, subject: @invalid_attrs
|
197
|
+
post :create, params: { subject: @invalid_attrs }
|
198
198
|
response.should render_template('new')
|
199
199
|
end
|
200
200
|
end
|
@@ -205,24 +205,24 @@ describe SubjectsController do
|
|
205
205
|
|
206
206
|
describe 'with valid params' do
|
207
207
|
it 'assigns a newly created subject as @subject' do
|
208
|
-
post :create, subject: @attrs
|
208
|
+
post :create, params: { subject: @attrs }
|
209
209
|
expect(assigns(:subject)).to be_nil
|
210
210
|
end
|
211
211
|
|
212
212
|
it 'should be forbidden' do
|
213
|
-
post :create, subject: @attrs
|
213
|
+
post :create, params: { subject: @attrs }
|
214
214
|
response.should be_forbidden
|
215
215
|
end
|
216
216
|
end
|
217
217
|
|
218
218
|
describe 'with invalid params' do
|
219
219
|
it 'assigns a newly created but unsaved subject as @subject' do
|
220
|
-
post :create, subject: @invalid_attrs
|
220
|
+
post :create, params: { subject: @invalid_attrs }
|
221
221
|
expect(assigns(:subject)).to be_nil
|
222
222
|
end
|
223
223
|
|
224
224
|
it 'should be forbidden' do
|
225
|
-
post :create, subject: @invalid_attrs
|
225
|
+
post :create, params: { subject: @invalid_attrs }
|
226
226
|
response.should be_forbidden
|
227
227
|
end
|
228
228
|
end
|
@@ -233,24 +233,24 @@ describe SubjectsController do
|
|
233
233
|
|
234
234
|
describe 'with valid params' do
|
235
235
|
it 'assigns a newly created subject as @subject' do
|
236
|
-
post :create, subject: @attrs
|
236
|
+
post :create, params: { subject: @attrs }
|
237
237
|
expect(assigns(:subject)).to be_nil
|
238
238
|
end
|
239
239
|
|
240
240
|
it 'should be forbidden' do
|
241
|
-
post :create, subject: @attrs
|
241
|
+
post :create, params: { subject: @attrs }
|
242
242
|
response.should be_forbidden
|
243
243
|
end
|
244
244
|
end
|
245
245
|
|
246
246
|
describe 'with invalid params' do
|
247
247
|
it 'assigns a newly created but unsaved subject as @subject' do
|
248
|
-
post :create, subject: @invalid_attrs
|
248
|
+
post :create, params: { subject: @invalid_attrs }
|
249
249
|
expect(assigns(:subject)).to be_nil
|
250
250
|
end
|
251
251
|
|
252
252
|
it 'should be forbidden' do
|
253
|
-
post :create, subject: @invalid_attrs
|
253
|
+
post :create, params: { subject: @invalid_attrs }
|
254
254
|
response.should be_forbidden
|
255
255
|
end
|
256
256
|
end
|
@@ -259,24 +259,24 @@ describe SubjectsController do
|
|
259
259
|
describe 'When not logged in' do
|
260
260
|
describe 'with valid params' do
|
261
261
|
it 'assigns a newly created subject as @subject' do
|
262
|
-
post :create, subject: @attrs
|
262
|
+
post :create, params: { subject: @attrs }
|
263
263
|
expect(assigns(:subject)).to be_nil
|
264
264
|
end
|
265
265
|
|
266
266
|
it 'should be forbidden' do
|
267
|
-
post :create, subject: @attrs
|
267
|
+
post :create, params: { subject: @attrs }
|
268
268
|
response.should redirect_to(new_user_session_url)
|
269
269
|
end
|
270
270
|
end
|
271
271
|
|
272
272
|
describe 'with invalid params' do
|
273
273
|
it 'assigns a newly created but unsaved subject as @subject' do
|
274
|
-
post :create, subject: @invalid_attrs
|
274
|
+
post :create, params: { subject: @invalid_attrs }
|
275
275
|
expect(assigns(:subject)).to be_nil
|
276
276
|
end
|
277
277
|
|
278
278
|
it 'should be forbidden' do
|
279
|
-
post :create, subject: @invalid_attrs
|
279
|
+
post :create, params: { subject: @invalid_attrs }
|
280
280
|
response.should redirect_to(new_user_session_url)
|
281
281
|
end
|
282
282
|
end
|
@@ -295,18 +295,18 @@ describe SubjectsController do
|
|
295
295
|
|
296
296
|
describe 'with valid params' do
|
297
297
|
it 'updates the requested subject' do
|
298
|
-
put :update, id: @subject.id, subject: @attrs
|
298
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
299
299
|
end
|
300
300
|
|
301
301
|
it 'assigns the requested subject as @subject' do
|
302
|
-
put :update, id: @subject.id, subject: @attrs
|
302
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
303
303
|
expect(assigns(:subject)).to eq(@subject)
|
304
304
|
end
|
305
305
|
end
|
306
306
|
|
307
307
|
describe 'with invalid params' do
|
308
308
|
it 'assigns the requested subject as @subject' do
|
309
|
-
put :update, id: @subject.id, subject: @invalid_attrs
|
309
|
+
put :update, params: { id: @subject.id, subject: @invalid_attrs }
|
310
310
|
response.should render_template('edit')
|
311
311
|
end
|
312
312
|
end
|
@@ -317,11 +317,11 @@ describe SubjectsController do
|
|
317
317
|
|
318
318
|
describe 'with valid params' do
|
319
319
|
it 'updates the requested subject' do
|
320
|
-
put :update, id: @subject.id, subject: @attrs
|
320
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
321
321
|
end
|
322
322
|
|
323
323
|
it 'should be forbidden' do
|
324
|
-
put :update, id: @subject.id, subject: @attrs
|
324
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
325
325
|
expect(assigns(:subject)).to eq(@subject)
|
326
326
|
response.should be_forbidden
|
327
327
|
end
|
@@ -329,7 +329,7 @@ describe SubjectsController do
|
|
329
329
|
|
330
330
|
describe 'with invalid params' do
|
331
331
|
it 'should be forbidden' do
|
332
|
-
put :update, id: @subject, subject: @invalid_attrs
|
332
|
+
put :update, params: { id: @subject, subject: @invalid_attrs }
|
333
333
|
response.should be_forbidden
|
334
334
|
end
|
335
335
|
end
|
@@ -340,11 +340,11 @@ describe SubjectsController do
|
|
340
340
|
|
341
341
|
describe 'with valid params' do
|
342
342
|
it 'updates the requested subject' do
|
343
|
-
put :update, id: @subject.id, subject: @attrs
|
343
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
344
344
|
end
|
345
345
|
|
346
346
|
it 'assigns the requested subject as @subject' do
|
347
|
-
put :update, id: @subject.id, subject: @attrs
|
347
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
348
348
|
expect(assigns(:subject)).to eq(@subject)
|
349
349
|
response.should be_forbidden
|
350
350
|
end
|
@@ -352,7 +352,7 @@ describe SubjectsController do
|
|
352
352
|
|
353
353
|
describe 'with invalid params' do
|
354
354
|
it 'assigns the requested subject as @subject' do
|
355
|
-
put :update, id: @subject.id, subject: @invalid_attrs
|
355
|
+
put :update, params: { id: @subject.id, subject: @invalid_attrs }
|
356
356
|
response.should be_forbidden
|
357
357
|
end
|
358
358
|
end
|
@@ -361,18 +361,18 @@ describe SubjectsController do
|
|
361
361
|
describe 'When not logged in' do
|
362
362
|
describe 'with valid params' do
|
363
363
|
it 'updates the requested subject' do
|
364
|
-
put :update, id: @subject.id, subject: @attrs
|
364
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
365
365
|
end
|
366
366
|
|
367
367
|
it 'should be forbidden' do
|
368
|
-
put :update, id: @subject.id, subject: @attrs
|
368
|
+
put :update, params: { id: @subject.id, subject: @attrs }
|
369
369
|
response.should redirect_to(new_user_session_url)
|
370
370
|
end
|
371
371
|
end
|
372
372
|
|
373
373
|
describe 'with invalid params' do
|
374
374
|
it 'assigns the requested subject as @subject' do
|
375
|
-
put :update, id: @subject.id, subject: @invalid_attrs
|
375
|
+
put :update, params: { id: @subject.id, subject: @invalid_attrs }
|
376
376
|
response.should redirect_to(new_user_session_url)
|
377
377
|
end
|
378
378
|
end
|
@@ -388,11 +388,11 @@ describe SubjectsController do
|
|
388
388
|
login_admin
|
389
389
|
|
390
390
|
it 'destroys the requested subject' do
|
391
|
-
delete :destroy, id: @subject.id
|
391
|
+
delete :destroy, params: { id: @subject.id }
|
392
392
|
end
|
393
393
|
|
394
394
|
it 'redirects to the subjects list' do
|
395
|
-
delete :destroy, id: @subject.id
|
395
|
+
delete :destroy, params: { id: @subject.id }
|
396
396
|
response.should redirect_to(subjects_url)
|
397
397
|
end
|
398
398
|
end
|
@@ -401,11 +401,11 @@ describe SubjectsController do
|
|
401
401
|
login_librarian
|
402
402
|
|
403
403
|
it 'destroys the requested subject' do
|
404
|
-
delete :destroy, id: @subject.id
|
404
|
+
delete :destroy, params: { id: @subject.id }
|
405
405
|
end
|
406
406
|
|
407
407
|
it 'should be forbidden' do
|
408
|
-
delete :destroy, id: @subject.id
|
408
|
+
delete :destroy, params: { id: @subject.id }
|
409
409
|
response.should be_forbidden
|
410
410
|
end
|
411
411
|
end
|
@@ -414,22 +414,22 @@ describe SubjectsController do
|
|
414
414
|
login_user
|
415
415
|
|
416
416
|
it 'destroys the requested subject' do
|
417
|
-
delete :destroy, id: @subject.id
|
417
|
+
delete :destroy, params: { id: @subject.id }
|
418
418
|
end
|
419
419
|
|
420
420
|
it 'should be forbidden' do
|
421
|
-
delete :destroy, id: @subject.id
|
421
|
+
delete :destroy, params: { id: @subject.id }
|
422
422
|
response.should be_forbidden
|
423
423
|
end
|
424
424
|
end
|
425
425
|
|
426
426
|
describe 'When not logged in' do
|
427
427
|
it 'destroys the requested subject' do
|
428
|
-
delete :destroy, id: @subject.id
|
428
|
+
delete :destroy, params: { id: @subject.id }
|
429
429
|
end
|
430
430
|
|
431
431
|
it 'should be forbidden' do
|
432
|
-
delete :destroy, id: @subject.id
|
432
|
+
delete :destroy, params: { id: @subject.id }
|
433
433
|
response.should redirect_to(new_user_session_url)
|
434
434
|
end
|
435
435
|
end
|