sufia 7.1.0 → 7.2.0

data/spec/controllers/contact_form_controller_spec.rb

@@ -22,7 +22,7 @@ describe ContactFormController do
 
   describe "#create" do
     subject { flash }
-    before { post :create, contact_form: params }
+    before { post :create, params: { sufia_contact_form: params } }
     context "with the required parameters" do
       let(:params) { required_params }
       its(:notice) { is_expected.to eq("Thank you for your message!") }
@@ -63,26 +63,26 @@ describe ContactFormController do
     context "with a successful email" do
       it "calls #after_deliver" do
         expect(controller).to receive(:after_deliver)
-        post :create, contact_form: required_params
+        post :create, params: { sufia_contact_form: required_params }
       end
     end
     context "with an unsuccessful email" do
       it "does not call #after_deliver" do
         expect(controller).not_to receive(:after_deliver)
-        post :create, contact_form: required_params.except(:email)
+        post :create, params: { contact_form: required_params.except(:email) }
       end
     end
   end
 
   context "when encoutering a RuntimeError" do
-    let(:logger) { double }
+    let(:logger) { double(info?: true) }
     before do
       allow(controller).to receive(:logger).and_return(logger)
-      allow(ContactForm).to receive(:new).and_raise(RuntimeError)
+      allow(Sufia::ContactMailer).to receive(:contact).and_raise(RuntimeError)
     end
     it "is logged via Rails" do
       expect(logger).to receive(:error).with("Contact form failed to send: #<RuntimeError: RuntimeError>")
-      post :create, contact_form: required_params
+      post :create, params: { sufia_contact_form: required_params }
     end
   end
 end

data/spec/controllers/content_blocks_controller_spec.rb

@@ -5,12 +5,12 @@ describe ContentBlocksController, type: :controller do
 
     context "when not logged in" do
       it "UPDATE should redirect to sign_in path" do
-        patch :update, id: content_block, content_block: { value: 'foo' }
+        patch :update, params: { id: content_block, content_block: { value: 'foo' } }
         expect(response).to redirect_to main_app.new_user_session_path
       end
 
       it "CREATE should redirect to sign_in path" do
-        post :create, content_block: { name: 'NNN', value: 'VVV' }
+        post :create, params: { content_block: { name: 'NNN', value: 'VVV' } }
         expect(response).to redirect_to main_app.new_user_session_path
       end
 
@@ -37,15 +37,15 @@ describe ContentBlocksController, type: :controller do
         before { expect(user).to receive(:groups).and_return(['admin', 'registered']) }
 
         it "UPDATE should save" do
-          patch :update, id: content_block, content_block: { value: 'foo' }
+          patch :update, params: { id: content_block, content_block: { value: 'foo' } }
           expect(response).to redirect_to "whence_i_came"
           expect(assigns[:content_block].value).to eq 'foo'
         end
 
         it "CREATE should save" do
-          expect {
-            post :create, content_block: { name: 'NNN', value: 'VVV', external_key: 'key' }
-          }.to change { ContentBlock.count }.by(1)
+          expect do
+            post :create, params: { content_block: { name: 'NNN', value: 'VVV', external_key: 'key' } }
+          end.to change { ContentBlock.count }.by(1)
           expect(response).to redirect_to "whence_i_came"
           expect(assigns[:content_block].name).to eq 'NNN'
           expect(assigns[:content_block].value).to eq 'VVV'
@@ -55,13 +55,13 @@ describe ContentBlocksController, type: :controller do
 
       context "as a user without permission" do
         it "UPDATE is unauthorized" do
-          patch :update, id: content_block, content_block: { value: 'foo' }
+          patch :update, params: { id: content_block, content_block: { value: 'foo' } }
           expect(response.code).to eq '401'
           expect(response).to render_template(:unauthorized)
         end
 
         it "CREATE should redirect to root path" do
-          post :create, content_block: { name: 'NNN', value: 'VVV' }
+          post :create, params: { content_block: { name: 'NNN', value: 'VVV' } }
           expect(response.code).to eq '401'
           expect(response).to render_template(:unauthorized)
         end

data/spec/controllers/curation_concerns/audits_controller_spec.rb

@@ -12,7 +12,7 @@ describe CurationConcerns::AuditsController do
       before { sign_in user }
 
       it "returns json with the result" do
-        xhr :post, :create, file_set_id: file_set
+        post :create, params: { file_set_id: file_set }, xhr: true
         expect(response).to be_success
         json = JSON.parse(response.body)
         # json is a structure like this:
@@ -28,7 +28,7 @@ describe CurationConcerns::AuditsController do
   context "when not signed in" do
     describe "POST create" do
       it "returns json with the result" do
-        xhr :post, :create, file_set_id: file_set
+        post :create, params: { file_set_id: file_set }, xhr: true
         expect(response.code).to eq '401'
       end
     end

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -30,9 +30,9 @@ describe CurationConcerns::FileSetsController do
 
       it "deletes the file" do
         expect(ContentDeleteEventJob).to receive(:perform_later).with(file_set.id, user)
-        expect {
-          delete :destroy, id: file_set
-        }.to change { FileSet.exists?(file_set.id) }.from(true).to(false)
+        expect do
+          delete :destroy, params: { id: file_set }
+        end.to change { FileSet.exists?(file_set.id) }.from(true).to(false)
       end
     end
   end
@@ -47,14 +47,14 @@ describe CurationConcerns::FileSetsController do
     before do
       binary = StringIO.new("hey")
       Hydra::Works::AddFileToFileSet.call(file_set, binary, :original_file, versioning: true)
+      request.env['HTTP_REFERER'] = 'http://test.host/foo'
     end
 
     it "sets the breadcrumbs and versions presenter" do
-      allow(controller.request).to receive(:referer).and_return('foo')
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.works'), Sufia::Engine.routes.url_helpers.dashboard_works_path)
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.file_set.browse_view'), Rails.application.routes.url_helpers.curation_concerns_file_set_path(file_set))
-      get :edit, id: file_set
+      get :edit, params: { id: file_set }
 
       expect(response).to be_success
       expect(assigns[:file_set]).to eq file_set
@@ -71,23 +71,38 @@ describe CurationConcerns::FileSetsController do
     context "when updating metadata" do
       it "spawns a content update event job" do
         expect(ContentUpdateEventJob).to receive(:perform_later).with(file_set, user)
-        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' }]
+          }
+        }
       end
     end
 
     context "when updating the attached file" do
+      let(:actor) { double }
+      before do
+        allow(CurationConcerns::Actors::FileActor).to receive(:new).and_return(actor)
+      end
+      let(:expected_file_type) do
+        if Rails.version < '5.0.0'
+          Rack::Test::UploadedFile
+        else
+          ActionDispatch::Http::UploadedFile
+        end
+      end
       it "spawns a content new version event job" do
         expect(ContentNewVersionEventJob).to receive(:perform_later).with(file_set, user)
 
-        expect(CharacterizeJob).to receive(:perform_later).with(file_set, String)
+        expect(actor).to receive(:ingest_file).with(expected_file_type)
         file = fixture_file_upload('/world.png', 'image/png')
-        post :update, id: file_set, filedata: file, file_set: { keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
-        post :update, id: file_set, file_set: { files: [file], keyword: [''],
-                                                permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+        post :update, params: { id: file_set, filedata: file, file_set: { keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] } }
+        post :update, params: { id: file_set, file_set: { files: [file], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] } }
       end
     end
 
@@ -108,7 +123,7 @@ describe CurationConcerns::FileSetsController do
         context "as the first user" do
           before do
             sign_in user
-            post :update, id: file_set, revision: version1
+            post :update, params: { id: file_set, revision: version1 }
           end
 
           let(:restored_content) { file_set.reload.original_file }
@@ -130,7 +145,7 @@ describe CurationConcerns::FileSetsController do
           end
 
           it "is unauthorized" do
-            post :update, id: file_set, revision: version1
+            post :update, params: { id: file_set, revision: version1 }
             expect(response.code).to eq '401'
             expect(response).to render_template 'unauthorized'
           end
@@ -139,12 +154,14 @@ describe CurationConcerns::FileSetsController do
     end
 
     it "adds new groups and users" do
-      post :update, id: file_set,
-                    file_set: { keyword: [''],
-                                permissions_attributes: [
-                                  { type: 'person', name: 'user1', access: 'edit' },
-                                  { type: 'group', name: 'group1', access: 'read' }
-                                ] }
+      post :update, params: {
+        id: file_set,
+        file_set: { keyword: [''],
+                    permissions_attributes: [
+                      { type: 'person', name: 'user1', access: 'edit' },
+                      { type: 'group', name: 'group1', access: 'read' }
+                    ] }
+      }
 
       expect(assigns[:file_set].read_groups).to eq ["group1"]
       expect(assigns[:file_set].edit_users).to include("user1", user.user_key)
@@ -153,26 +170,17 @@ describe CurationConcerns::FileSetsController do
     it "updates existing groups and users" do
       file_set.edit_groups = ['group3']
       file_set.save
-      post :update, id: file_set,
-                    file_set: { keyword: [''],
-                                permissions_attributes: [
-                                  { id: file_set.permissions.last.id, type: 'group', name: 'group3', access: 'read' }
-                                ] }
+      post :update, params: {
+        id: file_set,
+        file_set: { keyword: [''],
+                    permissions_attributes: [
+                      { id: file_set.permissions.last.id, type: 'group', name: 'group3', access: 'read' }
+                    ] }
+      }
 
       expect(assigns[:file_set].read_groups).to eq(["group3"])
     end
 
-    it "spawns a virus check" do
-      file = fixture_file_upload('/world.png', 'image/png')
-
-      expect(ContentNewVersionEventJob).to receive(:perform_later).with(file_set, user)
-      expect(ClamAV.instance).to receive(:scanfile).and_return(0)
-      expect(CharacterizeJob).to receive(:perform_later).with(file_set, String)
-      post :update, id: file_set.id, 'Filename' => 'The world',
-                    file_set: { files: [file], keyword: [''],
-                                permissions_attributes: [{ type: 'user', name: 'archivist1', access: 'edit' }] }
-    end
-
     context "when there's an error saving" do
       let!(:file_set) do
         FileSet.create do |fs|
@@ -181,7 +189,7 @@ describe CurationConcerns::FileSetsController do
       end
       it "draws the edit page" do
         expect_any_instance_of(FileSet).to receive(:valid?).and_return(false)
-        post :update, id: file_set, file_set: { keyword: [''] }
+        post :update, params: { id: file_set, file_set: { keyword: [''] } }
         expect(response.code).to eq '422'
         expect(response).to render_template('edit')
         expect(assigns[:file_set]).to eq file_set
@@ -207,7 +215,7 @@ describe CurationConcerns::FileSetsController do
 
     context "someone else's files" do
       it "sets flash error" do
-        get :edit, id: file_set
+        get :edit, params: { id: file_set }
         expect(response.code).to eq '401'
         expect(response).to render_template('unauthorized')
       end
@@ -221,7 +229,7 @@ describe CurationConcerns::FileSetsController do
     context "without a referer" do
       it "shows me the file and set breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-        get :show, id: file_set
+        get :show, params: { id: file_set }
         expect(response).to be_successful
         expect(flash).to be_empty
         expect(assigns[:presenter]).to be_kind_of Sufia::FileSetPresenter
@@ -240,7 +248,7 @@ describe CurationConcerns::FileSetsController do
       end
 
       before do
-        allow(controller.request).to receive(:referer).and_return('foo')
+        request.env['HTTP_REFERER'] = 'http://test.host/foo'
         work.ordered_members << file_set
         work.save!
         file_set.save!
@@ -251,7 +259,7 @@ describe CurationConcerns::FileSetsController do
         expect(controller).to receive(:add_breadcrumb).with('My Works', Sufia::Engine.routes.url_helpers.dashboard_works_path)
         expect(controller).to receive(:add_breadcrumb).with('test title', main_app.curation_concerns_generic_work_path(work.id))
         expect(controller).to receive(:add_breadcrumb).with('test file', main_app.curation_concerns_file_set_path(file_set))
-        get :show, id: file_set
+        get :show, params: { id: file_set }
         expect(response).to be_successful
       end
     end

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -8,7 +8,7 @@ describe CurationConcerns::GenericWorksController do
     before { get :new }
     it "is successful" do
       expect(response).to be_successful
-      expect(response).to render_template("layouts/sufia-one-column")
+      expect(response).to render_template("layouts/curation_concerns/1_column")
       expect(assigns[:curation_concern]).to be_kind_of GenericWork
     end
 
@@ -22,30 +22,30 @@ describe CurationConcerns::GenericWorksController do
     let(:work) { create(:work, title: ['test title'], user: user) }
 
     it "is successful" do
-      get :edit, id: work
+      get :edit, params: { id: work }
       expect(response).to be_successful
-      expect(response).to render_template("layouts/sufia-one-column")
+      expect(response).to render_template("layouts/curation_concerns/1_column")
       expect(assigns[:form]).to be_kind_of CurationConcerns::GenericWorkForm
     end
 
     context "without a referer" do
       it "sets breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-        get :edit, id: work
+        get :edit, params: { id: work }
         expect(response).to be_successful
       end
     end
 
     context "with a referer" do
       before do
-        allow(controller.request).to receive(:referer).and_return('foo')
+        request.env['HTTP_REFERER'] = 'http://test.host/foo'
       end
 
       it "sets breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
         expect(controller).to receive(:add_breadcrumb).with('My Works', Sufia::Engine.routes.url_helpers.dashboard_works_path)
         expect(controller).to receive(:add_breadcrumb).with(I18n.t("sufia.work.browse_view"), Rails.application.routes.url_helpers.curation_concerns_generic_work_path(work))
-        get :edit, id: work
+        get :edit, params: { id: work }
         expect(response).to be_successful
       end
     end
@@ -57,34 +57,44 @@ describe CurationConcerns::GenericWorksController do
     end
 
     it "is successful" do
-      get :show, id: work
+      get :show, params: { id: work }
       expect(response).to be_successful
       expect(assigns(:presenter)).to be_kind_of Sufia::WorkShowPresenter
     end
 
-    it 'renders an endnote file' do
-      get :show, id: work, format: 'endnote'
-      expect(response).to be_successful
+    context "with an endnote file" do
+      let(:disposition)  { response.header.fetch("Content-Disposition") }
+      let(:content_type) { response.header.fetch("Content-Type") }
+
+      render_views
+
+      it 'downloads the file' do
+        get :show, params: { id: work, format: 'endnote' }
+        expect(response).to be_successful
+        expect(disposition).to include("attachment")
+        expect(content_type).to eq("application/x-endnote-refer")
+        expect(response.body).to include("%T test title")
+      end
     end
 
     context "without a referer" do
       it "sets breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-        get :show, id: work
+        get :show, params: { id: work }
         expect(response).to be_successful
       end
     end
 
     context "with a referer" do
       before do
-        allow(controller.request).to receive(:referer).and_return('foo')
+        request.env['HTTP_REFERER'] = 'http://test.host/foo'
       end
 
       it "sets breadcrumbs" do
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
         expect(controller).to receive(:add_breadcrumb).with('My Works', Sufia::Engine.routes.url_helpers.dashboard_works_path)
         expect(controller).to receive(:add_breadcrumb).with('test title', main_app.curation_concerns_generic_work_path(work.id))
-        get :show, id: work
+        get :show, params: { id: work }
         expect(response).to be_successful
       end
     end
@@ -103,9 +113,13 @@ describe CurationConcerns::GenericWorksController do
       expect(actor).to receive(:create)
         .with(hash_including(:uploaded_files))
         .and_return(true)
-      post :create, generic_work: { title: ["First title"],
-                                    visibility: 'open' },
-                    uploaded_files: ['777', '888']
+      post :create, params: {
+        generic_work: {
+          title: ["First title"],
+          visibility: 'open'
+        },
+        uploaded_files: ['777', '888']
+      }
       expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
     end
@@ -130,9 +144,9 @@ describe CurationConcerns::GenericWorksController do
         it "ingests files from provide URLs" do
           skip "Creating a FileSet without a parent work is not yet supported"
           expect(ImportUrlJob).to receive(:perform_later).twice
-          expect { post :create, selected_files: browse_everything_params,
-                                 file_set: {}
-          }.to change(FileSet, :count).by(2)
+          expect do
+            post :create, params: { selected_files: browse_everything_params, file_set: {} }
+          end.to change(FileSet, :count).by(2)
           created_files = FileSet.all
           expect(created_files.map(&:import_url)).to include(url1, url2)
           expect(created_files.map(&:label)).to include("filepicker-demo.txt.txt", "Getting+Started.pdf")
@@ -148,14 +162,24 @@ describe CurationConcerns::GenericWorksController do
         it "records the work" do
           # TODO: ensure the actor stack, called with these params
           # makes one work, two file sets and calls ImportUrlJob twice.
-          expect(actor).to receive(:create)
-            .with(hash_including(uploaded_files: [],
-                                 remote_files: browse_everything_params.values))
-            .and_return(true)
-          post :create, selected_files: browse_everything_params,
-                        uploaded_files: uploaded_files,
-                        parent_id: work.id,
-                        generic_work: { title: ['First title'] }
+          if Rails.version < '5.0.0'
+            expect(actor).to receive(:create)
+              .with(hash_including(uploaded_files: [],
+                                   remote_files: browse_everything_params.values))
+              .and_return(true)
+          else
+            expect(actor).to receive(:create).with(ActionController::Parameters) do |ac_params|
+              expect(ac_params['uploaded_files']).to eq []
+              expect(ac_params['remote_files']).to eq browse_everything_params.values.map { |h| ActionController::Parameters.new(h) }
+            end
+          end
+
+          post :create, params: {
+            selected_files: browse_everything_params,
+            uploaded_files: uploaded_files,
+            parent_id: work.id,
+            generic_work: { title: ['First title'] }
+          }
           expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
           expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
         end