curation_concerns 1.4.0 → 1.5.0

data/spec/controllers/curation_concerns/file_sets_controller_json_spec.rb

@@ -15,7 +15,7 @@ describe CurationConcerns::FileSetsController do
 
   context "JSON" do
     let(:resource) { file_set }
-    let(:resource_request) { get :show, id: resource, format: :json }
+    let(:resource_request) { get :show, params: { id: resource, format: :json } }
     let(:actor) { controller.send(:actor) }
     subject { response }
     describe "unauthorized" do
@@ -35,7 +35,7 @@ describe CurationConcerns::FileSetsController do
     end
 
     describe 'not found' do
-      before { get :show, id: "non-existent-pid", format: :json }
+      before { get :show, params: { id: "non-existent-pid", format: :json } }
       # Respond with forbidden to protect against object enumeration attack
       it { is_expected.to respond_forbidden }
     end
@@ -56,7 +56,7 @@ describe CurationConcerns::FileSetsController do
         allow_any_instance_of(FileSet).to receive(:persisted?).and_return(true)
         allow_any_instance_of(FileSet).to receive(:to_param).and_return('999')
 
-        post :create, file_set: { title: ['a title'], files: [file] }, parent_id: parent.id, format: :json
+        post :create, params: { file_set: { title: ['a title'], files: [file] }, parent_id: parent.id, format: :json }
 
         expect(assigns[:file_set]).to be_instance_of ::FileSet # this object is used by the jbuilder template
         expect(controller).to render_template('curation_concerns/file_sets/jq_upload')
@@ -67,24 +67,24 @@ describe CurationConcerns::FileSetsController do
     end
 
     describe 'failed create: no file' do
-      before { post :create, file_set: { title: ["foo"] }, parent_id: parent.id, format: :json }
+      before { post :create, params: { file_set: { title: ["foo"] }, parent_id: parent.id, format: :json } }
       it { is_expected.to respond_bad_request(message: 'Error! No file to save') }
     end
 
     describe 'failed create: bad file' do
-      before { post :create, file_set: { files: ['not a file'] }, parent_id: parent.id, format: :json }
+      before { post :create, params: { file_set: { files: ['not a file'] }, parent_id: parent.id, format: :json } }
       it { is_expected.to respond_bad_request(message: 'Error! No file for upload', description: 'unknown file') }
     end
 
     describe 'failed create: empty file' do
-      before { post :create, file_set: { files: [empty_file] }, parent_id: parent.id, format: :json }
+      before { post :create, params: { file_set: { files: [empty_file] }, parent_id: parent.id, format: :json } }
       it { is_expected.to respond_unprocessable_entity(errors: { files: "#{empty_file.original_filename} has no content! (Zero length file)" }, description: I18n.t('curation_concerns.api.unprocessable_entity.empty_file')) }
     end
 
     describe 'failed create: solr error' do
       before do
         allow(controller).to receive(:process_file).and_raise(RSolr::Error::Http.new(controller.request, response))
-        post :create, file_set: { files: [file] }, parent_id: parent.id, format: :json
+        post :create, params: { file_set: { files: [file] }, parent_id: parent.id, format: :json }
       end
 
       it { is_expected.to respond_internal_error(message: 'Error occurred while creating a FileSet.') }
@@ -112,7 +112,7 @@ describe CurationConcerns::FileSetsController do
         else
           expect(actor).to receive(:update_metadata).with(ActionController::Parameters.new(expected_params).permit!).and_return(true)
         end
-        put :update, id: resource, file_set: { title: ['updated title'] }, format: :json
+        put :update, params: { id: resource, file_set: { title: ['updated title'] }, format: :json }
         expect(assigns[:file_set]).to be_instance_of ::FileSet # this object is used by the jbuilder template
         expect(response.status).to eq 200
         expect(controller).to render_template('curation_concerns/file_sets/show')
@@ -124,7 +124,7 @@ describe CurationConcerns::FileSetsController do
     describe "integration update" do
       render_views
       it "works" do
-        put :update, id: resource.id, file_set: { title: ['test'] }, format: :json
+        put :update, params: { id: resource.id, file_set: { title: ['test'] }, format: :json }
         expect(response.status).to eq 200
       end
     end
@@ -135,7 +135,7 @@ describe CurationConcerns::FileSetsController do
           controller.curation_concern.errors.add(:some_field, "This is not valid. Fix it.")
           false
         end
-        post :update, id: resource, file_set: { title: nil, depositor: nil }, format: :json
+        post :update, params: { id: resource, file_set: { title: nil, depositor: nil }, format: :json }
       }
       it "returns 422 and the errors" do
         expect(response).to respond_unprocessable_entity(errors: { some_field: ["This is not valid. Fix it."] })

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -9,9 +9,7 @@ describe CurationConcerns::FileSetsController do
     before { sign_in user }
 
     describe '#create' do
-      before do
-        FileSet.destroy_all
-      end
+      before { FileSet.destroy_all }
 
       context 'on the happy path' do
         let(:date_today) { DateTime.now }
@@ -39,10 +37,13 @@ describe CurationConcerns::FileSetsController do
             expect(actor).to receive(:create_content).with(ActionDispatch::Http::UploadedFile).and_return(true)
           end
 
-          xhr :post, :create, parent_id: parent,
-                              file_set: { files: [file],
-                                          title: ['test title'],
-                                          visibility: 'restricted' }
+          post :create, xhr: true, params: { parent_id: parent,
+                                             file_set: {
+                                               files: [file],
+                                               title: ['test title'],
+                                               visibility: 'restricted'
+                                             }
+                                           }
           expect(response).to be_success
           expect(flash[:error]).to be_nil
         end
@@ -51,8 +52,11 @@ describe CurationConcerns::FileSetsController do
       context "on something that isn't a file" do
         # Note: This is a duplicate of coverage in file_sets_controller_json_spec.rb
         it 'renders error' do
-          xhr :post, :create, parent_id: parent, file_set: { files: ['hello'] },
-                              permission: { group: { 'public' => 'read' } }, terms_of_service: '1'
+          post :create, xhr: true, params: { parent_id: parent,
+                                             file_set: { files: ['hello'] },
+                                             permission: { group: { 'public' => 'read' } },
+                                             terms_of_service: '1'
+                                            }
           expect(response.status).to eq 400
           msg = JSON.parse(response.body)['message']
           expect(msg).to match(/no file for upload/i)
@@ -82,8 +86,12 @@ describe CurationConcerns::FileSetsController do
         end
 
         it 'errors out of create after on continuous rsolr error' do
-          xhr :post, :create, parent_id: parent, file_set: { files: [file] },
-                              permission: { group: { 'public' => 'read' } }, terms_of_service: '1'
+          post :create, xhr: true, params: {
+            parent_id: parent,
+            file_set: { files: [file] },
+            permission: { group: { 'public' => 'read' } },
+            terms_of_service: '1'
+          }
           expect(response.body).to include('Error occurred while creating a FileSet.')
         end
       end
@@ -95,8 +103,12 @@ describe CurationConcerns::FileSetsController do
         end
 
         it 'errors out of create after on continuous rsolr error' do
-          xhr :post, :create, parent_id: parent, file_set: { files: [file] },
-                              permission: { group: { 'public' => 'read' } }, terms_of_service: '1'
+          post :create, xhr: true, params: {
+            parent_id: parent,
+            file_set: { files: [file] },
+            permission: { group: { 'public' => 'read' } },
+            terms_of_service: '1'
+          }
           expect(response.body).to include('Error creating file image.png')
         end
       end
@@ -114,7 +126,7 @@ describe CurationConcerns::FileSetsController do
 
       it 'deletes the file' do
         expect(FileSet.find(file_set.id)).to be_kind_of FileSet
-        delete :destroy, id: file_set
+        delete :destroy, params: { id: file_set }
         expect { FileSet.find(file_set.id) }.to raise_error Ldp::Gone
         expect(response).to redirect_to main_app.curation_concerns_generic_work_path(parent)
       end
@@ -137,16 +149,20 @@ describe CurationConcerns::FileSetsController do
 
       context 'updating metadata' do
         it 'is successful and update attributes' do
-          post :update, id: file_set, file_set:
-            { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+          post :update, params: {
+            id: file_set,
+            file_set: { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+          }
           expect(response).to redirect_to main_app.curation_concerns_file_set_path(file_set)
           expect(assigns[:file_set].title).to eq(['new_title'])
         end
 
         it 'goes back to edit on an error' do
           allow_any_instance_of(FileSet).to receive(:valid?).and_return(false)
-          post :update, id: file_set, file_set:
-            { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+          post :update, params: {
+            id: file_set,
+            file_set: { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+          }
           expect(response.status).to eq 422
           expect(response).to render_template('edit')
           expect(assigns[:groups]).to be_kind_of Array
@@ -157,19 +173,22 @@ describe CurationConcerns::FileSetsController do
         context 'updating visibility' do
           it 'applies public' do
             new_visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-            post :update, id: file_set, file_set: { visibility: new_visibility, embargo_release_date: '' }
+            post :update, params: { id: file_set, file_set: { visibility: new_visibility, embargo_release_date: '' } }
             expect(file_set.reload.visibility).to eq new_visibility
           end
 
           it 'applies embargo' do
-            post :update, id: file_set, file_set: {
-              visibility: 'embargo',
-              visibility_during_embargo: 'restricted',
-              embargo_release_date: '2099-09-05',
-              visibility_after_embargo: 'open',
-              visibility_during_lease: 'open',
-              lease_expiration_date: '2099-09-05',
-              visibility_after_lease: 'restricted'
+            post :update, params: {
+              id: file_set,
+              file_set: {
+                visibility: 'embargo',
+                visibility_during_embargo: 'restricted',
+                embargo_release_date: '2099-09-05',
+                visibility_after_embargo: 'open',
+                visibility_during_lease: 'open',
+                lease_expiration_date: '2099-09-05',
+                visibility_after_lease: 'restricted'
+              }
             }
             file_set.reload
             expect(file_set).to be_under_embargo
@@ -181,7 +200,7 @@ describe CurationConcerns::FileSetsController do
       context 'updating file content' do
         it 'is successful' do
           expect(IngestFileJob).to receive(:perform_later)
-          post :update, id: file_set, file_set: { files: [file] }
+          post :update, params: { id: file_set, file_set: { files: [file] } }
           expect(response).to redirect_to main_app.curation_concerns_file_set_path(file_set)
         end
       end
@@ -200,7 +219,7 @@ describe CurationConcerns::FileSetsController do
         it 'is successful' do
           expect(file_set.latest_content_version.label).to eq('version2')
           expect(file_set.original_file.content).to eq("This is a test fixture for curation_concerns: <%= @id %>.\n")
-          post :update, id: file_set, revision: 'version1'
+          post :update, params: { id: file_set, revision: 'version1' }
           expect(response).to redirect_to main_app.curation_concerns_file_set_path(file_set)
           reloaded = file_set.reload.original_file
           expect(reloaded.versions.last.label).to eq 'version3'
@@ -218,7 +237,7 @@ describe CurationConcerns::FileSetsController do
 
     describe '#edit' do
       it 'gives me the unauthorized page' do
-        get :edit, id: public_file_set
+        get :edit, params: { id: public_file_set }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -226,7 +245,7 @@ describe CurationConcerns::FileSetsController do
 
     describe '#show' do
       it 'allows access to the file' do
-        get :show, id: public_file_set
+        get :show, params: { id: public_file_set }
         expect(response).to be_success
       end
     end
@@ -238,27 +257,27 @@ describe CurationConcerns::FileSetsController do
 
     describe '#edit' do
       it 'requires login' do
-        get :edit, id: public_file_set
+        get :edit, params: { id: public_file_set }
         expect(response).to fail_redirect_and_flash(main_app.new_user_session_path, 'You are not authorized to access this page.')
       end
     end
 
     describe '#show' do
       it 'denies access to private files' do
-        get :show, id: private_file_set
+        get :show, params: { id: private_file_set }
         expect(response).to fail_redirect_and_flash(main_app.new_user_session_path, 'You are not authorized to access this page.')
       end
 
       it 'allows access to public files' do
         expect(controller).to receive(:additional_response_formats).with(ActionController::MimeResponds::Collector)
-        get :show, id: public_file_set
+        get :show, params: { id: public_file_set }
         expect(response).to be_success
       end
     end
 
     describe '#new' do
       it 'does not let the user submit' do
-        get :new, parent_id: parent
+        get :new, params: { parent_id: parent }
         expect(response).to fail_redirect_and_flash(main_app.new_user_session_path, 'You are not authorized to access this page.')
       end
     end

data/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb

@@ -8,7 +8,7 @@ describe CurationConcerns::GenericWorksController do
 
   context "JSON" do
     let(:resource) { create(:private_generic_work, user: user) }
-    let(:resource_request) { get :show, id: resource, format: :json }
+    let(:resource_request) { get :show, params: { id: resource, format: :json } }
     subject { response }
 
     describe "unauthorized" do
@@ -28,12 +28,12 @@ describe CurationConcerns::GenericWorksController do
     end
 
     describe 'not found' do
-      before { get :show, id: "non-existent-pid", format: :json }
+      before { get :show, params: { id: "non-existent-pid", format: :json } }
       it { is_expected.to respond_not_found }
     end
 
     describe 'created' do
-      before { post :create, generic_work: { title: ['a title'] }, format: :json }
+      before { post :create, params: { generic_work: { title: ['a title'] }, format: :json } }
       it "returns 201, renders show template sets location header" do
         # Ensure that @curation_concern is set for jbuilder template to use
         expect(assigns[:curation_concern]).to be_instance_of GenericWork
@@ -45,7 +45,7 @@ describe CurationConcerns::GenericWorksController do
     end
 
     describe 'failed create' do
-      before { post :create, generic_work: {}, format: :json }
+      before { post :create, params: { generic_work: {}, format: :json } }
       it "returns 422 and the errors" do
         created_resource = assigns[:curation_concern]
         expect(response).to respond_unprocessable_entity(errors: created_resource.errors.messages.as_json)
@@ -63,7 +63,7 @@ describe CurationConcerns::GenericWorksController do
     end
 
     describe 'updated' do
-      before { put :update, id: resource, generic_work: { title: ['updated title'] }, format: :json }
+      before { put :update, params: { id: resource, generic_work: { title: ['updated title'] }, format: :json } }
       it "returns 200, renders show template sets location header" do
         # Ensure that @curation_concern is set for jbuilder template to use
         expect(assigns[:curation_concern]).to be_instance_of GenericWork
@@ -76,7 +76,7 @@ describe CurationConcerns::GenericWorksController do
 
     describe 'failed update' do
       before do
-        post :update, id: resource, generic_work: { title: [''] }, format: :json
+        post :update, params: { id: resource, generic_work: { title: [''] }, format: :json }
       end
       it "returns 422 and the errors" do
         expect(response).to respond_unprocessable_entity(errors: { title: ["Your work must have a title."] })

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -10,7 +10,7 @@ describe CurationConcerns::GenericWorksController do
     context 'my own private work' do
       let(:work) { create(:private_generic_work, user: user) }
       it 'shows me the page' do
-        get :show, id: work
+        get :show, params: { id: work }
         expect(response).to be_success
       end
 
@@ -18,8 +18,7 @@ describe CurationConcerns::GenericWorksController do
         render_views
         it "renders a breadcrumb" do
           parent = create(:generic_work, title: ['Parent Work'], user: user, ordered_members: [work])
-          get :show, id: work, parent_id: parent
-
+          get :show, params: { id: work, parent_id: parent }
           expect(response.body).to have_content "Parent Work"
         end
       end
@@ -28,7 +27,7 @@ describe CurationConcerns::GenericWorksController do
     context 'someone elses private work' do
       let(:work) { create(:private_generic_work) }
       it 'shows unauthorized message' do
-        get :show, id: work
+        get :show, params: { id: work }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -39,7 +38,7 @@ describe CurationConcerns::GenericWorksController do
       context "html" do
         it 'shows me the page' do
           expect(controller). to receive(:additional_response_formats).with(ActionController::MimeResponds::Collector)
-          get :show, id: work
+          get :show, params: { id: work }
           expect(response).to be_success
         end
       end
@@ -52,7 +51,7 @@ describe CurationConcerns::GenericWorksController do
         end
 
         it 'renders an turtle file' do
-          get :show, id: '99999999', format: :ttl
+          get :show, params: { id: '99999999', format: :ttl }
           expect(response).to be_successful
           expect(response.body).to eq "ttl graph"
           expect(response.content_type).to eq 'text/turtle'
@@ -64,7 +63,7 @@ describe CurationConcerns::GenericWorksController do
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
       let(:work) { create(:private_generic_work) }
       it 'someone elses private work should show me the page' do
-        get :show, id: work
+        get :show, params: { id: work }
         expect(response).to be_success
       end
     end
@@ -72,8 +71,8 @@ describe CurationConcerns::GenericWorksController do
     context 'when a ObjectNotFoundError is raised' do
       it 'returns 404 page' do
         allow(controller).to receive(:show).and_raise(ActiveFedora::ObjectNotFoundError)
-        expect(controller).to receive(:render_404) { controller.render nothing: true }
-        get :show, id: 'abc123'
+        expect(controller).to receive(:render_404) { controller.render body: nil }
+        get :show, params: { id: 'abc123' }
       end
     end
   end
@@ -99,7 +98,7 @@ describe CurationConcerns::GenericWorksController do
       let(:work) { stub_model(GenericWork) }
       it 'creates a work' do
         allow(controller).to receive(:curation_concern).and_return(work)
-        post :create, generic_work: { title: ['a title'] }
+        post :create, params: { generic_work: { title: ['a title'] } }
         expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
       end
     end
@@ -107,7 +106,7 @@ describe CurationConcerns::GenericWorksController do
     context 'when create fails' do
       let(:create_status) { false }
       it 'draws the form again' do
-        post :create, generic_work: { title: ['a title'] }
+        post :create, params: { generic_work: { title: ['a title'] } }
         expect(response.status).to eq 422
         expect(assigns[:form]).to be_kind_of CurationConcerns::GenericWorkForm
         expect(response).to render_template 'new'
@@ -118,7 +117,7 @@ describe CurationConcerns::GenericWorksController do
       before { allow(controller.current_ability).to receive(:can?).and_return(false) }
 
       it 'shows the unauthorized message' do
-        post :create, generic_work: { title: ['a title'] }
+        post :create, params: { generic_work: { title: ['a title'] } }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -129,7 +128,7 @@ describe CurationConcerns::GenericWorksController do
     context 'my own private work' do
       let(:work) { create(:private_generic_work, user: user) }
       it 'shows me the page' do
-        get :edit, id: work
+        get :edit, params: { id: work }
         expect(assigns[:form]).to be_kind_of CurationConcerns::GenericWorkForm
         expect(response).to be_success
       end
@@ -139,7 +138,7 @@ describe CurationConcerns::GenericWorksController do
       routes { Rails.application.class.routes }
       let(:work) { create(:private_generic_work) }
       it 'shows the unauthorized message' do
-        get :edit, id: work
+        get :edit, params: { id: work }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -148,7 +147,7 @@ describe CurationConcerns::GenericWorksController do
     context 'someone elses public work' do
       let(:work) { create(:public_generic_work) }
       it 'shows the unauthorized message' do
-        get :edit, id: work
+        get :edit, params: { id: work }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -158,7 +157,7 @@ describe CurationConcerns::GenericWorksController do
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
       let(:work) { create(:private_generic_work) }
       it 'someone elses private work should show me the page' do
-        get :edit, id: work
+        get :edit, params: { id: work }
         expect(response).to be_success
       end
     end
@@ -166,20 +165,20 @@ describe CurationConcerns::GenericWorksController do
 
   describe '#update' do
     let(:work) { create(:private_generic_work, user: user) }
+    let(:visibility_changed) { false }
+    let(:actor) { double(update: true) }
     before do
       allow(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor)
       allow_any_instance_of(GenericWork).to receive(:visibility_changed?).and_return(visibility_changed)
     end
-    let(:visibility_changed) { false }
-    let(:actor) { double(update: true) }
 
     it 'updates the work' do
-      patch :update, id: work, generic_work: {}
+      patch :update, params: { id: work, generic_work: {} }
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
     end
 
     it "can update file membership" do
-      patch :update, id: work, generic_work: { ordered_member_ids: ['foo_123'] }
+      patch :update, params: { id: work, generic_work: { ordered_member_ids: ['foo_123'] } }
       expected_params = { ordered_member_ids: ['foo_123'] }
       if Rails.version < '5.0.0'
         expect(actor).to have_received(:update).with(expected_params)
@@ -196,14 +195,14 @@ describe CurationConcerns::GenericWorksController do
         let(:work) { create(:work_with_one_file, user: user) }
 
         it 'prompts to change the files access' do
-          patch :update, id: work, generic_work: {}
+          patch :update, params: { id: work, generic_work: {} }
           expect(response).to redirect_to main_app.confirm_curation_concerns_permission_path(controller.curation_concern)
         end
       end
 
       context 'without children' do
         it "doesn't prompt to change the files access" do
-          patch :update, id: work, generic_work: {}
+          patch :update, params: { id: work, generic_work: {} }
           expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
         end
       end
@@ -213,7 +212,7 @@ describe CurationConcerns::GenericWorksController do
       let(:actor) { double(update: false) }
 
       it 'renders the form' do
-        patch :update, id: work, generic_work: {}
+        patch :update, params: { id: work, generic_work: {} }
         expect(assigns[:form]).to be_kind_of CurationConcerns::GenericWorkForm
         expect(response).to render_template('edit')
       end
@@ -222,7 +221,7 @@ describe CurationConcerns::GenericWorksController do
     context 'someone elses public work' do
       let(:work) { create(:public_generic_work) }
       it 'shows the unauthorized message' do
-        get :update, id: work
+        get :update, params: { id: work }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -232,7 +231,7 @@ describe CurationConcerns::GenericWorksController do
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
       let(:work) { create(:private_generic_work) }
       it 'someone elses private work should update the work' do
-        patch :update, id: work, generic_work: {}
+        patch :update, params: { id: work, generic_work: {} }
         expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
       end
     end
@@ -243,7 +242,7 @@ describe CurationConcerns::GenericWorksController do
     let(:parent_collection) { create(:collection) }
 
     it 'deletes the work' do
-      delete :destroy, id: work_to_be_deleted
+      delete :destroy, params: { id: work_to_be_deleted }
       expect(response).to redirect_to main_app.search_catalog_path
       expect(GenericWork).not_to exist(work_to_be_deleted.id)
     end
@@ -254,7 +253,7 @@ describe CurationConcerns::GenericWorksController do
         parent_collection.save!
       end
       it 'deletes the work and updates the parent collection' do
-        delete :destroy, id: work_to_be_deleted
+        delete :destroy, params: { id: work_to_be_deleted }
         expect(GenericWork).not_to exist(work_to_be_deleted.id)
         expect(response).to redirect_to main_app.search_catalog_path
         expect(parent_collection.reload.members).to eq []
@@ -264,13 +263,13 @@ describe CurationConcerns::GenericWorksController do
     it "invokes the after_destroy callback" do
       expect(CurationConcerns.config.callback).to receive(:run)
         .with(:after_destroy, work_to_be_deleted.id, user)
-      delete :destroy, id: work_to_be_deleted
+      delete :destroy, params: { id: work_to_be_deleted }
     end
 
     context 'someone elses public work' do
       let(:work_to_be_deleted) { create(:private_generic_work) }
       it 'shows unauthorized message' do
-        delete :destroy, id: work_to_be_deleted
+        delete :destroy, params: { id: work_to_be_deleted }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -280,7 +279,7 @@ describe CurationConcerns::GenericWorksController do
       let(:work_to_be_deleted) { create(:private_generic_work) }
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
       it 'someone elses private work should delete the work' do
-        delete :destroy, id: work_to_be_deleted
+        delete :destroy, params: { id: work_to_be_deleted }
         expect(GenericWork).not_to exist(work_to_be_deleted.id)
       end
     end
@@ -288,12 +287,8 @@ describe CurationConcerns::GenericWorksController do
 
   describe '#file_manager' do
     let(:work) { create(:private_generic_work, user: user) }
-    before do
-      sign_in user
-    end
     it "is successful" do
-      get :file_manager, id: work.id
-
+      get :file_manager, params: { id: work.id }
       expect(response).to be_success
       expect(assigns(:presenter)).not_to be_blank
     end