hyrax 2.0.3 → 2.1.0.beta1

data/spec/models/hyrax/operation_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::Operation do
-  context '#status' do
+  describe '#status' do
     it 'is protected by enum enforcement' do
       expect { described_class.new(status: 'not_valid') }.to raise_error(ArgumentError)
     end
@@ -12,6 +12,32 @@ RSpec.describe Hyrax::Operation do
     end
   end
 
+  describe '#rollup_messages' do
+    subject { operation.rollup_messages }
+
+    context 'with no message and no children' do
+      let(:operation) { create(:operation, :failing, message: nil) }
+
+      it { is_expected.to eq [] }
+    end
+    context 'with a message and no children' do
+      let(:operation) { create(:operation, :failing, message: 'A bad thing!') }
+
+      it { is_expected.to eq ['A bad thing!'] }
+    end
+    context 'with a message and children with messages' do
+      let(:operation) { create(:operation, :failing, message: 'A bad thing!') }
+      let(:child1) { create(:operation, :failing, message: 'Foo!') }
+      let(:child2) { create(:operation, :failing, message: 'Bar!') }
+
+      before do
+        allow(operation).to receive(:children).and_return([child1, child2])
+      end
+
+      it { is_expected.to match_array ['A bad thing!', 'Foo!', 'Bar!'] }
+    end
+  end
+
   describe "#rollup_status" do
     let(:parent) { create(:operation, :pending) }
 

data/spec/models/hyrax/permission_template_access_spec.rb

@@ -1,9 +1,9 @@
 RSpec.describe Hyrax::PermissionTemplateAccess do
-  let(:admin_set) { create(:admin_set, with_permission_template: true) }
+  let(:permission_template) { create(:permission_template) }
   let(:permission_template_access) do
     create(:permission_template_access,
            :manage,
-           permission_template: admin_set.permission_template,
+           permission_template: permission_template,
            agent_type: agent_type,
            agent_id: agent_id)
   end
@@ -25,13 +25,13 @@ RSpec.describe Hyrax::PermissionTemplateAccess do
       end
     end
     describe '#destroy' do
-      it 'aborts the destroy operation' do
+      it 'destroys the permission template access record' do
         subject.destroy
-        expect(subject).not_to be_destroyed
-        expect(subject.errors.messages[:base]).to include 'The repository administrators group cannot be removed'
+        expect(subject).to be_destroyed
       end
     end
   end
+
   context 'with an agent that is not the admin users group' do
     let(:agent_type) { 'user' }
     let(:agent_id) { 'foobar' }
@@ -54,4 +54,127 @@ RSpec.describe Hyrax::PermissionTemplateAccess do
       end
     end
   end
+
+  context 'with a user that is an admin set viewer' do
+    let(:agent_type) { 'user' }
+    let(:agent_id) { 'foobar' }
+
+    let(:permission_template_access) do
+      create(:permission_template_access,
+             :view,
+             permission_template: permission_template,
+             agent_type: agent_type,
+             agent_id: agent_id)
+    end
+
+    subject { permission_template_access }
+
+    describe '#label' do
+      it 'returns the user label' do
+        expect(subject.label).to eq agent_id
+      end
+    end
+    describe '#admin_group?' do
+      it 'returns true' do
+        expect(subject).not_to be_admin_group
+      end
+    end
+    describe '#destroy' do
+      it 'carries out the destroy operation' do
+        subject.destroy
+        expect(subject).to be_destroyed
+        expect(subject.errors).to be_empty
+      end
+    end
+  end
+
+  context 'with a user that is an admin set depositor' do
+    let(:agent_type) { 'user' }
+    let(:agent_id) { 'foobar' }
+
+    let(:permission_template_access) do
+      create(:permission_template_access,
+             :deposit,
+             permission_template: permission_template,
+             agent_type: agent_type,
+             agent_id: agent_id)
+    end
+
+    subject { permission_template_access }
+
+    describe '#label' do
+      it 'returns the user label' do
+        expect(subject.label).to eq agent_id
+      end
+    end
+    describe '#admin_group?' do
+      it 'returns true' do
+        expect(subject).not_to be_admin_group
+      end
+    end
+    describe '#destroy' do
+      it 'carries out the destroy operation' do
+        subject.destroy
+        expect(subject).to be_destroyed
+        expect(subject.errors).to be_empty
+      end
+    end
+  end
+
+  context 'with a user that is an admin set manager' do
+    let(:agent_type) { 'user' }
+    let(:agent_id) { 'foobar' }
+
+    let(:permission_template_access) do
+      create(:permission_template_access,
+             :manage,
+             permission_template: permission_template,
+             agent_type: agent_type,
+             agent_id: agent_id)
+    end
+
+    subject { permission_template_access }
+
+    describe '#label' do
+      it 'returns the user label' do
+        expect(subject.label).to eq agent_id
+      end
+    end
+    describe '#admin_group?' do
+      it 'returns true' do
+        expect(subject).not_to be_admin_group
+      end
+    end
+    describe '#destroy' do
+      it 'carries out the destroy operation' do
+        subject.destroy
+        expect(subject).to be_destroyed
+        expect(subject.errors).to be_empty
+      end
+    end
+  end
+
+  describe "duplicate records" do
+    let(:permission_template) { create(:permission_template) }
+    let(:agent_type) { 'user' }
+    let(:agent_id) { 'foobar' }
+
+    before do
+      create(:permission_template_access,
+             :view,
+             permission_template: permission_template,
+             agent_type: agent_type,
+             agent_id: agent_id)
+    end
+
+    subject do
+      build(:permission_template_access,
+            :view,
+            permission_template: permission_template,
+            agent_type: agent_type,
+            agent_id: agent_id)
+    end
+
+    it { is_expected.not_to be_valid }
+  end
 end

data/spec/models/hyrax/permission_template_spec.rb

@@ -1,7 +1,8 @@
-RSpec.describe Hyrax::PermissionTemplate do
+RSpec.describe Hyrax::PermissionTemplate, :clean_repo do
   let(:admin_set) { create(:admin_set) }
+  let(:collection) { create(:collection) }
   let(:permission_template) { described_class.new(attributes) }
-  let(:attributes) { { admin_set_id: admin_set.id } }
+  let(:attributes) { { source_id: admin_set.id } }
 
   subject { permission_template }
 
@@ -21,6 +22,17 @@ RSpec.describe Hyrax::PermissionTemplate do
       end
     end
 
+    context 'with_collection parameter' do
+      it 'will create an Collection when true' do
+        permission_template = create(:permission_template, with_collection: true)
+        expect(permission_template.collection).to be_persisted
+      end
+      it 'will not persist an Collection when false (or not given)' do
+        permission_template = create(:permission_template, with_collection: false)
+        expect { permission_template.collection }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
+
     context 'with_workflows parameter' do
       it 'will create the workflow when set true' do
         expect { create(:permission_template, with_workflows: true) }.to change { Sipity::Workflow.count }
@@ -51,23 +63,67 @@ RSpec.describe Hyrax::PermissionTemplate do
     end
   end
 
+  describe "#source_model" do
+    context 'when source is an AdminSet' do
+      let(:as_permission_template) { described_class.new(as_attributes) }
+      let(:as_attributes) { { source_id: admin_set.id } }
+
+      before do
+        allow(AdminSet).to receive(:find).with(as_permission_template.source_id).and_return(admin_set)
+      end
+
+      it 'returns an AdminSet if the source_type is admin_set for the given permission_template' do
+        expect(as_permission_template.source_model).to be_kind_of(AdminSet)
+        expect(as_permission_template.source_model).to eq(admin_set)
+      end
+    end
+
+    context 'when source is a Collection' do
+      let(:col_permission_template) { described_class.new(col_attributes) }
+      let(:col_attributes) { { source_id: collection.id } }
+
+      before do
+        allow(Collection).to receive(:find).with(col_permission_template.source_id).and_return(collection)
+      end
+
+      it 'returns a Collection if the source_type is collection for the given permission_template' do
+        expect(col_permission_template.source_model).to be_kind_of(Collection)
+        expect(col_permission_template.source_model).to eq(collection)
+      end
+    end
+  end
+
   describe "#admin_set" do
     it 'leverages AdminSet.find for the given permission_template' do
-      expect(AdminSet).to receive(:find).with(permission_template.admin_set_id).and_return(admin_set)
+      expect(AdminSet).to receive(:find).with(permission_template.source_id).and_return(admin_set)
       expect(permission_template.admin_set).to eq(admin_set)
     end
   end
 
+  describe "#collection" do
+    let(:col_permission_template) { described_class.new(col_attributes) }
+    let(:col_attributes) { { source_id: collection.id } }
+
+    before do
+      allow(Collection).to receive(:find).with(col_permission_template.source_id).and_return(collection)
+    end
+
+    it 'leverages Collection.find for the given permission_template' do
+      expect(col_permission_template.collection).to be_kind_of(Collection)
+      expect(col_permission_template.collection).to eq(collection)
+    end
+  end
+
   describe "#release_fixed_date?" do
     subject { permission_template.release_fixed_date? }
 
     context "with release_period='fixed'" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
 
       it { is_expected.to be true }
     end
     context "with other release_period" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
 
       it { is_expected.to be false }
     end
@@ -77,12 +133,12 @@ RSpec.describe Hyrax::PermissionTemplate do
     subject { permission_template.release_no_delay? }
 
     context "with release_period='now'" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
 
       it { is_expected.to be true }
     end
     context "with other release_period" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
 
       it { is_expected.to be false }
     end
@@ -92,17 +148,17 @@ RSpec.describe Hyrax::PermissionTemplate do
     subject { permission_template.release_before_date? }
 
     context "with release_period='before'" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE } }
 
       it { is_expected.to be true }
     end
     context "with maximum embargo period (release_period of 1 year)" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
 
       it { is_expected.to be true }
     end
     context "with other release_period" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
 
       it { is_expected.to be false }
     end
@@ -112,17 +168,17 @@ RSpec.describe Hyrax::PermissionTemplate do
     subject { permission_template.release_max_embargo? }
 
     context "with release_period of 1 year" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
 
       it { is_expected.to be true }
     end
     context "with release_period of 2 years" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS } }
 
       it { is_expected.to be true }
     end
     context "with other release_period" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
 
       it { is_expected.to be false }
     end
@@ -134,27 +190,27 @@ RSpec.describe Hyrax::PermissionTemplate do
     let(:today) { Time.zone.today }
 
     context "with today and release_fixed_date?" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today } }
 
       it { is_expected.to eq today }
     end
     context "with today and release_before_date?" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today } }
 
       it { is_expected.to eq today }
     end
     context "with release_period of 6 months" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS } }
 
       it { is_expected.to eq today + 6.months }
     end
     context "with release_period of 1 year" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
 
       it { is_expected.to eq today + 1.year }
     end
     context "with release_no_delay?" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
 
       it { is_expected.to eq today }
     end
@@ -166,46 +222,46 @@ RSpec.describe Hyrax::PermissionTemplate do
     subject { permission_template.valid_release_date?(date) }
 
     context "with any release date and one is not required" do
-      let(:attributes) { { admin_set_id: admin_set.id } }
+      let(:attributes) { { source_id: admin_set.id } }
 
       it { is_expected.to eq true }
     end
     context "with matching date and release_fixed_date?" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: date } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: date } }
 
       it { is_expected.to eq true }
     end
     context "with non-matching date and release_fixed_date?" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: date + 1.day } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: date + 1.day } }
 
       it { is_expected.to eq false }
     end
     context "with exact match date and release_before_date?" do
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: date } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: date } }
 
       it { is_expected.to eq true }
     end
     context "with future, valid date and release_before_date?" do
       let(:date) { Time.zone.today + 1.day }
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: Time.zone.today + 1.month } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: Time.zone.today + 1.month } }
 
       it { is_expected.to eq true }
     end
     context "with future, invalid date and release_before_date?" do
       let(:date) { Time.zone.today + 1.year }
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: Time.zone.today + 1.month } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: Time.zone.today + 1.month } }
 
       it { is_expected.to eq false }
     end
     context "with today release and release_no_delay?" do
       let(:date) { Time.zone.today }
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
 
       it { is_expected.to eq true }
     end
     context "with tomorrow release and release_no_delay?" do
       let(:date) { Time.zone.today + 1.day }
-      let(:attributes) { { admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      let(:attributes) { { source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
 
       it { is_expected.to eq false }
     end
@@ -217,17 +273,17 @@ RSpec.describe Hyrax::PermissionTemplate do
     subject { permission_template.valid_visibility?(visibility) }
 
     context "with matching visibility" do
-      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
+      let(:attributes) { { source_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
 
       it { is_expected.to eq true }
     end
     context "with non-matching visibility" do
-      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED } }
+      let(:attributes) { { source_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED } }
 
       it { is_expected.to eq false }
     end
     context "with visibility when none required" do
-      let(:attributes) { { admin_set_id: admin_set.id } }
+      let(:attributes) { { source_id: admin_set.id } }
 
       it { is_expected.to eq true }
     end