sufia 7.1.0 → 7.2.0

data/spec/controllers/sufia/admin/features_controller_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Admin::FeaturesController do
+  describe "#index" do
+    before do
+      sign_in user
+    end
+    let(:user) { create(:user) }
+
+    context "when not authorized" do
+      it "redirects away" do
+        get :index
+        expect(response).to redirect_to root_path
+      end
+    end
+
+    context "when authorized" do
+      before do
+        allow(controller).to receive_messages(current_user: user)
+        expect(user).to receive(:groups).and_return(['admin', 'registered'])
+      end
+
+      it "is successful" do
+        get :index
+        expect(response).to be_success
+      end
+    end
+  end
+end

data/spec/controllers/{admin → sufia/admin}/stats_controller_spec.rb

@@ -1,10 +1,10 @@
-describe Admin::StatsController, type: :controller do
+describe Sufia::Admin::StatsController, type: :controller do
   let(:user) { create(:user) }
 
   context "a non admin" do
-    describe "#index" do
+    describe "#show" do
       it 'is unauthorized' do
-        get :index
+        get :show
         expect(response).to be_redirect
       end
     end
@@ -15,10 +15,14 @@ describe Admin::StatsController, type: :controller do
       allow(controller).to receive(:authorize!).and_return(true)
     end
 
-    describe "#index" do
+    describe "#show" do
+      let(:expected_params) do
+        Rails.version < '5.0.0' ? {} : ActionController::Parameters.new
+      end
+
       it 'allows an authorized user to view the page' do
-        expect(Sufia::AdminStatsPresenter).to receive(:new).with({}, 5).and_call_original
-        get :index
+        expect(Sufia::AdminStatsPresenter).to receive(:new).with(expected_params, 5).and_call_original
+        get :show
         expect(response).to be_success
         expect(assigns[:presenter]).to be_kind_of Sufia::AdminStatsPresenter
       end

data/spec/controllers/sufia/admin/strategies_controller_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Admin::StrategiesController do
+  describe "#update" do
+    before do
+      sign_in user
+    end
+    let(:user) { create(:user) }
+    let(:strategy) { Flipflop::Strategies::ActiveRecordStrategy.new(class: Sufia::Feature).key }
+
+    context "when not authorized" do
+      it "redirects away" do
+        patch :update, params: { feature_id: '123', id: strategy }
+        expect(response).to redirect_to root_path
+      end
+    end
+
+    context "when authorized" do
+      before do
+        allow(controller).to receive_messages(current_user: user)
+        expect(user).to receive(:groups).and_return(['admin', 'registered'])
+      end
+
+      it "is successful" do
+        patch :update, params: { feature_id: '123', id: strategy }
+        expect(response).to redirect_to Sufia::Engine.routes.url_helpers.admin_features_path
+      end
+    end
+  end
+end

data/spec/controllers/sufia/admin_controller_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::AdminController do
+  describe '#show' do
+    before do
+      allow(controller).to receive(:authorize!).with(:read, :admin_dashboard).and_return(true)
+    end
+    it "is successful" do
+      get :show
+      expect(response).to be_success
+    end
+  end
+end

data/spec/controllers/sufia/admin_sets_controller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::AdminSetsController do
+  describe "#index" do
+    let!(:admin_set) { create(:admin_set, :public) }
+    before do
+      create(:collection, :public) # This should not be returned
+    end
+
+    it "returns only admin sets" do
+      get :index
+      expect(response).to be_success
+      expect(assigns[:document_list].map(&:id)).to match_array [admin_set.id]
+    end
+  end
+
+  describe "#show" do
+    let(:admin_set) { create(:admin_set, :public) }
+    let!(:work) { create(:work, :public, admin_set: admin_set) }
+
+    it "returns a presenter and members" do
+      get :show, params: { id: admin_set }
+      expect(response).to be_success
+      expect(assigns[:presenter].id).to eq admin_set.id
+      expect(assigns[:member_docs].map(&:id)).to eq [work.id]
+    end
+  end
+end

data/spec/controllers/sufia/batch_uploads_controller_spec.rb

@@ -14,18 +14,42 @@ describe Sufia::BatchUploadsController do
 
   describe "#create" do
     context "enquing a update job" do
+      let(:expected_types) do
+        if Rails.version < '5.0.0'
+          { '1' => 'Article' }
+        else
+          ActionController::Parameters.new('1' => 'Article')
+        end
+      end
+      let(:expected_individual_params) do
+        if Rails.version < '5.0.0'
+          { '1' => 'foo' }
+        else
+          ActionController::Parameters.new('1' => 'foo')
+        end
+      end
+      let(:expected_shared_params) do
+        if Rails.version < '5.0.0'
+          { keyword: [], visibility: 'open' }
+        else
+          ActionController::Parameters.new(keyword: [], visibility: 'open').permit!
+        end
+      end
+
       it "is successful" do
         expect(BatchCreateJob).to receive(:perform_later)
           .with(user,
-                { '1' => 'foo' },
-                { '1' => 'Article' },
+                expected_individual_params,
+                expected_types,
                 ['1'],
-                { keyword: [], visibility: 'open' },
+                expected_shared_params,
                 CurationConcerns::Operation)
-        post :create, title: { '1' => 'foo' },
-                      resource_type: { '1' => 'Article' },
-                      uploaded_files: ['1'],
-                      batch_upload_item: { keyword: [""], visibility: 'open' }
+        post :create, params: {
+          title: { '1' => 'foo' },
+          resource_type: { '1' => 'Article' },
+          uploaded_files: ['1'],
+          batch_upload_item: { keyword: [""], visibility: 'open' }
+        }
         expect(response).to redirect_to Sufia::Engine.routes.url_helpers.dashboard_works_path
         expect(flash[:notice]).to include("Your files are being processed")
       end
@@ -34,14 +58,15 @@ describe Sufia::BatchUploadsController do
     describe "when submiting works on behalf of another user" do
       it "redirects to my shares page" do
         allow(BatchCreateJob).to receive(:perform_later)
-        post :create,
-             batch_upload_item: {
-               permissions_attributes: [
-                 { type: "group", name: "public", access: "read" }
-               ],
-               on_behalf_of: 'elrayle'
-             },
-             uploaded_files: ['1']
+        post :create, params: {
+          batch_upload_item: {
+            permissions_attributes: [
+              { type: "group", name: "public", access: "read" }
+            ],
+            on_behalf_of: 'elrayle'
+          },
+          uploaded_files: ['1']
+        }
         expect(response).to redirect_to Sufia::Engine.routes.url_helpers.dashboard_shares_path
       end
     end
@@ -54,9 +79,15 @@ describe Sufia::BatchUploadsController do
                             uploaded_files: ['1'],
                             batch_upload_item: { keyword: [""], visibility: 'open' } }
     end
+    let(:expected_shared_params) do
+      if Rails.version < '5.0.0'
+        { 'keyword' => [], 'visibility' => 'open' }
+      else
+        ActionController::Parameters.new(keyword: [], visibility: 'open').permit!
+      end
+    end
     it "excludes uploaded_files and title" do
-      expect(subject).to eq('keyword' => [],
-                            'visibility' => 'open')
+      expect(subject).to eq expected_shared_params
     end
   end
 end

data/spec/controllers/sufia/homepage_controller_spec.rb

@@ -77,6 +77,27 @@ describe Sufia::HomepageController, type: :controller do
       end
     end
 
+    context "with admin sets enabled" do
+      let(:admin_set_doc) do
+        {
+          "system_create_dtsi" => "2016-09-12T19:36:51Z",
+          "has_model_ssim" => ["AdminSet"],
+          "id" => "w3763695z",
+          "title_tesim" => ["A completely unique name"],
+          "description_tesim" => ["A substantial description"],
+          "thumbnail_path_ss" => "/assets/admin-set-thumb.png",
+          "read_access_group_ssim" => ["public"]
+        }
+      end
+
+      it "sets the admin_sets" do
+        ActiveFedora::SolrService.add(admin_set_doc, commit: true)
+        get :index
+        expect(response).to be_success
+        expect(assigns(:admin_sets).map(&:id)).to eq [admin_set_doc["id"]]
+      end
+    end
+
     it "sets the presenter" do
       get :index
       expect(response).to be_success

data/spec/controllers/sufia/trophies_controller_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Sufia::TrophiesController do
         sign_in user
       end
       it "creates a trophy for a work" do
-        post :toggle_trophy, id: work_id
+        post :toggle_trophy, params: { id: work_id }
         expect(response).to be_success
         json = JSON.parse(response.body)
         expect(json['user_id']).to eq user.id
@@ -19,7 +19,7 @@ RSpec.describe Sufia::TrophiesController do
 
     context "for a work that we don't have edit access on" do
       it "does not create a trophy" do
-        post :toggle_trophy, id: work_id
+        post :toggle_trophy, params: { id: work_id }
         expect(response).not_to be_success
       end
     end

data/spec/controllers/sufia/uploads_controller_spec.rb

@@ -9,7 +9,7 @@ describe Sufia::UploadsController do
         sign_in user
       end
       it "is successful" do
-        post :create, files: [file], format: 'json'
+        post :create, params: { files: [file], format: 'json' }
         expect(response).to be_success
         expect(assigns(:upload)).to be_kind_of Sufia::UploadedFile
         expect(assigns(:upload)).to be_persisted
@@ -19,7 +19,7 @@ describe Sufia::UploadsController do
 
     context "when not signed in" do
       it "is unauthorized" do
-        post :create, files: [file], format: 'json'
+        post :create, params: { files: [file], format: 'json' }
         expect(response.status).to eq 401
       end
     end
@@ -34,21 +34,21 @@ describe Sufia::UploadsController do
         sign_in user
       end
       it "destroys the uploaded file" do
-        delete :destroy, id: uploaded_file
+        delete :destroy, params: { id: uploaded_file }
         expect(response.status).to eq 204
         expect(assigns[:upload]).to be_destroyed
         expect(File.exist?(uploaded_file.file.file.file)).to be false
       end
 
       it "doesn't destroy files that don't belong to me" do
-        delete :destroy, id: Sufia::UploadedFile.create(file: file)
+        delete :destroy, params: { id: Sufia::UploadedFile.create(file: file) }
         expect(response.status).to eq 401
       end
     end
 
     context "when not signed in" do
       it "is redirected to sign in" do
-        delete :destroy, id: uploaded_file
+        delete :destroy, params: { id: uploaded_file }
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end

data/spec/controllers/tinymce_assets_controller_spec.rb

@@ -9,10 +9,10 @@ describe TinymceAssetsController, type: :controller do
       before { expect(controller).to receive(:authorize!).with(:create, TinymceAsset).and_return(true) }
 
       it "uploads the file" do
-        expect {
-          post :create, file: file
+        expect do
+          post :create, params: { file: file }
           expect(response).to be_successful
-        }.to change { TinymceAsset.count }.by(1)
+        end.to change { TinymceAsset.count }.by(1)
 
         json = JSON.parse(response.body)
         expect(json).to eq("image" => { "url" => "/uploads/tinymce_asset/file/1/world.png" })
@@ -21,7 +21,7 @@ describe TinymceAssetsController, type: :controller do
 
     context "as a user who can't upload" do
       it "is unauthorized" do
-        post :create, file: file
+        post :create, params: { file: file }
         expect(response.code).to eq '401'
         expect(response).to render_template 'unauthorized'
       end
@@ -30,7 +30,7 @@ describe TinymceAssetsController, type: :controller do
 
   context "when not logged in" do
     it "redirects to root path" do
-      post :create, file: file
+      post :create, params: { file: file }
       expect(response).to redirect_to main_app.new_user_session_path
     end
   end

data/spec/controllers/transfers_controller_spec.rb

@@ -59,7 +59,7 @@ describe TransfersController, type: :controller do
       context 'when user is the depositor' do
         it "is successful" do
           sign_in user
-          get :new, id: work.id
+          get :new, params: { id: work.id }
           expect(response).to be_success
           expect(assigns[:work]).to eq(work)
           expect(assigns[:proxy_deposit_request]).to be_kind_of ProxyDepositRequest
@@ -72,23 +72,30 @@ describe TransfersController, type: :controller do
       let(:work) { create(:work, user: user) }
       it "is successful" do
         allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
-        expect {
-          post :create, id: work.id, proxy_deposit_request: { transfer_to: another_user.user_key }
-        }.to change(ProxyDepositRequest, :count).by(1)
+        expect do
+          post :create, params: {
+            id: work.id,
+            proxy_deposit_request: {
+              transfer_to: another_user.user_key,
+              sender_comment: 'Hi mom!'
+            }
+          }
+        end.to change(ProxyDepositRequest, :count).by(1)
         expect(response).to redirect_to routes.url_helpers.transfers_path
         expect(flash[:notice]).to eq('Transfer request created')
         proxy_request = another_user.proxy_deposit_requests.first
         expect(proxy_request.work_id).to eq(work.id)
         expect(proxy_request.sending_user).to eq(user)
+        expect(proxy_request.sender_comment).to eq 'Hi mom!'
         # AND A NOTIFICATION SHOULD HAVE BEEN CREATED
         notification = another_user.reload.mailbox.inbox[0].messages[0]
         expect(notification.subject).to eq("Ownership Change Request")
         expect(notification.body).to eq("<a href=\"/users/#{user.user_key}\">#{user.name}</a> wants to transfer a work to you. Review all <a href=\"#{routes.url_helpers.transfers_path}\">transfer requests</a>")
       end
       it "gives an error if the user is not found" do
-        expect {
-          post :create, id: work.id, proxy_deposit_request: { transfer_to: 'foo' }
-        }.not_to change(ProxyDepositRequest, :count)
+        expect do
+          post :create, params: { id: work.id, proxy_deposit_request: { transfer_to: 'foo' } }
+        end.not_to change(ProxyDepositRequest, :count)
         expect(assigns[:proxy_deposit_request].errors[:transfer_to]).to eq(['must be an existing user'])
         expect(response).to redirect_to(root_path)
       end
@@ -104,21 +111,21 @@ describe TransfersController, type: :controller do
           end
         end
         it "is successful when retaining access rights" do
-          put :accept, id: user.proxy_deposit_requests.first
+          put :accept, params: { id: user.proxy_deposit_requests.first }
           expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
-          expect(incoming_work.reload.edit_users).to eq([another_user.user_key, user.user_key])
+          expect(incoming_work.reload.edit_users).to match_array [another_user.user_key, user.user_key]
         end
         it "is successful when resetting access rights" do
-          put :accept, id: user.proxy_deposit_requests.first, reset: true
+          put :accept, params: { id: user.proxy_deposit_requests.first, reset: true }
           expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
           expect(incoming_work.reload.edit_users).to eq([user.user_key])
         end
         it "handles sticky requests" do
-          put :accept, id: user.proxy_deposit_requests.first, sticky: true
+          put :accept, params: { id: user.proxy_deposit_requests.first, sticky: true }
           expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
@@ -135,7 +142,7 @@ describe TransfersController, type: :controller do
           end
         end
         it "does not allow me" do
-          put :accept, id: another_user.proxy_deposit_requests.first
+          put :accept, params: { id: another_user.proxy_deposit_requests.first }
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq("You are not authorized to access this page.")
         end
@@ -152,7 +159,7 @@ describe TransfersController, type: :controller do
           end
         end
         it "is successful" do
-          put :reject, id: user.proxy_deposit_requests.first
+          put :reject, params: { id: user.proxy_deposit_requests.first }
           expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer rejected")
           expect(assigns[:proxy_deposit_request].status).to eq('rejected')
@@ -168,7 +175,7 @@ describe TransfersController, type: :controller do
           end
         end
         it "does not allow me" do
-          put :reject, id: another_user.proxy_deposit_requests.first
+          put :reject, params: { id: another_user.proxy_deposit_requests.first }
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq("You are not authorized to access this page.")
         end
@@ -185,7 +192,7 @@ describe TransfersController, type: :controller do
           end
         end
         it "is successful" do
-          delete :destroy, id: another_user.proxy_deposit_requests.first
+          delete :destroy, params: { id: another_user.proxy_deposit_requests.first }
           expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer canceled")
         end
@@ -200,7 +207,7 @@ describe TransfersController, type: :controller do
           end
         end
         it "does not allow me" do
-          delete :destroy, id: user.proxy_deposit_requests.first
+          delete :destroy, params: { id: user.proxy_deposit_requests.first }
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq("You are not authorized to access this page.")
         end