sufia 7.1.0 → 7.2.0

data/spec/controllers/api/items_controller_spec.rb

@@ -24,7 +24,7 @@ describe API::ItemsController, type: :controller do
     let(:item_hash) { JSON.parse(item) }
 
     context 'with a missing token' do
-      before { get :show, format: :json, id: default_work.id }
+      before { get :show, params: { format: :json, id: default_work.id } }
 
       it "is unauthorized" do
         expect(subject).to have_http_status(401)
@@ -33,7 +33,7 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with an unfamiliar token' do
-      before { get :show, format: :json, id: default_work.id, token: get_token }
+      before { get :show, params: { format: :json, id: default_work.id, token: get_token } }
       let(:get_token) { 'foobar' }
 
       it "is unauthorized" do
@@ -45,7 +45,7 @@ describe API::ItemsController, type: :controller do
     context 'with an unauthorized resource' do
       before do
         allow_any_instance_of(User).to receive(:can?).with(:edit, default_work) { false }
-        get :show, format: :json, id: default_work.id, token: token
+        get :show, params: { format: :json, id: default_work.id, token: token }
       end
 
       it 'is unauthorized' do
@@ -58,7 +58,7 @@ describe API::ItemsController, type: :controller do
     context 'with a resource not deposited via Arkivo' do
       before do
         allow_any_instance_of(GenericWork).to receive(:arkivo_checksum) { nil }
-        get :show, format: :json, id: default_work.id, token: token
+        get :show, params: { format: :json, id: default_work.id, token: token }
       end
 
       it "is forbidden" do
@@ -72,7 +72,7 @@ describe API::ItemsController, type: :controller do
       before do
         allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
         allow(relation).to receive(:find).with(default_work.id).and_raise(ActiveFedora::ObjectNotFoundError)
-        get :show, format: :json, id: default_work.id, token: token
+        get :show, params: { format: :json, id: default_work.id, token: token }
       end
 
       it "is not found" do
@@ -82,7 +82,7 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with an authorized Arkivo-deposited resource' do
-      before { get :show, format: :json, id: default_work.id, token: token }
+      before { get :show, params: { format: :json, id: default_work.id, token: token } }
 
       specify do
         expect(subject).to have_http_status(204)
@@ -93,7 +93,7 @@ describe API::ItemsController, type: :controller do
 
   context 'with an HTTP POST' do
     context 'without an item' do
-      before { post :create, format: :json }
+      before { post :create, params: { format: :json } }
 
       it "is an bad request" do
         expect(subject).to have_http_status(400)
@@ -102,7 +102,7 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with an invalid item' do
-      before { post :create, item, format: :json }
+      before { post :create, body: item, params: { format: :json } }
       let(:item) { { foo: 'bar' }.to_json }
 
       it "is a bad request" do
@@ -125,7 +125,7 @@ describe API::ItemsController, type: :controller do
 
       it "delegates creating the work to the actor" do
         expect(arkivo_actor).to receive(:create_work_from_item)
-        post :create, item, format: :json
+        post :create, body: item, params: { format: :json }
       end
 
       # TODO: This test belongs in the Actor test as an integration test.
@@ -154,7 +154,7 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with a valid item and unfamiliar token' do
-      before { post :create, item, format: :json }
+      before { post :create, body: item, params: { format: :json } }
 
       let(:token) { 'unfamiliar_token' }
       let(:item) { FactoryGirl.json(:post_item, token: token) }
@@ -196,7 +196,8 @@ describe API::ItemsController, type: :controller do
 
       it 'calls the arkivo actor to update the work' do
         expect(arkivo_actor).to receive(:update_work_from_item)
-        put :update, put_item, id: gw.id, format: :json
+        request.env['RAW_POST_DATA'] = put_item
+        put :update, params: { id: gw.id, format: :json }
       end
     end
 
@@ -212,7 +213,8 @@ describe API::ItemsController, type: :controller do
         allow(relation).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
 
         # Post an update to a work with a nil arkivo_checksum
-        put :update, put_item, id: non_arkivo_gw.id, format: :json
+        request.env['RAW_POST_DATA'] = put_item
+        put :update, params: { id: non_arkivo_gw.id, format: :json }
       end
 
       it "is forbidden" do
@@ -229,7 +231,8 @@ describe API::ItemsController, type: :controller do
         allow(relation).to receive(:find).with(gw.id) do
           raise(ActiveFedora::ObjectNotFoundError)
         end
-        put :update, put_item, id: gw.id, format: :json
+        request.env['RAW_POST_DATA'] = put_item
+        put :update, params: { id: gw.id, format: :json }
       end
 
       it "is not found" do
@@ -244,7 +247,8 @@ describe API::ItemsController, type: :controller do
         allow(controller).to receive(:user).and_return(user)
         allow(user).to receive(:can?).and_return(false)
         # Post an update with an resource unauthorized for the user
-        put :update, put_item, id: gw.id, format: :json
+        request.env['RAW_POST_DATA'] = put_item
+        put :update, params: { id: gw.id, format: :json }
       end
 
       it "is unauthorized" do
@@ -259,7 +263,10 @@ describe API::ItemsController, type: :controller do
       let(:bad_token) { 'unfamiliar_token' }
       let(:bad_token_item) { FactoryGirl.json(:put_item, token: bad_token) }
 
-      before { put :update, bad_token_item, id: gw.id, format: :json }
+      before do
+        request.env['RAW_POST_DATA'] = bad_token_item
+        put :update, params: { id: gw.id, format: :json }
+      end
 
       it "is unauthorized" do
         expect(subject).not_to be_success
@@ -270,7 +277,10 @@ describe API::ItemsController, type: :controller do
 
     context 'with an invalid item' do
       let(:invalid_item) { { foo: 'bar' }.to_json }
-      before { put :update, invalid_item, id: gw.id, format: :json }
+      before do
+        request.env['RAW_POST_DATA'] = invalid_item
+        put :update, params: { id: gw.id, format: :json }
+      end
 
       it "is a bad request" do
         expect(subject).to have_http_status(400)
@@ -295,7 +305,7 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with a missing token' do
-      before { delete :destroy, format: :json, id: gw.id }
+      before { delete :destroy, params: { format: :json, id: gw.id } }
 
       it "is unauthorized." do
         expect(subject).to have_http_status(401)
@@ -309,7 +319,7 @@ describe API::ItemsController, type: :controller do
       before do
         # Mock not being able to find the user due to bad token
         allow(controller).to receive(:user).and_return(nil)
-        delete :destroy, format: :json, id: gw.id, token: bad_token
+        delete :destroy, params: { format: :json, id: gw.id, token: bad_token }
       end
 
       specify do
@@ -323,7 +333,7 @@ describe API::ItemsController, type: :controller do
         # Mock user being unauthorized
         allow(controller).to receive(:user).and_return(user)
         allow(user).to receive(:can?).with(:edit, gw) { false }
-        delete :destroy, format: :json, id: gw.id, token: token
+        delete :destroy, params: { format: :json, id: gw.id, token: token }
       end
 
       it 'is unauthorized' do
@@ -343,7 +353,7 @@ describe API::ItemsController, type: :controller do
         allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
         allow(relation).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
         # Make call to destroy
-        delete :destroy, format: :json, id: non_arkivo_gw.id, token: token
+        delete :destroy, params: { format: :json, id: non_arkivo_gw.id, token: token }
       end
 
       it "is forbidden" do
@@ -358,7 +368,7 @@ describe API::ItemsController, type: :controller do
         # Mock ActiveFedora
         allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
         allow(relation).to receive(:find).with(not_found_id).and_raise(ActiveFedora::ObjectNotFoundError)
-        delete :destroy, format: :json, id: not_found_id, token: token
+        delete :destroy, params: { format: :json, id: not_found_id, token: token }
       end
 
       it "is not found" do
@@ -378,7 +388,7 @@ describe API::ItemsController, type: :controller do
 
       it "calls the actor to destroy the work" do
         expect(arkivo_actor).to receive(:destroy_work)
-        delete :destroy, format: :json, id: gw.id, token: token
+        delete :destroy, params: { format: :json, id: gw.id, token: token }
         expect(subject).to have_http_status(204)
         expect(subject.body).to be_blank
       end

data/spec/controllers/api/zotero_controller_spec.rb

@@ -112,7 +112,7 @@ describe API::ZoteroController, type: :controller do
     context 'with a non-matching token' do
       before do
         sign_in user
-        get :callback, oauth_token: 'woohoo', oauth_verifier: '12345'
+        get :callback, params: { oauth_token: 'woohoo', oauth_verifier: '12345' }
       end
 
       specify do
@@ -127,7 +127,7 @@ describe API::ZoteroController, type: :controller do
         allow_any_instance_of(User).to receive(:zotero_token) { user_token }
         allow(Sufia::Arkivo::CreateSubscriptionJob).to receive(:perform_later)
         sign_in user
-        get :callback, oauth_token: token_string, oauth_verifier: pin
+        get :callback, params: { oauth_token: token_string, oauth_verifier: pin }
       end
 
       let(:token_string) { 'woohoo' }

data/spec/controllers/batch_edits_controller_spec.rb

@@ -18,12 +18,11 @@ describe BatchEditsController, type: :controller do
     end
 
     it "is successful" 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)
       get :edit
       expect(response).to be_successful
-      expect(assigns[:form].model.creator).to eq ["Fred", "Wilma"]
+      expect(assigns[:form].model.creator).to match_array ["Fred", "Wilma"]
     end
 
     it "sets the breadcrumb trail" do
@@ -55,26 +54,26 @@ describe BatchEditsController, type: :controller do
     let(:mycontroller) { "my/works" }
 
     it "is successful" do
-      put :update, update_type: "delete_all"
+      put :update, params: { update_type: "delete_all" }
       expect(response).to redirect_to(Sufia::Engine.routes.url_for(controller: "dashboard", only_path: true))
       expect { GenericWork.find(one.id) }.to raise_error(Ldp::Gone)
       expect { GenericWork.find(two.id) }.to raise_error(Ldp::Gone)
     end
 
     it "redirects to the return controller" do
-      put :update, update_type: "delete_all", return_controller: mycontroller
+      put :update, params: { update_type: "delete_all", return_controller: mycontroller }
       expect(response).to redirect_to(Sufia::Engine.routes.url_for(controller: mycontroller, only_path: true))
     end
 
     it "updates the records" do
-      put :update, update_type: "update", generic_work: { subject: ["zzz"] }
+      put :update, params: { update_type: "update", generic_work: { subject: ["zzz"] } }
       expect(response).to be_redirect
       expect(GenericWork.find(one.id).subject).to eq ["zzz"]
       expect(GenericWork.find(two.id).subject).to eq ["zzz"]
     end
 
     it "updates permissions" do
-      put :update, update_type: "update", visibility: "authenticated"
+      put :update, params: { update_type: "update", visibility: "authenticated" }
       expect(response).to be_redirect
       expect(GenericWork.find(one.id).visibility).to eq "authenticated"
       expect(GenericWork.find(two.id).visibility).to eq "authenticated"

data/spec/controllers/catalog_controller_spec.rb

@@ -8,14 +8,14 @@ describe CatalogController, type: :controller do
   end
 
   describe "#index" do
-    let(:rocks) {
+    let(:rocks) do
       GenericWork.new(id: 'rock123', title: ['Rock Documents'], read_groups: ['public'])
-    }
+    end
 
-    let(:clouds) {
+    let(:clouds) do
       GenericWork.new(id: 'cloud123', title: ['Cloud Documents'], read_groups: ['public'],
                       contributor: ['frodo'])
-    }
+    end
 
     before do
       objects.each { |obj| ActiveFedora::SolrService.add(obj.to_solr) }
@@ -43,7 +43,7 @@ describe CatalogController, type: :controller do
       let(:objects) { [collection, rocks, clouds] }
 
       it 'finds collections' do
-        xhr :get, :index, q: 'rocks'
+        get :index, params: { q: 'rocks' }, xhr: true
         expect(response).to be_success
         doc_list = assigns(:document_list)
         expect(doc_list.map(&:id)).to match_array [collection.id, rocks.id]
@@ -53,7 +53,7 @@ describe CatalogController, type: :controller do
     describe 'term search' do
       let(:objects) { [rocks, clouds] }
       it 'finds works with the given search term' do
-        get :index, q: 'rocks', owner: 'all'
+        get :index, params: { q: 'rocks', owner: 'all' }
         expect(response).to be_success
         expect(response).to render_template('catalog/index')
         expect(assigns(:document_list).map(&:id)).to contain_exactly(rocks.id)
@@ -63,7 +63,7 @@ describe CatalogController, type: :controller do
     describe 'facet search' do
       let(:objects) { [rocks, clouds] }
       before do
-        get :index, 'f' => { 'contributor_tesim' => ['frodo'] }
+        get :index, params: { 'f' => { 'contributor_tesim' => ['frodo'] } }
       end
 
       it 'finds faceted works' do
@@ -76,7 +76,7 @@ describe CatalogController, type: :controller do
     describe 'full-text search', skip: 'Will GenericWorks have a full_text search?' do
       let(:objects) { [rocks, clouds] }
       it 'finds matching records' do
-        get :index, q: 'full_textfull_text'
+        get :index, params: { q: 'full_textfull_text' }
         expect(response).to be_success
         expect(response).to render_template('catalog/index')
         expect(assigns(:document_list).map(&:id)).to contain_exactly(clouds.id)
@@ -114,17 +114,17 @@ describe CatalogController, type: :controller do
       end
 
       it "finds work and work that contains file with title" do
-        get :index, q: 'find me'
+        get :index, params: { q: 'find me' }
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id], work2[:id])
       end
 
       it "finds work that contains file with title" do
-        get :index, q: 'other file'
+        get :index, params: { q: 'other file' }
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id])
       end
 
       it "finds work with title" do
-        get :index, q: 'me too'
+        get :index, params: { q: 'me too' }
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id])
       end
     end

data/spec/controllers/citations_controller_spec.rb

@@ -5,12 +5,12 @@ describe CitationsController do
     let(:work) { create(:work, user: user) }
     before do
       sign_in user
-      allow(controller.request).to receive(:referer).and_return('foo')
+      request.env['HTTP_REFERER'] = 'http://test.host/foo'
     end
 
     it "is successful" do
       expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
-      get :work, id: work
+      get :work, params: { id: work }
       expect(response).to be_successful
       expect(assigns(:presenter)).to be_kind_of Sufia::WorkShowPresenter
     end

data/spec/controllers/collections_controller_spec.rb

@@ -29,37 +29,50 @@ describe CollectionsController do
     before { sign_in user }
 
     it "creates a Collection" do
-      expect {
-        post :create, collection: { title: ["My First Collection "],
-                                    description: "The Description\r\n\r\nand more" }
-      }.to change { Collection.count }.by(1)
+      expect do
+        post :create, params: {
+          collection: {
+            title: ["My First Collection "],
+            description: "The Description\r\n\r\nand more"
+          }
+        }
+      end.to change { Collection.count }.by(1)
     end
 
     it "removes blank strings from params before creating Collection" do
-      expect {
-        post :create, collection: {
-          title: ["My First Collection "], creator: [""]
+      expect do
+        post :create, params: {
+          collection: {
+            title: ["My First Collection "],
+            creator: [""]
+          }
         }
-      }.to change { Collection.count }.by(1)
+      end.to change { Collection.count }.by(1)
       expect(assigns[:collection].title).to eq ["My First Collection "]
       expect(assigns[:collection].creator).to eq []
     end
 
     context "with files I can access" do
       it "creates a collection using only the accessible files" do
-        expect {
-          post :create, collection: { title: ["My own Collection"],
-                                      description: "The Description\r\n\r\nand more" },
-                        batch_document_ids: [asset1.id, asset2.id, unowned_asset.id]
-        }.to change { Collection.count }.by(1)
+        expect do
+          post :create, params: {
+            collection: {
+              title: ["My own Collection"],
+              description: "The Description\r\n\r\nand more"
+            },
+            batch_document_ids: [asset1.id, asset2.id, unowned_asset.id]
+          }
+        end.to change { Collection.count }.by(1)
         collection = assigns(:collection)
         expect(collection.members).to match_array [asset1, asset2]
       end
 
       it "adds docs to the collection and adds the collection id to the documents in the collection" do
-        post :create, batch_document_ids: [asset1.id],
-                      collection: { title: "My Second Collection ",
-                                    description: "The Description\r\n\r\nand more" }
+        post :create, params: {
+          batch_document_ids: [asset1.id],
+          collection: { title: "My Second Collection ", description: "The Description\r\n\r\nand more" }
+        }
+
         expect(assigns[:collection].members).to eq [asset1]
         asset_results = ActiveFedora::SolrService.instance.conn.get "select", params: { fq: ["id:\"#{asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
         expect(asset_results["response"]["numFound"]).to eq 1
@@ -93,9 +106,11 @@ describe CollectionsController do
 
     context "a collections members" do
       it "sets collection on members" do
-        put :update, id: collection,
-                     collection: { members: "add" },
-                     batch_document_ids: [asset3.id, asset1.id, asset2.id]
+        put :update, params: {
+          id: collection,
+          collection: { members: "add" },
+          batch_document_ids: [asset3.id, asset1.id, asset2.id]
+        }
         expect(response).to redirect_to routes.url_helpers.collection_path(collection)
         expect(assigns[:collection].members).to match_array [asset2, asset3, asset1]
         asset_results = ActiveFedora::SolrService.instance.conn.get "select", params: { fq: ["id:\"#{asset2.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
@@ -105,9 +120,11 @@ describe CollectionsController do
         afterupdate = GenericWork.find(asset2.id)
         expect(doc[Solrizer.solr_name(:collection)]).to eq afterupdate.to_solr[Solrizer.solr_name(:collection)]
 
-        put :update, id: collection,
-                     collection: { members: "remove" },
-                     batch_document_ids: [asset2]
+        put :update, params: {
+          id: collection,
+          collection: { members: "remove" },
+          batch_document_ids: [asset2]
+        }
         asset_results = ActiveFedora::SolrService.instance.conn.get "select", params: { fq: ["id:\"#{asset2.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
         expect(asset_results["response"]["numFound"]).to eq 1
         doc = asset_results["response"]["docs"].first
@@ -118,14 +135,18 @@ describe CollectionsController do
 
     context "updating a collections metadata" do
       it "saves the metadata" do
-        put :update, id: collection, collection: { creator: ['Emily'] }
+        put :update, params: { id: collection, collection: { creator: ['Emily'] } }
         collection.reload
         expect(collection.creator).to eq ['Emily']
       end
 
       it "removes blank strings from params before updating Collection metadata" do
-        put :update, id: collection, collection: {
-          title: ["My Next Collection "], creator: [""]
+        put :update, params: {
+          id: collection,
+          collection: {
+            title: ["My Next Collection "],
+            creator: [""]
+          }
         }
         expect(assigns[:collection].title).to eq ["My Next Collection "]
         expect(assigns[:collection].creator).to eq []
@@ -143,17 +164,17 @@ describe CollectionsController do
 
       it "returns the collection and its members" do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-        get :show, id: collection
+        get :show, params: { id: collection }
         expect(response).to be_successful
         expect(assigns[:presenter]).to be_kind_of Sufia::CollectionPresenter
-        expect(assigns[:presenter].title).to eq collection.title
+        expect(assigns[:presenter].title).to match_array collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
       end
 
       context "and searching" do
         it "returns some works" do
           # "/collections/4m90dv529?utf8=%E2%9C%93&cq=King+Louie&sort="
-          get :show, id: collection, cq: "Third"
+          get :show, params: { id: collection, cq: "Third" }
 
           expect(assigns[:member_docs].map(&:id)).to match_array [asset3].map(&:id)
         end
@@ -162,21 +183,21 @@ describe CollectionsController do
       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: collection
+          get :show, params: { id: collection }
           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 Collections', Sufia::Engine.routes.url_helpers.dashboard_collections_path)
           expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id))
-          get :show, id: collection
+          get :show, params: { id: collection }
           expect(response).to be_successful
         end
       end
@@ -184,7 +205,7 @@ describe CollectionsController do
 
     context "not signed in" do
       it "does not show me files in the collection" do
-        get :show, id: collection
+        get :show, params: { id: collection }
         expect(assigns[:member_docs].count).to eq 0
       end
     end
@@ -194,7 +215,7 @@ describe CollectionsController do
     before { sign_in user }
 
     it "is successful" do
-      get :edit, id: collection
+      get :edit, params: { id: collection }
       expect(response).to be_success
       expect(assigns[:form]).to be_instance_of Sufia::Forms::CollectionForm
       expect(flash[:notice]).to be_nil
@@ -203,21 +224,21 @@ describe CollectionsController do
     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: collection
+        get :edit, params: { id: collection }
         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 Collections', Sufia::Engine.routes.url_helpers.dashboard_collections_path)
         expect(controller).to receive(:add_breadcrumb).with(I18n.t("sufia.collection.browse_view"), collection_path(collection.id))
-        get :edit, id: collection
+        get :edit, params: { id: collection }
         expect(response).to be_successful
       end
     end