hyrax 2.0.3 → 2.1.0.beta1

data/spec/forms/hyrax/forms/dashboard/nest_collection_form_spec.rb

@@ -0,0 +1,159 @@
+RSpec.describe Hyrax::Forms::Dashboard::NestCollectionForm, type: :form do
+  let(:parent) { double(nestable?: true) }
+  let(:child) { double(nestable?: true) }
+  let(:context) { double('Context') }
+  let(:nesting_depth_result) { true }
+  let(:query_service) { double('Query Service', valid_combined_nesting_depth?: nesting_depth_result) }
+  let(:persistence_service) { double('Persistence Service', persist_nested_collection: true) }
+  let(:form) { described_class.new(parent: parent, child: child, context: context, query_service: query_service, persistence_service: persistence_service) }
+
+  subject { form }
+
+  it { is_expected.to validate_presence_of(:parent) }
+  it { is_expected.to validate_presence_of(:child) }
+
+  describe '.default_query_service' do
+    subject { described_class.default_query_service }
+
+    it { is_expected.to respond_to(:available_parent_collections) }
+    it { is_expected.to respond_to(:available_child_collections) }
+    it { is_expected.to respond_to(:parent_and_child_can_nest?) }
+    it { is_expected.to respond_to(:valid_combined_nesting_depth?) }
+  end
+
+  describe '#default_query_service' do
+    subject { described_class.default_persistence_service }
+
+    it { is_expected.to respond_to(:persist_nested_collection_for) }
+  end
+
+  context 'parent and child nesting' do
+    let(:nesting_depth_result) { false }
+
+    it 'is invalid if child cannot be nested within the parent' do
+      expect(query_service).to receive(:parent_and_child_can_nest?).with(parent: parent, child: child, scope: context).and_return(false)
+      subject.valid?
+      expect(subject.errors[:parent]).to eq(["cannot have child nested within it"])
+      expect(subject.errors[:child]).to eq(["cannot nest within parent"])
+      expect(subject.errors[:collection]).to eq(["nesting exceeds the allowed maximum nesting depth."])
+    end
+  end
+
+  describe 'parent is not nestable' do
+    let(:parent) { double(nestable?: false) }
+
+    it 'is not valid' do
+      subject.valid?
+      expect(subject.errors[:parent]).to eq(["is not nestable"])
+    end
+  end
+
+  describe 'child is not nestable' do
+    let(:child) { double(nestable?: false) }
+
+    it 'is not valid' do
+      subject.valid?
+      expect(subject.errors[:child]).to eq(["is not nestable"])
+    end
+  end
+
+  describe '#save' do
+    subject { form.save }
+
+    describe 'when not valid' do
+      before do
+        expect(form).to receive(:valid?).and_return(false)
+      end
+      it { is_expected.to be_falsey }
+      it 'does not even attempt to persist the relationship' do
+        expect(persistence_service).not_to receive(:persist_nested_collection_for)
+        subject
+      end
+    end
+    describe 'when valid' do
+      before do
+        expect(form).to receive(:valid?).and_return(true)
+      end
+      it "returns the result of the given persistence_service's call to persist_nested_collection_for" do
+        expect(persistence_service).to receive(:persist_nested_collection_for).with(parent: parent, child: child).and_return(:persisted)
+        subject
+      end
+    end
+  end
+
+  describe '#available_child_collections' do
+    subject { form.available_child_collections }
+
+    it 'delegates to the underlying query_service' do
+      expect(query_service).to receive(:available_child_collections).with(parent: parent, scope: context).and_return(:results)
+      expect(subject).to eq(:results)
+    end
+  end
+  describe '#available_parent_collections' do
+    subject { form.available_parent_collections }
+
+    it 'delegates to the underlying query_service' do
+      expect(query_service).to receive(:available_parent_collections).with(child: child, scope: context).and_return(:results)
+      expect(subject).to eq(:results)
+    end
+  end
+
+  describe '#validate_add' do
+    context 'when not nestable' do
+      let(:parent) { double(nestable?: false) }
+
+      it 'validates the parent cannnot contain nested subcollections' do
+        subject.validate_add
+        expect(subject.errors[:parent]).to eq(["cannot have child nested within it"])
+      end
+    end
+
+    context 'when nestable' do
+      context 'when at maximum nesting level' do
+        let(:parent) { double(nestable?: true) }
+        let(:nesting_depth_result) { false }
+
+        it 'validates the parent cannot have additional files nested' do
+          subject.validate_add
+          expect(subject.errors[:collection]).to eq(["nesting exceeds the allowed maximum nesting depth."])
+        end
+      end
+
+      context 'when valid' do
+        let(:parent) { double(nestable?: true) }
+
+        it 'validates the parent can contain nested subcollections' do
+          subject.validate_add
+          expect(subject.validate_add).to eq true
+        end
+      end
+    end
+  end
+
+  describe '#remove' do
+    subject { form.remove }
+
+    describe 'when not authorized' do
+      before do
+        expect(context).to receive(:can?).with(:edit, parent).and_return(false)
+      end
+
+      it 'does not even attempt to persist the relationship' do
+        expect(persistence_service).not_to receive(:remove_nested_relationship_for)
+        subject
+        expect(form.errors[:parent]).to eq(["permission is inadequate for removal of nesting relationship"])
+      end
+    end
+
+    describe 'when authorized' do
+      before do
+        expect(context).to receive(:can?).with(:edit, parent).and_return(true)
+      end
+
+      it "returns the result of the given persistence_service's call to remove_nested_relationship_for" do
+        expect(persistence_service).to receive(:remove_nested_relationship_for).with(parent: parent, child: child).and_return(:persisted)
+        subject
+      end
+    end
+  end
+end

data/spec/forms/hyrax/forms/permission_template_form_spec.rb

@@ -3,13 +3,16 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
   let(:form) { described_class.new(permission_template) }
   let(:today) { Time.zone.today }
   let(:admin_set) { create(:admin_set) }
+  let(:collection) { create(:collection) }
 
   subject { form }
 
   it { is_expected.to delegate_method(:available_workflows).to(:model) }
   it { is_expected.to delegate_method(:active_workflow).to(:model) }
-  it { is_expected.to delegate_method(:admin_set).to(:model) }
+  it { is_expected.to delegate_method(:source_model).to(:model) }
   it { is_expected.to delegate_method(:visibility).to(:model) }
+  it { is_expected.to delegate_method(:id).to(:source_model).with_prefix(:source) }
+  it { is_expected.to delegate_method(:reset_access_controls!).to(:source_model) }
 
   it 'is expected to delegate method #active_workflow_id to #active_workflow#id' do
     workflow = double(:workflow, id: 1234, active: true)
@@ -129,7 +132,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     let(:input_params) do
       ActionController::Parameters.new(access_grants_attributes: grant_attributes).permit!
     end
-    let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+    let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
 
     let(:user) { create(:user) }
     let(:user2) { create(:user) }
@@ -205,7 +208,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
 
       it "doesn't adds edit_access to the AdminSet itself" do
         expect { subject }.to change { permission_template.access_grants.count }.by(1)
-        expect(admin_set.reload.edit_users).to be_empty
+        expect(admin_set.reload.edit_users).to match_array [user.user_key] # MANAGE user added in before do
       end
     end
 
@@ -277,7 +280,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     context "with modifying release_period from 'fixed' to 'no_delay'" do
       let(:permission_template) do
         create(:permission_template,
-               admin_set_id: admin_set.id,
+               source_id: admin_set.id,
                visibility: "open",
                release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED,
                release_date: today + 1.month)
@@ -300,7 +303,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     context "with modifying release 'varies' from date specified to embargo specified" do
       let(:permission_template) do
         create(:permission_template,
-               admin_set_id: admin_set.id,
+               source_id: admin_set.id,
                visibility: "open",
                release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE,
                release_date: today + 1.month)
@@ -323,7 +326,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     end
 
     context "for a workflow change" do
-      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, with_active_workflow: true) }
+      let(:permission_template) { create(:permission_template, source_id: admin_set.id, with_active_workflow: true) }
       let(:new_workflow) { create(:workflow, permission_template: permission_template, active: false) }
       let(:input_params) do
         ActionController::Parameters.new(
@@ -352,7 +355,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
 
     let(:permission_template) do
       create(:permission_template,
-             admin_set_id: admin_set.id,
+             source_id: admin_set.id,
              access_grants_attributes:
                [{ agent_type: 'user',
                   agent_id: user.user_key,
@@ -382,7 +385,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
   end
 
   describe "#validate_visibility_combinations" do
-    let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+    let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
 
     context "validate all release option attribute combinations" do
       let(:visibility) { '' } # default values
@@ -492,7 +495,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     context "with release before date specified" do
       let(:permission_template) do
         create(:permission_template,
-               admin_set_id: admin_set.id,
+               source_id: admin_set.id,
                visibility: '',
                release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE,
                release_date: today + 1.month)
@@ -507,7 +510,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     context "with release embargo specified" do
       let(:permission_template) do
         create(:permission_template,
-               admin_set_id: admin_set.id,
+               source_id: admin_set.id,
                visibility: '',
                release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR)
       end
@@ -521,7 +524,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     context "with release no-delay (now) selected" do
       let(:permission_template) do
         create(:permission_template,
-               admin_set_id: admin_set.id,
+               source_id: admin_set.id,
                visibility: '',
                release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY)
       end
@@ -534,7 +537,7 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
   end
 
   describe "#permission_template_update_params" do
-    let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+    let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
 
     subject do
       form.attributes = input_params

data/spec/forms/hyrax/forms/work_form_spec.rb

@@ -1,7 +1,8 @@
 RSpec.describe Hyrax::Forms::WorkForm do
   let(:work) { GenericWork.new }
-  let(:form) { described_class.new(work, nil, nil) }
+  let(:form) { described_class.new(work, nil, controller) }
   let(:works) { [GenericWork.new, FileSet.new, GenericWork.new] }
+  let(:controller) { instance_double(Hyrax::GenericWorksController) }
 
   # This class is an abstract class, so we have to set model_class
   # TODO: merge with generic_work_form_spec
@@ -30,26 +31,34 @@ RSpec.describe Hyrax::Forms::WorkForm do
   end
 
   describe '#member_of_collections' do
-    subject { form.member_of_collections(args) }
+    subject { form.member_of_collections }
+
+    before do
+      allow(controller).to receive(:params).and_return(add_works_to_collection: collection_id)
+    end
 
     context 'when passed nil' do
-      let(:args) { nil }
+      let(:collection_id) { nil }
 
       it { is_expected.to be_empty }
     end
+
     context 'when passed a string' do
-      let(:args) { 'foobar' }
+      let(:collection) { create(:collection) }
+      let(:collection_id) { collection.id }
 
-      it { is_expected.to match_array([args]) }
+      it { is_expected.to match_array([collection]) }
     end
+
     context 'when member of other collections' do
-      let(:args) { 'bar' }
+      let(:collection) { create(:collection) }
+      let(:collection_id) { collection.id }
 
       before do
-        allow(work).to receive(:member_of_collection_ids).and_return(['foo'])
+        allow(work).to receive(:member_of_collections).and_return(['foo'])
       end
 
-      it { is_expected.to match_array(['foo', args]) }
+      it { is_expected.to match_array(['foo', collection]) }
     end
   end
 
@@ -80,8 +89,9 @@ RSpec.describe Hyrax::Forms::WorkForm do
                                :version,
                                :on_behalf_of,
                                { permissions_attributes: [:type, :name, :access, :id, :_destroy] },
-                               work_members_attributes: [:id, :_destroy],
-                               based_near_attributes: [:id, :_destroy])
+                               based_near_attributes: [:id, :_destroy],
+                               member_of_collections_attributes: [:id, :_destroy],
+                               work_members_attributes: [:id, :_destroy])
       }
     end
   end
@@ -124,7 +134,7 @@ RSpec.describe Hyrax::Forms::WorkForm do
 
       context "and a admin_set that allows grants has been selected" do
         let(:attributes) { { admin_set_id: admin_set.id, permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
-        let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+        let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
         let!(:workflow) { create(:workflow, allows_access_grant: true, active: true, permission_template_id: permission_template.id) }
 
         it do
@@ -141,7 +151,7 @@ RSpec.describe Hyrax::Forms::WorkForm do
 
       context "and an admin_set that doesn't allow grants has been selected" do
         let(:attributes) { { admin_set_id: admin_set.id, permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
-        let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+        let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
         let!(:workflow) { create(:workflow, allows_access_grant: false, active: true, permission_template_id: permission_template.id) }
 
         it { is_expected.to eq ActionController::Parameters.new(admin_set_id: admin_set.id).permit! }
@@ -175,6 +185,45 @@ RSpec.describe Hyrax::Forms::WorkForm do
     it { is_expected.to eq 'restricted' }
   end
 
+  describe '#primary_terms' do
+    it 'contains the required fields' do
+      expect(form.primary_terms).to include(*form.required_fields)
+    end
+
+    context 'with a field that is not in terms' do
+      let(:bad_term) { :BadWorkFormSpecTerm }
+
+      before { form.class.required_fields += [bad_term] }
+      after  { form.class.required_fields -= [bad_term] }
+
+      it 'logs a warning' do
+        expect(Rails.logger).to receive(:warn).with(/#{bad_term}/)
+        form.primary_terms
+      end
+
+      it 'does not include the errant term' do
+        expect(form.primary_terms).not_to include bad_term
+      end
+    end
+  end
+
+  describe '#secondary_terms' do
+    it 'does not contain the primary terms' do
+      expect(form.secondary_terms).not_to include(*form.primary_terms)
+    end
+
+    context 'with a new non-primary term' do
+      let(:new_term) { :WorkFormSpecTerm }
+
+      before { form.class.terms += [new_term] }
+      after  { form.class.terms -= [new_term] }
+
+      it 'adds the term to secondary' do
+        expect(form.secondary_terms).to include new_term
+      end
+    end
+  end
+
   describe '#human_readable_type' do
     subject { form.human_readable_type }
 

data/spec/forms/hyrax/forms/workflow_action_form_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::Forms::WorkflowActionForm, no_clean: true do
+RSpec.describe Hyrax::Forms::WorkflowActionForm do
   let(:work) { create(:work) }
   let(:sipity_entity) do
     create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s, workflow_state_id: 2)

data/spec/forms/hyrax/generic_work_form_spec.rb

@@ -46,16 +46,18 @@ RSpec.describe Hyrax::GenericWorkForm do
   end
 
   describe '.model_attributes' do
-    let(:permission_template) { create(:permission_template, admin_set_id: admin_set_id) }
+    let(:permission_template) { create(:permission_template, source_id: source_id) }
     let!(:workflow) { create(:workflow, active: true, permission_template_id: permission_template.id) }
-    let(:admin_set_id) { '123' }
+    let(:source_id) { '123' }
+    let(:file_set) { create(:file_set) }
     let(:params) do
       ActionController::Parameters.new(
         title: ['foo'],
         description: [''],
         visibility: 'open',
-        admin_set_id: admin_set_id,
+        source_id: source_id,
         representative_id: '456',
+        rendering_ids: [file_set.id],
         thumbnail_id: '789',
         keyword: ['derp'],
         license: ['http://creativecommons.org/licenses/by/3.0/us/'],
@@ -72,6 +74,7 @@ RSpec.describe Hyrax::GenericWorkForm do
       expect(subject['license']).to eq ['http://creativecommons.org/licenses/by/3.0/us/']
       expect(subject['keyword']).to eq ['derp']
       expect(subject['member_of_collection_ids']).to eq ['123456', 'abcdef']
+      expect(subject['rendering_ids']).to eq [file_set.id]
     end
 
     context '.model_attributes' do

data/spec/helpers/hyrax/ability_helper_spec.rb

@@ -21,6 +21,7 @@ RSpec.describe Hyrax::AbilityHelper do
       end
     end
   end
+
   describe "#visibility_options" do
     let(:public_opt) { ['Public', Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC] }
     let(:authenticated_opt) { [t('hyrax.institution_name'), Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED] }
@@ -47,4 +48,14 @@ RSpec.describe Hyrax::AbilityHelper do
       it { is_expected.to eql(options) }
     end
   end
+
+  describe "#render_visibility_link" do
+    subject { helper.render_visibility_link(document) }
+
+    context 'admin set' do
+      let(:document) { double(admin_set?: true) }
+
+      it { is_expected.to be_nil }
+    end
+  end
 end