hyrax 2.0.3 → 2.1.0.beta1

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

@@ -5,12 +5,12 @@ RSpec.describe Hyrax::Admin::PermissionTemplateAccessesController do
   end
   let(:hyrax) { Hyrax::Engine.routes.url_helpers }
   let(:permission_template_access) { create(:permission_template_access) }
-  let(:admin_set_id) { permission_template_access.permission_template.admin_set_id }
+  let(:source_id) { permission_template_access.permission_template.source_id }
 
   describe "destroy" do
     context "without admin privleges" do
       before do
-        allow(controller.current_ability).to receive(:test_edit).with(admin_set_id).and_return(false)
+        allow(controller.current_ability).to receive(:test_edit).with(source_id).and_return(false)
       end
       it "is unauthorized" do
         delete :destroy, params: { id: permission_template_access }
@@ -19,6 +19,7 @@ RSpec.describe Hyrax::Admin::PermissionTemplateAccessesController do
     end
 
     context "when signed in as an admin" do
+      # TODO: Need test that shows delete of admin group form depositors and viewers is allowed
       let(:permission_template_access) do
         create(:permission_template_access,
                :manage,
@@ -26,35 +27,73 @@ RSpec.describe Hyrax::Admin::PermissionTemplateAccessesController do
                agent_type: agent_type,
                agent_id: agent_id)
       end
-      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
-      let(:admin_set) { create(:admin_set, edit_users: ['Liz']) }
-
-      context 'when deleting the admin users group' do
-        let(:agent_type) { 'group' }
-        let(:agent_id) { 'admin' }
-
-        it "fails" do
-          expect(controller).to receive(:authorize!).with(:destroy, permission_template_access)
-          expect do
-            delete :destroy, params: { id: permission_template_access }
-          end.not_to change { Hyrax::PermissionTemplateAccess.count }
-          expect(response).to redirect_to(hyrax.edit_admin_admin_set_path(admin_set_id, locale: 'en', anchor: 'participants'))
-          expect(flash[:notice]).not_to eq I18n.t('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
-          expect(flash[:alert]).to eq 'The repository administrators group cannot be removed'
+
+      context 'when source is an admin set' do
+        let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
+        let(:admin_set) { create(:admin_set, edit_users: ['Liz']) }
+
+        context 'when deleting the admin users group' do
+          let(:agent_type) { 'group' }
+          let(:agent_id) { 'admin' }
+
+          it "is fails" do
+            expect(controller).to receive(:authorize!).with(:destroy, permission_template_access)
+            expect do
+              delete :destroy, params: { id: permission_template_access }
+            end.not_to change { Hyrax::PermissionTemplateAccess.count }
+            expect(response).to redirect_to(hyrax.edit_admin_admin_set_path(source_id, locale: 'en', anchor: 'participants'))
+            expect(flash[:notice]).not_to eq I18n.t('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
+            expect(flash[:alert]).to eq 'The repository administrators group cannot be removed'
+          end
+        end
+
+        context 'with deleting any agent other than the admin users group' do
+          let(:agent_type) { 'user' }
+          let(:agent_id) { 'Liz' }
+
+          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 { Hyrax::PermissionTemplateAccess.count }.by(-1)
+            expect(response).to redirect_to(hyrax.edit_admin_admin_set_path(source_id, locale: 'en', anchor: 'participants'))
+            expect(flash[:notice]).to eq(I18n.t('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
+            expect(admin_set.reload.edit_users).to be_empty
+          end
         end
       end
-      context 'with deleting any agent other than the admin users group' do
-        let(:agent_type) { 'user' }
-        let(:agent_id) { 'Liz' }
-
-        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 { Hyrax::PermissionTemplateAccess.count }.by(-1)
-          expect(response).to redirect_to(hyrax.edit_admin_admin_set_path(admin_set_id, locale: 'en', anchor: 'participants'))
-          expect(flash[:notice]).to eq(I18n.t('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
-          expect(admin_set.reload.edit_users).to be_empty
+
+      context 'when source is a collection' do
+        let(:permission_template) { create(:permission_template, source_id: collection.id) }
+        let(:collection) { create(:collection, edit_users: ['Liz']) }
+
+        context 'when deleting the admin users group' do
+          let(:agent_type) { 'group' }
+          let(:agent_id) { 'admin' }
+
+          it "fails" do
+            expect(controller).to receive(:authorize!).with(:destroy, permission_template_access)
+            expect do
+              delete :destroy, params: { id: permission_template_access }
+            end.not_to change { Hyrax::PermissionTemplateAccess.count }
+            expect(response).to redirect_to(hyrax.edit_dashboard_collection_path(source_id, locale: 'en', anchor: 'sharing'))
+            expect(flash[:notice]).not_to eq I18n.t('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices')
+            expect(flash[:alert]).to eq 'The repository administrators group cannot be removed'
+          end
+        end
+
+        context 'with deleting any agent other than the admin users group' do
+          let(:agent_type) { 'user' }
+          let(:agent_id) { 'Liz' }
+
+          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 { Hyrax::PermissionTemplateAccess.count }.by(-1)
+            expect(response).to redirect_to(hyrax.edit_dashboard_collection_path(source_id, locale: 'en', anchor: 'sharing'))
+            expect(flash[:notice]).to eq(I18n.t('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices'))
+          end
         end
       end
     end

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

@@ -11,11 +11,22 @@ RSpec.describe Hyrax::Admin::PermissionTemplatesController do
     describe "update" do
       let(:permission_template) { create(:permission_template) }
 
-      it "is unauthorized" do
+      before do
+        allow(controller.current_ability).to receive(:can?).with(:update, permission_template).and_return(false)
+      end
+
+      it "is unauthorized for admin sets" do
         # This spec was not firing as expected. It was getting a nil permission template. This mock expectation is a bit
         # odd, but it needs to go rather deep into CanCan to behave accordingly.
-        allow(controller.current_ability).to receive(:can?).with(:update, permission_template).and_return(false)
-        put :update, params: { id: permission_template, admin_set_id: permission_template.admin_set_id }
+        put :update, params: { id: permission_template, admin_set_id: permission_template.source_id }
+        expect(assigns(:permission_template)).to eq(permission_template)
+        expect(response).to be_unauthorized
+      end
+
+      it "is unauthorized for collections" do
+        # This spec was not firing as expected. It was getting a nil permission template. This mock expectation is a bit
+        # odd, but it needs to go rather deep into CanCan to behave accordingly.
+        put :update, params: { id: permission_template, collection_id: permission_template.source_id }
         expect(assigns(:permission_template)).to eq(permission_template)
         expect(response).to be_unauthorized
       end
@@ -23,22 +34,38 @@ RSpec.describe Hyrax::Admin::PermissionTemplatesController do
   end
 
   context "when signed in as an admin" do
-    describe "update participants" do
-      let!(:permission_template) { create(:permission_template) }
-      let(:grant_attributes) { [{ "agent_type" => "user", "agent_id" => "bob", "access" => "view" }] }
+    let!(:permission_template) { create(:permission_template) }
+    let(:grant_attributes) { [{ "agent_type" => "user", "agent_id" => "bob", "access" => "view" }] }
+    let(:form_attributes) { { visibility: 'open', access_grants_attributes: grant_attributes } }
+
+    describe "update admin set participants" do
       let(:input_params) do
-        { admin_set_id: permission_template.admin_set_id,
+        { admin_set_id: permission_template.source_id,
           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(controller).to receive(:authorize!).with(:update, Hyrax::PermissionTemplate)
         expect(form).to receive(:update).with(ActionController::Parameters.new(form_attributes).permit!).and_return(updated: true, content_tab: 'participants')
         put :update, params: input_params
-        expect(response).to redirect_to(hyrax.edit_admin_admin_set_path(permission_template.admin_set_id, locale: 'en', anchor: 'participants'))
+        expect(response).to redirect_to(hyrax.edit_admin_admin_set_path(permission_template.source_id, locale: 'en', anchor: 'participants'))
         expect(flash[:notice]).to eq(I18n.t('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
       end
     end
+
+    describe "update collection participants" do
+      let(:input_params) do
+        { collection_id: permission_template.source_id,
+          permission_template: form_attributes }
+      end
+
+      it "is successful" do
+        expect(controller).to receive(:authorize!).with(:update, Hyrax::PermissionTemplate)
+        expect(form).to receive(:update).with(ActionController::Parameters.new(form_attributes).permit!).and_return(updated: true, content_tab: 'sharing')
+        put :update, params: input_params
+        expect(response).to redirect_to(hyrax.edit_dashboard_collection_path(permission_template.source_id, locale: 'en', anchor: 'sharing'))
+        expect(flash[:notice]).to eq(I18n.t('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices'))
+      end
+    end
   end
 end

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

@@ -1,25 +1,14 @@
 RSpec.describe Hyrax::Admin::StrategiesController do
   describe "#update" do
     before do
-      # Added when Flipflop bumped to 2.3.2. See also https://github.com/voormedia/flipflop/issues/26
-      Flipflop::FeatureSet.current.instance_variable_set(:@features, original_feature_hash.merge(feature_id => feature))
-
       sign_in user
     end
-
-    after do
-      Flipflop::FeatureSet.current.instance_variable_set(:@features, original_feature_hash)
-    end
-
-    let(:original_feature_hash) { Flipflop::FeatureSet.current.instance_variable_get(:@features) }
     let(:user) { create(:user) }
     let(:strategy) { Flipflop::Strategies::ActiveRecordStrategy.new(class: Hyrax::Feature).key }
-    let(:feature) { double('feature', id: feature_id, key: 'foo') }
-    let(:feature_id) { :my_feature }
 
     context "when not authorized" do
       it "redirects away" do
-        patch :update, params: { feature_id: feature.id, id: strategy }
+        patch :update, params: { feature_id: '123', id: strategy }
         expect(response).to redirect_to root_path
       end
     end
@@ -31,7 +20,7 @@ RSpec.describe Hyrax::Admin::StrategiesController do
       end
 
       it "is successful" do
-        patch :update, params: { feature_id: feature.id, id: strategy }
+        patch :update, params: { feature_id: '123', id: strategy }
         expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.admin_features_path(locale: 'en')
       end
     end

data/spec/controllers/hyrax/admin/workflow_roles_controller_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::Admin::WorkflowRolesController do
-  describe "#get" do
+  describe '#index' do
     context "when you have permission" do
       before do
         allow(controller).to receive(:authorize!).with(:read, :admin_dashboard).and_return(true)
@@ -12,7 +12,57 @@ RSpec.describe Hyrax::Admin::WorkflowRolesController do
         get :index
         expect(response).to be_success
         expect(assigns[:presenter]).to be_kind_of Hyrax::Admin::WorkflowRolesPresenter
-        expect(response).to render_template('dashboard')
+        expect(response).to render_template('hyrax/dashboard')
+      end
+    end
+
+    context "when they don't have permission" do
+      it "throws a CanCan error" do
+        get :index
+        expect(response).to redirect_to main_app.new_user_session_path(locale: 'en')
+      end
+    end
+  end
+
+  describe '#create' do
+    context 'when you have permission' do
+      let(:form) { instance_double(Hyrax::Forms::WorkflowResponsibilityForm, save!: true) }
+
+      before do
+        allow(controller).to receive(:authorize!).with(:read, :admin_dashboard).and_return(true)
+        allow(controller).to receive(:authorize!).and_return(true)
+        allow(Hyrax::Forms::WorkflowResponsibilityForm).to receive(:new).and_return(form)
+      end
+
+      it 'is successful' do
+        post :create, params: { sipity_workflow_responsibility: {} }
+        expect(controller).to have_received(:authorize!).with(:create, Sipity::WorkflowResponsibility)
+        expect(form).to have_received(:save!)
+        expect(response).to redirect_to admin_workflow_roles_path
+      end
+    end
+
+    context "when they don't have permission" do
+      it 'throws a CanCan error' do
+        post :create, params: { sipity_workflow_responsibility: {} }
+        expect(response).to redirect_to main_app.new_user_session_path(locale: 'en')
+      end
+    end
+  end
+
+  describe '#destroy' do
+    context "when you have permission" do
+      let(:responsibility) { mock_model(Sipity::WorkflowResponsibility) }
+
+      before do
+        allow(controller).to receive(:authorize!).and_return(true)
+        allow(Sipity::WorkflowResponsibility).to receive(:find).with('1').and_return(responsibility)
+      end
+
+      it "is successful" do
+        delete :destroy, params: { id: 1 }
+        expect(controller).to have_received(:authorize!).with(:destroy, Sipity::WorkflowResponsibility)
+        expect(response).to redirect_to admin_workflow_roles_path
       end
     end
 

data/spec/controllers/hyrax/batch_edits_controller_spec.rb

@@ -10,11 +10,13 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
   describe "#edit" do
     let(:one) { create(:work, creator: ["Fred"], title: ["abc"], language: ['en']) }
     let(:two) { create(:work, creator: ["Wilma"], title: ["abc2"], publisher: ['Rand McNally'], language: ['en'], resource_type: ['bar']) }
+    let(:three) { create(:work, creator: ["Dino"], title: ["abc3"]) }
 
     before do
-      controller.batch = [one.id, two.id]
+      controller.batch = [one.id, two.id, three.id]
       expect(controller).to receive(:can?).with(:edit, one.id).and_return(true)
       expect(controller).to receive(:can?).with(:edit, two.id).and_return(true)
+      expect(controller).to receive(:can?).with(:edit, three.id).and_return(false)
     end
 
     it "is successful" do
@@ -29,19 +31,25 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
   describe "update" do
     let(:user) { build(:user) }
     let!(:one) do
-      create(:generic_work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
+      create(:work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
     end
 
     let!(:two) do
-      create(:generic_work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
+      create(:work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
     end
+
+    let!(:three) do
+      create(:work, creator: ["Fred"], title: ["abc"], language: ['en'])
+    end
+
     let(:mycontroller) { "hyrax/my/works" }
 
     before do
       # TODO: why aren't we just submitting batch_document_ids[] as a parameter?
-      controller.batch = [one.id, two.id]
+      controller.batch = [one.id, two.id, three.id]
       expect(controller).to receive(:can?).with(:edit, one.id).and_return(true)
       expect(controller).to receive(:can?).with(:edit, two.id).and_return(true)
+      expect(controller).to receive(:can?).with(:edit, three.id).and_return(false)
     end
 
     it "is successful" do
@@ -49,6 +57,7 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
       expect(response).to redirect_to(dashboard_path(locale: 'en'))
       expect { GenericWork.find(one.id) }.to raise_error(Ldp::Gone)
       expect { GenericWork.find(two.id) }.to raise_error(Ldp::Gone)
+      expect(GenericWork).to exist(three.id)
     end
 
     it "redirects to the return controller" do
@@ -61,6 +70,7 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
       expect(response).to be_redirect
       expect(GenericWork.find(one.id).subject).to eq ["zzz"]
       expect(GenericWork.find(two.id).subject).to eq ["zzz"]
+      expect(GenericWork.find(three.id).subject).to be_empty
     end
 
     it "updates permissions" do
@@ -68,6 +78,67 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
       expect(response).to be_redirect
       expect(GenericWork.find(one.id).visibility).to eq "authenticated"
       expect(GenericWork.find(two.id).visibility).to eq "authenticated"
+      expect(GenericWork.find(three.id).visibility).to eq "restricted"
+    end
+  end
+
+  describe "#destroy_collection" do
+    let(:user) { create(:user) }
+
+    let(:collection1) do
+      create(:public_collection, title: ["My First Collection"],
+                                 description: ["My incredibly detailed description of the collection"],
+                                 user: user)
+    end
+
+    let(:collection2) do
+      create(:public_collection, title: ["My Other Collection"],
+                                 description: ["My incredibly detailed description of the other collection"],
+                                 user: user)
+    end
+
+    let!(:work1) { create(:work, title: ["First of the Assets"], member_of_collections: [collection1], user: user) }
+    let(:work2)  { create(:work, title: ["Second of the Assets"], user: user) }
+
+    let(:mycontroller) { "hyrax/my/works" }
+    let(:curation_concern) { create(:work1, user: user) }
+
+    context 'when user has edit access' do
+      it "deletes collections with and without works in it" do
+        controller.batch = [collection1.id, collection2.id]
+        delete :destroy_collection, params: { update_type: "delete_all" }
+        expect { Collection.find(collection1.id) }.to raise_error(Ldp::Gone)
+        expect { Collection.find(collection2.id) }.to raise_error(Ldp::Gone)
+      end
+    end
+
+    context 'when user does not have edit access' do
+      let(:user2) { create(:user) }
+
+      let(:collection3) do
+        create(:public_collection, title: ["User2's Collection"],
+                                   description: ["Collection created by user2"],
+                                   user: user2)
+      end
+
+      before do
+        allow(controller).to receive(:current_user).and_return(user2)
+      end
+
+      it "fails to delete collections when user does not have edit access" do
+        controller.batch = [collection1.id, collection3.id]
+        delete :destroy_collection, params: { update_type: "delete_all" }
+        expect { Collection.find(collection1.id) }.not_to raise_error(Ldp::Gone)
+        expect { Collection.find(collection2.id) }.not_to raise_error(Ldp::Gone)
+      end
+
+      it "deletes collections where user has edit access, failing to delete those where user does not have edit access" do
+        controller.batch = [collection1.id, collection3.id]
+        delete :destroy_collection, params: { update_type: "delete_all" }
+        expect { Collection.find(collection1.id) }.not_to raise_error(Ldp::Gone)
+        expect { Collection.find(collection2.id) }.not_to raise_error(Ldp::Gone)
+        expect { Collection.find(collection3.id) }.to raise_error(Ldp::Gone)
+      end
     end
   end
 end

data/spec/controllers/hyrax/batch_uploads_controller_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Hyrax::BatchUploadsController do
       get :new
       expect(response).to be_successful
       expect(assigns[:form]).to be_kind_of Hyrax::Forms::BatchUploadForm
-      expect(response).to render_template('dashboard')
+      expect(response).to render_template('hyrax/dashboard')
     end
   end
 
@@ -97,7 +97,7 @@ RSpec.describe Hyrax::BatchUploadsController do
     context "when submitting works on behalf of other user" do
       let(:batch_upload_item) do
         {
-          payload_concern: RareBooks::Atlas,
+          payload_concern: NamespacedWorks::NestedWork,
           permissions_attributes: [
             { type: "group", name: "public", access: "read" }
           ],

data/spec/controllers/hyrax/collections_controller_spec.rb

@@ -12,6 +12,8 @@ RSpec.describe Hyrax::CollectionsController do
   let(:asset1)         { create(:work, title: ["First of the Assets"], user: user) }
   let(:asset2)         { create(:work, title: ["Second of the Assets"], user: user) }
   let(:asset3)         { create(:work, title: ["Third of the Assets"], user: user) }
+  let(:asset4)         { create(:collection, title: ["First subcollection"], user: user) }
+  let(:asset5)         { create(:collection, title: ["Second subcollection"], user: user) }
   let(:unowned_asset)  { create(:work, user: other) }
 
   let(:collection_attrs) do
@@ -22,13 +24,13 @@ RSpec.describe Hyrax::CollectionsController do
     context "when signed in" do
       before do
         sign_in user
-        [asset1, asset2, asset3].each do |asset|
+        [asset1, asset2, asset3, asset4, asset5].each do |asset|
           asset.member_of_collections = [collection]
           asset.save
         end
       end
 
-      it "returns the collection and its members" do
+      it "returns the collection and its members", :with_nested_reindexing do # rubocop:disable RSpec/ExampleLength
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :show, params: { id: collection }
         expect(response).to be_successful
@@ -36,14 +38,20 @@ RSpec.describe Hyrax::CollectionsController do
         expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
         expect(assigns[:presenter].title).to match_array collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
+        expect(assigns[:subcollection_docs].map(&:id)).to match_array [asset4, asset5].map(&:id)
+        expect(assigns[:members_count]).to eq(3)
+        expect(assigns[:subcollection_count]).to eq(2)
       end
 
-      context "and searching" do
-        it "returns some works" do
+      context "and searching", :with_nested_reindexing do
+        it "returns some works and subcollections" do
           # "/collections/4m90dv529?utf8=%E2%9C%93&cq=King+Louie&sort="
-          get :show, params: { id: collection, cq: "Third" }
+          get :show, params: { id: collection, cq: "Second" }
           expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
-          expect(assigns[:member_docs].map(&:id)).to match_array [asset3].map(&:id)
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset2].map(&:id)
+          expect(assigns[:subcollection_docs].map(&:id)).to match_array [asset5].map(&:id)
+          expect(assigns[:members_count]).to eq(1)
+          expect(assigns[:subcollection_count]).to eq(1)
         end
       end
 
@@ -83,6 +91,7 @@ RSpec.describe Hyrax::CollectionsController do
       it "does not show me files in the collection" do
         get :show, params: { id: collection }
         expect(assigns[:member_docs].count).to eq 0
+        expect(assigns[:subcollection_docs].count).to eq 0
       end
     end
   end