hyrax 2.0.3 → 2.1.0.beta1

data/spec/services/hyrax/admin_set_create_service_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe Hyrax::AdminSetCreateService do
       subject { service.create }
 
       context "when the admin_set is valid" do
-        let(:permission_template) { Hyrax::PermissionTemplate.find_by(admin_set_id: admin_set.id) }
+        let(:permission_template) { Hyrax::PermissionTemplate.find_by(source_id: admin_set.id) }
         let(:grants) { permission_template.access_grants }
         let(:available_workflows) { [create(:workflow), create(:workflow)] }
 
@@ -85,9 +85,12 @@ RSpec.describe Hyrax::AdminSetCreateService do
           #  * 2 available workflows, multiplied by
           #  * 3 roles (from Hyrax::RoleRegistry), equals
           #  * 12
+          expect(admin_set.edit_users).to match_array([user.user_key])
+          expect(admin_set.edit_groups).to match_array(['admin'])
+          expect(admin_set.read_users).to match_array([])
           expect(admin_set.read_groups).not_to include('public')
-          expect(admin_set.edit_groups).to eq ['admin']
           expect(admin_set.creator).to eq [user.user_key]
+
           expect(workflow_importer).to have_received(:call).with(permission_template: permission_template)
           expect(permission_template).to be_persisted
           expect(grants.count).to eq 2
@@ -102,6 +105,7 @@ RSpec.describe Hyrax::AdminSetCreateService do
 
         it { is_expected.to be false }
         it 'will not call the workflow_importer' do
+          subject
           expect(workflow_importer).not_to have_received(:call)
         end
       end

data/spec/services/hyrax/admin_set_member_service_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe Hyrax::AdminSetMemberService, clean_repo: true do
+  let(:blacklight_config) { CatalogController.blacklight_config }
+  let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
+  let(:current_ability) { instance_double(Ability, admin?: true) }
+  let(:scope) { double('Scope', current_ability: current_ability, repository: repository, blacklight_config: blacklight_config) }
+
+  let(:admin_set) { build(:admin_set) }
+  let(:builder) { described_class.new(scope: scope, collection: admin_set, params: { "id" => admin_set.id.to_s }) }
+  let(:subject) { builder.available_member_works }
+  let(:ids) { subject.response[:docs].map { |col| col[:id] } }
+
+  describe '#available_member_works' do
+    let!(:work1) { create(:generic_work, admin_set: admin_set) }
+    let!(:work2) { create(:generic_work) }
+    let!(:work3) { create(:generic_work, admin_set: admin_set) }
+
+    it 'returns the members of the admin set' do
+      expect(ids).to contain_exactly(work1.id, work3.id)
+    end
+  end
+end

data/spec/services/hyrax/batch_create_failure_service_spec.rb

@@ -1,14 +1,18 @@
 RSpec.describe Hyrax::BatchCreateFailureService do
   let(:depositor) { create(:user) }
   let(:inbox) { depositor.mailbox.inbox }
+  let(:messages) { ['You did a bad'] }
 
   describe "#call" do
-    subject { described_class.new(depositor) }
+    subject { described_class.new(depositor, messages) }
 
     it "sends failing mail" do
       subject.call
       expect(inbox.count).to eq(1)
-      inbox.each { |msg| expect(msg.last_message.subject).to eq('Failing batch create') }
+      inbox.each do |msg|
+        expect(msg.last_message.subject).to eq('Failing batch create')
+        expect(msg.last_message.body).to include(messages.first)
+      end
     end
   end
 end

data/spec/services/hyrax/collection_types/create_service_spec.rb

@@ -0,0 +1,91 @@
+RSpec.describe Hyrax::CollectionTypes::CreateService do
+  describe '.create_collection_type' do
+    it 'create collection type with default options when no options are received' do # rubocop:disable RSpec/ExampleLength
+      described_class.create_collection_type(machine_id: 'custom_type', title: 'Custom Type')
+      ct = Hyrax::CollectionType.find_by_machine_id('custom_type')
+      expect(ct.machine_id).to eq('custom_type')
+      expect(ct.title).to eq('Custom Type')
+      expect(ct.description).to eq('')
+      expect(ct).to be_nestable
+      expect(ct).to be_discoverable
+      expect(ct).to be_sharable
+      expect(ct).to be_share_applies_to_new_works
+      expect(ct).to be_allow_multiple_membership
+      expect(ct).not_to be_require_membership
+      expect(ct).not_to be_assigns_workflow
+      expect(ct).not_to be_assigns_visibility
+    end
+
+    it 'creates a collection type for the options received' do
+      options = {
+        description: 'A collection type with options.',
+        discoverable: false
+      }
+      described_class.create_collection_type(machine_id: 'custom_type', title: 'Custom Type', options: options)
+      ct = Hyrax::CollectionType.find_by_machine_id('custom_type')
+      expect(ct.description).to include('with options')
+      expect(ct).not_to be_discoverable
+    end
+
+    it 'creates collection participants defined in options' do
+      expect do
+        described_class.create_collection_type(machine_id: 'custom_type', title: 'Custom Type')
+      end.to change(Hyrax::CollectionTypeParticipant, :count).by(described_class::DEFAULT_OPTIONS[:participants].count)
+    end
+  end
+
+  describe '.create_admin_set_type' do
+    it 'create the admin set type' do # rubocop:disable RSpec/ExampleLength
+      described_class.create_admin_set_type
+      ct = Hyrax::CollectionType.find_by_machine_id(Hyrax::CollectionType::ADMIN_SET_MACHINE_ID)
+      expect(ct.machine_id).to eq(Hyrax::CollectionType::ADMIN_SET_MACHINE_ID)
+      expect(ct.title).to eq(Hyrax::CollectionType::ADMIN_SET_DEFAULT_TITLE)
+      expect(ct.description).to eq('An aggregation of works that is intended to help with administrative control. Admin Sets provide a way of defining behaviors and policies around a set of works.')
+      expect(ct).not_to be_nestable
+      expect(ct).not_to be_discoverable
+      expect(ct).to be_sharable
+      expect(ct).to be_share_applies_to_new_works
+      expect(ct).not_to be_allow_multiple_membership
+      expect(ct).to be_require_membership
+      expect(ct).to be_assigns_workflow
+      expect(ct).to be_assigns_visibility
+    end
+  end
+
+  describe '.create_user_collection_type' do
+    it 'create the user collection type' do # rubocop:disable RSpec/ExampleLength
+      described_class.create_user_collection_type
+      ct = Hyrax::CollectionType.find_by_machine_id(Hyrax::CollectionType::USER_COLLECTION_MACHINE_ID)
+      expect(ct.machine_id).to eq(Hyrax::CollectionType::USER_COLLECTION_MACHINE_ID)
+      expect(ct.title).to eq(Hyrax::CollectionType::USER_COLLECTION_DEFAULT_TITLE)
+      expect(ct.description).to eq('A User Collection can be created by any user to organize their works.')
+      expect(ct).to be_nestable
+      expect(ct).to be_discoverable
+      expect(ct).to be_sharable
+      expect(ct).not_to be_share_applies_to_new_works
+      expect(ct).to be_allow_multiple_membership
+      expect(ct).not_to be_require_membership
+      expect(ct).not_to be_assigns_workflow
+      expect(ct).not_to be_assigns_visibility
+    end
+  end
+
+  describe '.add_default_participants' do
+    let(:coltype) { create(:collection_type) }
+
+    it 'adds the default participants to a collection type' do
+      expect(Hyrax::CollectionTypeParticipant).to receive(:create!).exactly(2).times
+      described_class.add_default_participants(coltype.id)
+    end
+  end
+
+  describe '.add_participants' do
+    let(:participants) { [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: 'test_group', access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }] }
+    let(:coltype) { create(:collection_type) }
+
+    it 'adds the participants to a collection type' do
+      expect(Hyrax::CollectionTypeParticipant).to receive(:create!)
+      described_class.add_participants(coltype.id, participants)
+    end
+  end
+end

data/spec/services/hyrax/collection_types/permissions_service_spec.rb

@@ -0,0 +1,297 @@
+RSpec.describe Hyrax::CollectionTypes::PermissionsService do
+  let(:user_cg) { create(:user, groups: 'create_group') }
+  let(:user_mg) { create(:user, groups: 'manage_group') }
+  let(:user_cu) { create(:user) }
+  let(:user_mu) { create(:user) }
+  let(:user_other) { create(:user) }
+  let(:user_admin) { create(:user, groups: 'admin') }
+
+  let!(:user_collection_type) { create(:user_collection_type) }
+  let!(:admin_set_collection_type) { create(:admin_set_collection_type) }
+  let!(:collection_type) { create(:collection_type, creator_user: user_cu, creator_group: 'create_group', manager_user: user_mu, manager_group: 'manage_group') }
+
+  describe '.collection_types_for_user' do # Also tests .collection_type_ids_for_user which is called by .collection_types_for_user
+    let!(:ability) { ::Ability.new(user) }
+
+    before { allow(ability).to receive(:current_user).and_return(user) }
+
+    subject { described_class.collection_types_for_user(user: user, roles: access).map(&:id) }
+
+    context 'when user is a create user' do
+      let(:user) { user_cu }
+
+      context 'and create access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::CREATE_ACCESS }
+
+        it { is_expected.to match_array [collection_type.id, user_collection_type.id] }
+      end
+
+      context 'and manage access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
+
+        it { is_expected.to match_array [] }
+      end
+    end
+
+    context 'when user is in create group' do
+      let(:user) { user_cg }
+
+      context 'and create access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::CREATE_ACCESS }
+
+        it { is_expected.to match_array [collection_type.id, user_collection_type.id] }
+      end
+
+      context 'and manage access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
+
+        it { is_expected.to match_array [] }
+      end
+    end
+
+    context 'when user is a manage user' do
+      let(:user) { user_mu }
+
+      context 'and create access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::CREATE_ACCESS }
+
+        it { is_expected.to match_array [user_collection_type.id] }
+      end
+
+      context 'and manage access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
+
+        it { is_expected.to match_array [collection_type.id] }
+      end
+    end
+
+    context 'when user is in manage group' do
+      let(:user) { user_mg }
+
+      context 'and create access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::CREATE_ACCESS }
+
+        it { is_expected.to match_array [user_collection_type.id] }
+      end
+
+      context 'and manage access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
+
+        it { is_expected.to match_array [collection_type.id] }
+      end
+    end
+
+    context 'when user is an admin' do
+      let(:user) { user_admin }
+
+      context 'and create access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::CREATE_ACCESS }
+
+        it { is_expected.to match_array [collection_type.id, user_collection_type.id, admin_set_collection_type.id] }
+      end
+
+      context 'and manage access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
+
+        it { is_expected.to match_array [collection_type.id, user_collection_type.id, admin_set_collection_type.id] }
+      end
+    end
+
+    context 'when user with no access' do
+      let(:user) { user_other }
+
+      context 'and create access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::CREATE_ACCESS }
+
+        it { is_expected.to match_array [user_collection_type.id] }
+      end
+
+      context 'and manage access is queried' do
+        let(:access) { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
+
+        it { is_expected.to match_array [] }
+      end
+    end
+  end
+
+  describe '.can_create_any_collection_type?' do
+    let!(:ability) { ::Ability.new(user) }
+
+    before do
+      allow(ability).to receive(:current_user).and_return(user)
+    end
+
+    subject { described_class.can_create_any_collection_type?(user: user) }
+
+    context 'when user is a create user' do
+      let(:user) { user_cu }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when user is in create group' do
+      let(:user) { user_cg }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when user is a manage user' do
+      let(:user) { user_mu }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when user is in manage group' do
+      let(:user) { user_mg }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when user is an admin' do
+      let(:user) { user_admin }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when user with no access' do
+      let(:user) { user_other }
+
+      # TODO: Fails for now becauser User Collection type is always created and it allows every logged in user to create one.
+      # Would require additional work to remove or change the User Collection participants so there are 0 collection types the
+      # user can create.
+      xit { is_expected.to be false }
+    end
+  end
+
+  describe '.can_create_admin_set?' do
+    let!(:ability) { ::Ability.new(user) }
+
+    before { allow(ability).to receive(:current_user).and_return(user) }
+
+    subject { described_class.can_create_admin_set_collection_type?(user: user) }
+
+    context 'when user is a create user' do
+      let(:user) { user_cu }
+
+      it { is_expected.to be false }
+    end
+
+    context 'when user is in create group' do
+      let(:user) { user_cg }
+
+      it { is_expected.to be false }
+    end
+
+    context 'when user is a manage user' do
+      let(:user) { user_mu }
+
+      it { is_expected.to be false }
+    end
+
+    context 'when user is in manage group' do
+      let(:user) { user_mg }
+
+      it { is_expected.to be false }
+    end
+
+    context 'when user is an admin' do
+      let(:user) { user_admin }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when user with no access' do
+      let(:user) { user_other }
+
+      it { is_expected.to be false }
+    end
+  end
+
+  describe '.can_create_collection_types' do
+    let!(:ability) { ::Ability.new(user) }
+
+    before { allow(ability).to receive(:current_user).and_return(user) }
+
+    subject { described_class.can_create_collection_types(user: user).map(&:id) }
+
+    context 'when user is a create user' do
+      let(:user) { user_cu }
+
+      it { is_expected.to match_array [collection_type.id, user_collection_type.id] }
+    end
+
+    context 'when user is in create group' do
+      let(:user) { user_cg }
+
+      it { is_expected.to match_array [collection_type.id, user_collection_type.id] }
+    end
+
+    context 'when user is a manage user' do
+      let(:user) { user_mu }
+
+      it { is_expected.to match_array [collection_type.id, user_collection_type.id] }
+    end
+
+    context 'when user is in manage group' do
+      let(:user) { user_mg }
+
+      it { is_expected.to match_array [collection_type.id, user_collection_type.id] }
+    end
+
+    context 'when user is an admin' do
+      let(:user) { user_admin }
+
+      it { is_expected.to match_array [collection_type.id, user_collection_type.id, admin_set_collection_type.id] }
+    end
+
+    context 'when user with no access' do
+      let(:user) { user_other }
+
+      it { is_expected.to match_array [user_collection_type.id] }
+    end
+  end
+
+  describe '.user_edit_grants_for_collection_of_type' do
+    subject { described_class.user_edit_grants_for_collection_of_type(collection_type: coltype) }
+
+    context 'for user collection type' do
+      let(:coltype) { user_collection_type }
+
+      it { is_expected.to match_array [] }
+    end
+
+    context 'for admin set collection type' do
+      let(:coltype) { admin_set_collection_type }
+
+      it { is_expected.to match_array [] }
+    end
+
+    context 'for collection type' do
+      let(:coltype) { collection_type }
+
+      it { is_expected.to match_array [user_mu.user_key] }
+    end
+  end
+
+  describe '.group_edit_grants_for_collection_of_type' do
+    subject { described_class.group_edit_grants_for_collection_of_type(collection_type: coltype) }
+
+    context 'for user collection type' do
+      let(:coltype) { user_collection_type }
+
+      it { is_expected.to match_array ['admin'] }
+    end
+
+    context 'for admin set collection type' do
+      let(:coltype) { admin_set_collection_type }
+
+      it { is_expected.to match_array ['admin'] }
+    end
+
+    context 'for collection type' do
+      let(:coltype) { collection_type }
+
+      it { is_expected.to match_array ['manage_group', 'admin'] }
+    end
+  end
+end