sufia 7.2.0 → 7.3.0.rc1

data/spec/controllers/collections_controller_spec.rb

@@ -211,6 +211,45 @@ describe CollectionsController do
     end
   end
 
+  describe "#delete" do
+    before { sign_in user }
+    context "when it succeeds" do
+      it "redirects to My Collections" do
+        delete :destroy, params: { id: collection }
+        expect(response).to have_http_status(:found)
+        expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.dashboard_collections_path)
+        expect(flash[:notice]).to eq "Collection #{collection.id} was successfully deleted"
+      end
+
+      it "returns json" do
+        delete :destroy, params: { format: :json, id: collection }
+        expect(response).to have_http_status(:success)
+        json = JSON.parse(response.body)
+        json_description = json['description']
+        expect(json_description).to eq "Collection #{collection.id} was successfully deleted"
+      end
+    end
+    context "when an error occurs" do
+      before do
+        allow_any_instance_of(Collection).to receive(:destroy).and_return(nil)
+      end
+      it "renders the edit view" do
+        delete :destroy, params: { id: collection }
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to render_template(:edit)
+        expect(flash[:notice]).to eq "Collection #{collection.id} could not be deleted"
+      end
+
+      it "returns json" do
+        delete :destroy, params: { format: :json, id: collection }
+        expect(response).to have_http_status(:unprocessable_entity)
+        json = JSON.parse(response.body)
+        json_description = json['description']
+        expect(json_description).to eq "Collection #{collection.id} could not be deleted"
+      end
+    end
+  end
+
   describe "#edit" do
     before { sign_in user }
 

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -44,7 +44,9 @@ describe CurationConcerns::GenericWorksController do
       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))
+        expect(controller).to receive(:add_breadcrumb).with(work.to_s, Rails.application.routes.url_helpers.curation_concerns_generic_work_path(work))
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t("sufia.works.edit.breadcrumb"), String)
+
         get :edit, params: { id: work }
         expect(response).to be_successful
       end
@@ -186,4 +188,23 @@ describe CurationConcerns::GenericWorksController do
       end
     end
   end
+
+  describe "#delete" do
+    let!(:work) { create(:work, title: ['test title'], user: user) }
+
+    context "after deletion" do
+      it "redirects to My Works" do
+        delete :destroy, params: { id: work }
+        expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.dashboard_works_path)
+        expect(flash[:notice]).to eq "Deleted test title"
+      end
+
+      it "returns json" do
+        delete :destroy, params: { format: :json, id: work }
+        json = JSON.parse(response.body)
+        json_description = json['description']
+        expect(json_description).to eq "Deleted #{work.id}"
+      end
+    end
+  end
 end

data/spec/controllers/dashboard_controller_spec.rb

@@ -18,15 +18,7 @@ describe DashboardController, type: :controller do
       get :index
       expect(response).to be_successful
       expect(assigns(:user)).to eq(user)
-    end
-
-    it "gathers the user's recent activity" do
-      get :index
       expect(assigns(:activity)).to be_empty
-    end
-
-    it "gathers the user's notifications" do
-      get :index
       expect(assigns(:notifications)).to be_truthy
     end
 

data/spec/controllers/depositors_controller_spec.rb

@@ -2,7 +2,7 @@ describe DepositorsController do
   let(:user) { create(:user) }
   let(:grantee) { create(:user) }
 
-  describe "as a logged in user" do
+  context "as a logged in user" do
     before do
       sign_in user
     end
@@ -51,7 +51,7 @@ describe DepositorsController do
     end
   end
 
-  describe "as a user without access" do
+  context "as a user without access" do
     before do
       sign_in create(:user)
     end

data/spec/controllers/downloads_controller_spec.rb

@@ -54,6 +54,7 @@ describe DownloadsController, type: :controller do
     end
 
     describe "when not logged in as reader" do
+      let(:default_image) { ActionController::Base.helpers.image_path 'default.png' }
       before do
         sign_in create(:user)
       end
@@ -61,8 +62,7 @@ describe DownloadsController, type: :controller do
       describe "show" do
         it "denies access" do
           get :show, params: { id: file }
-          expect(response).to redirect_to root_path
-          expect(flash[:alert]).to eq 'You are not authorized to access this page.'
+          expect(response).to redirect_to default_image
         end
       end
     end

data/spec/controllers/my/collections_controller_spec.rb

@@ -26,5 +26,10 @@ describe My::CollectionsController, type: :controller do
         expect(assigns[:document_list].map(&:id)).to contain_exactly(first_collection.id)
       end
     end
+
+    describe "#search_facet_path" do
+      subject { controller.send(:search_facet_path, id: 'keyword_sim') }
+      it { is_expected.to eq "/dashboard/collections/facet/keyword_sim" }
+    end
   end
 end

data/spec/controllers/my/shares_controller_spec.rb

@@ -38,4 +38,9 @@ describe My::SharesController, type: :controller do
       end
     end
   end
+
+  describe "#search_facet_path" do
+    subject { controller.send(:search_facet_path, id: 'keyword_sim') }
+    it { is_expected.to eq "/dashboard/shares/facet/keyword_sim" }
+  end
 end

data/spec/controllers/my/works_controller_spec.rb

@@ -40,4 +40,9 @@ describe My::WorksController, type: :controller do
       expect(assigns(:add_files_to_collection)).to eql('12345')
     end
   end
+
+  describe "#search_facet_path" do
+    subject { controller.send(:search_facet_path, id: 'keyword_sim') }
+    it { is_expected.to eq "/dashboard/works/facet/keyword_sim" }
+  end
 end

data/spec/controllers/stats_controller_spec.rb

@@ -59,7 +59,7 @@ describe StatsController do
       expect(Sufia::WorkUsage).to receive(:new).with(work.id).and_return(usage)
       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.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.work.browse_view'), main_app.curation_concerns_generic_work_path(work))
+      expect(controller).to receive(:add_breadcrumb).with("Test title", main_app.curation_concerns_generic_work_path(work))
       get :work, params: { id: work }
       expect(response).to be_success
       expect(response).to render_template('stats/work')

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

@@ -55,9 +55,9 @@ describe Sufia::Admin::AdminSetsController do
     end
 
     describe "#create" do
-      let(:service) { instance_double(Sufia::AdminSetService) }
+      let(:service) { instance_double(Sufia::AdminSetCreateService) }
       before do
-        allow(Sufia::AdminSetService).to receive(:new)
+        allow(Sufia::AdminSetCreateService).to receive(:new)
           .with(AdminSet, user)
           .and_return(service)
       end
@@ -66,7 +66,8 @@ describe Sufia::Admin::AdminSetsController do
         it 'creates file sets' do
           expect(service).to receive(:create).and_return(true)
           post :create, params: { admin_set: { title: 'Test title',
-                                               description: 'test description' } }
+                                               description: 'test description',
+                                               workflow_name: 'default' } }
           expect(response).to be_redirect
         end
       end
@@ -108,15 +109,42 @@ describe Sufia::Admin::AdminSetsController do
 
     describe "#update" do
       let(:admin_set) { create(:admin_set, edit_users: [user]) }
+      let(:permission_template) { Sufia::PermissionTemplate.find_or_create_by(admin_set_id: admin_set.id) }
       it 'updates a record' do
         # Prevent a save which causes Fedora to complain it doesn't know the referenced node.
         expect_any_instance_of(AdminSet).to receive(:save).and_return(true)
         patch :update, params: { id: admin_set,
-                                 admin_set: { title: "Improved title",
-                                              thumbnail_id: "mw22v559x" } }
+                                 admin_set: { title: "Improved title", thumbnail_id: "mw22v559x", workflow_name: "one_step_mediated_deposit" } }
         expect(response).to be_redirect
         expect(assigns[:admin_set].title).to eq ['Improved title']
         expect(assigns[:admin_set].thumbnail_id).to eq 'mw22v559x'
+        expect(permission_template.workflow_name).to eq 'one_step_mediated_deposit'
+      end
+    end
+
+    describe "#destroy" do
+      let(:admin_set) { create(:admin_set, edit_users: [user]) }
+      context "with empty admin set" do
+        it "deletes the admin set" do
+          delete :destroy, params: { id: admin_set }
+          expect(response).to have_http_status(:found)
+          expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.admin_admin_sets_path)
+          expect(flash[:notice]).to eq "Administrative set successfully deleted"
+        end
+      end
+      context "with a non-empty admin set" do
+        let(:work) { create(:generic_work, user: user) }
+        before do
+          admin_set.members << work
+          admin_set.reload
+        end
+        it "detaches the works and deletes the admin set" do
+          delete :destroy, params: { id: admin_set }
+          expect(response).to have_http_status(:found)
+          expect(response).to redirect_to(Sufia::Engine.routes.url_helpers.admin_admin_sets_path)
+          expect(flash[:notice]).to eq "Administrative set successfully deleted"
+          expect(GenericWork.exists?(work.id)).to be true
+        end
       end
     end
   end

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Admin::PermissionTemplateAccessesController do
+  routes { Sufia::Engine.routes }
+  before do
+    sign_in create(:user)
+  end
+  let(:sufia) { Sufia::Engine.routes.url_helpers }
+  let(:permission_template_access) { create(:permission_template_access) }
+  let(:admin_set_id) { permission_template_access.permission_template.admin_set_id }
+
+  context "without admin privleges" do
+    describe "destroy" do
+      before do
+        allow(controller.current_ability).to receive(:test_edit).with(admin_set_id).and_return(false)
+      end
+      it "is unauthorized" do
+        delete :destroy, params: { id: permission_template_access }
+        expect(response).to be_unauthorized
+      end
+    end
+  end
+
+  context "when signed in as an admin" do
+    describe "update" do
+      it "is successful" do
+        expect(controller).to receive(:authorize!).with(:destroy, permission_template_access)
+        expect do
+          delete :destroy, params: { id: permission_template_access }
+        end.to change { Sufia::PermissionTemplateAccess.count }.by(-1)
+        expect(response).to redirect_to(sufia.edit_admin_admin_set_path(admin_set_id, anchor: 'participants'))
+        expect(flash[:notice]).to eq 'Permissions updated'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Admin::PermissionTemplatesController do
+  routes { Sufia::Engine.routes }
+  before do
+    sign_in create(:user)
+  end
+  let(:sufia) { Sufia::Engine.routes.url_helpers }
+
+  context "without admin privleges" do
+    describe "update" do
+      let(:permission_template) { create(:permission_template) }
+
+      it "is unauthorized" do
+        put :update, params: { id: permission_template, admin_set_id: 999 }
+        expect(response).to be_unauthorized
+      end
+    end
+  end
+
+  let(:form) { instance_double(Sufia::Forms::PermissionTemplateForm) }
+  before do
+    allow(Sufia::Forms::PermissionTemplateForm).to receive(:new).with(permission_template).and_return(form)
+  end
+
+  context "when signed in as an admin" do
+    describe "update participants" do
+      let(:admin_set) { create(:admin_set) }
+      let!(:permission_template) { Sufia::PermissionTemplate.create!(admin_set_id: admin_set.id) }
+      let(:grant_attributes) { [{ "agent_type" => "user", "agent_id" => "bob", "access" => "view" }] }
+      let(:input_params) do
+        { admin_set_id: admin_set.id,
+          sufia_permission_template: form_attributes }
+      end
+      let(:form_attributes) { { visibility: 'open', access_grants_attributes: grant_attributes } }
+
+      it "is successful" do
+        expect(controller).to receive(:authorize!).with(:update, permission_template)
+        expect(form).to receive(:update).with(ActionController::Parameters.new(form_attributes).permit!)
+        put :update, params: input_params
+        expect(response).to redirect_to(sufia.edit_admin_admin_set_path(admin_set, anchor: 'participants'))
+        expect(flash[:notice]).to eq 'Permissions updated'
+      end
+    end
+  end
+end

data/spec/controllers/sufia/admin_controller_spec.rb

@@ -2,12 +2,18 @@ require 'spec_helper'
 
 RSpec.describe Sufia::AdminController do
   describe '#show' do
+    let(:service) { instance_double(Sufia::AdminSetService, search_results_with_work_count: results) }
+    let(:results) { instance_double(Array) }
+
     before do
       allow(controller).to receive(:authorize!).with(:read, :admin_dashboard).and_return(true)
+      allow(Sufia::AdminSetService).to receive(:new).and_return(service)
     end
+
     it "is successful" do
       get :show
       expect(response).to be_success
+      expect(assigns[:admin_set_rows]).to eq results
     end
   end
 end

data/spec/controllers/sufia/batch_uploads_controller_spec.rb

@@ -1,6 +1,31 @@
 describe Sufia::BatchUploadsController do
   let(:user) { create(:user) }
+  let(:expected_types) do
+    { '1' => 'Article',
+      '2' => ['Article', 'Text'] }
+  end
+  let(:expected_individual_params) do
+    { '1' => 'foo',
+      '2' => 'bar' }
+  end
+  let(:expected_shared_params) do
+    { 'keyword' => [], 'visibility' => 'open', :model => 'GenericWork' }
+  end
+  let(:batch_upload_item) do
+    { keyword: [""], visibility: 'open', payload_concern: 'GenericWork' }
+  end
+  let(:post_params) do
+    {
+      title: expected_individual_params,
+      resource_type: expected_types,
+      uploaded_files: ['1', '2'],
+      batch_upload_item: batch_upload_item
+    }
+  end
+
   before do
+    # allow(user).to receive(:can?).with(:create, GenericWork).and_return(true)
+    # allow(user).to receive(:can?).with(:create, Atlas).and_return(true)
     sign_in user
   end
 
@@ -14,59 +39,33 @@ 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,
                 expected_individual_params,
                 expected_types,
-                ['1'],
+                ['1', '2'],
                 expected_shared_params,
-                CurationConcerns::Operation)
-        post :create, params: {
-          title: { '1' => 'foo' },
-          resource_type: { '1' => 'Article' },
-          uploaded_files: ['1'],
-          batch_upload_item: { keyword: [""], visibility: 'open' }
-        }
+                a_kind_of(Sufia::BatchCreateOperation))
+        post :create, params: post_params
         expect(response).to redirect_to Sufia::Engine.routes.url_helpers.dashboard_works_path
         expect(flash[:notice]).to include("Your files are being processed")
       end
     end
 
     describe "when submiting works on behalf of another user" do
+      let(:batch_upload_item) do
+        {
+          payload_concern: Atlas,
+          permissions_attributes: [
+            { type: "group", name: "public", access: "read" }
+          ],
+          on_behalf_of: 'elrayle'
+        }
+      end
       it "redirects to my shares page" do
         allow(BatchCreateJob).to receive(:perform_later)
-        post :create, params: {
-          batch_upload_item: {
-            permissions_attributes: [
-              { type: "group", name: "public", access: "read" }
-            ],
-            on_behalf_of: 'elrayle'
-          },
-          uploaded_files: ['1']
-        }
+        post :create, params: post_params
         expect(response).to redirect_to Sufia::Engine.routes.url_helpers.dashboard_shares_path
       end
     end
@@ -75,9 +74,7 @@ describe Sufia::BatchUploadsController do
   describe "attributes_for_actor" do
     subject { controller.send(:attributes_for_actor) }
     before do
-      controller.params = { title: { '1' => 'foo' },
-                            uploaded_files: ['1'],
-                            batch_upload_item: { keyword: [""], visibility: 'open' } }
+      controller.params = post_params
     end
     let(:expected_shared_params) do
       if Rails.version < '5.0.0'
@@ -87,6 +84,7 @@ describe Sufia::BatchUploadsController do
       end
     end
     it "excludes uploaded_files and title" do
+      expect(subject).not_to include('title', :title, 'uploaded_files', :uploaded_files)
       expect(subject).to eq expected_shared_params
     end
   end