hyrax 2.1.0.beta1 → 2.1.0.beta2

data/spec/models/hyrax/collection_type_spec.rb

@@ -23,6 +23,7 @@ RSpec.describe Hyrax::CollectionType, type: :model do
 
   it "has configuration properties with defaults" do
     expect(collection_type).to be_nestable
+    expect(collection_type).to be_brandable
     expect(collection_type).to be_discoverable
     expect(collection_type).to be_sharable
     expect(collection_type).to be_share_applies_to_new_works

data/spec/presenters/hyrax/collection_presenter_spec.rb

@@ -32,6 +32,7 @@ RSpec.describe Hyrax::CollectionPresenter do
     subject { presenter }
 
     it { is_expected.to delegate_method(:collection_type_is_nestable?).to(:collection_type).as(:nestable?) }
+    it { is_expected.to delegate_method(:collection_type_is_brandable?).to(:collection_type).as(:brandable?) }
     it { is_expected.to delegate_method(:collection_type_is_discoverable?).to(:collection_type).as(:discoverable?) }
     it { is_expected.to delegate_method(:collection_type_is_sharable?).to(:collection_type).as(:sharable?) }
     it { is_expected.to delegate_method(:collection_type_is_share_applies_to_new_works?).to(:collection_type).as(:share_applies_to_new_works?) }
@@ -321,106 +322,6 @@ RSpec.describe Hyrax::CollectionPresenter do
     end
   end
 
-  describe "#more_parent_collections?" do
-    subject { presenter.more_parent_collections? }
-
-    context('when parent_collections is has no collections') do
-      before do
-        allow(presenter).to receive(:parent_collection_count).and_return(0)
-      end
-
-      it { is_expected.to eq false }
-    end
-
-    context('when parent_collections has less than or equal to show limit') do
-      before do
-        allow(presenter).to receive(:parent_collection_count).and_return(3)
-      end
-
-      it { is_expected.to eq false }
-    end
-
-    context('when parent_collections has more than show limit') do
-      before do
-        allow(presenter).to receive(:parent_collection_count).and_return(4)
-      end
-
-      it { is_expected.to eq true }
-    end
-  end
-
-  describe "#visible_parent_collections" do
-    subject { presenter.visible_parent_collections }
-
-    let(:collection1) { build(:collection, title: ['col1']) }
-    let(:collection2) { build(:collection, title: ['col2']) }
-    let(:collection3) { build(:collection, title: ['col3']) }
-    let(:collection4) { build(:collection, title: ['col4']) }
-    let(:collection5) { build(:collection, title: ['col5']) }
-    let(:parent_collections) { double(Object, documents: parent_docs, response: { "numFound" => parent_docs.size }, total_pages: 1) }
-
-    before do
-      presenter.parent_collections = parent_collections
-    end
-
-    context('when parent_collections is nil') do
-      let(:parent_collections) { nil }
-
-      it { is_expected.to eq [] }
-    end
-
-    context('when parent_collections has less than or equal to show limit') do
-      let(:parent_docs) { [collection1, collection2, collection3] }
-
-      it { is_expected.to include(collection1, collection2, collection3) }
-    end
-
-    context('when parent_collections has more than show limit') do
-      let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
-
-      it { is_expected.to include(collection1, collection2, collection3) }
-    end
-  end
-
-  describe "#more_parent_collections" do
-    subject { presenter.more_parent_collections }
-
-    let(:collection1) { build(:collection, title: ['col1']) }
-    let(:collection2) { build(:collection, title: ['col2']) }
-    let(:collection3) { build(:collection, title: ['col3']) }
-    let(:collection4) { build(:collection, title: ['col4']) }
-    let(:collection5) { build(:collection, title: ['col5']) }
-    let(:parent_collections) { double(Object, documents: parent_docs, response: { "numFound" => parent_docs.size }, total_pages: 1) }
-
-    before do
-      presenter.parent_collections = parent_collections
-    end
-
-    context('when parent_collections is nil') do
-      let(:parent_collections) { nil }
-
-      it { is_expected.to eq [] }
-    end
-
-    context('when parent_collections is empty') do
-      let(:parent_docs) { [] }
-
-      it { is_expected.to eq [] }
-    end
-
-    context('when parent_collections has less than or equal to show limit') do
-      let(:parent_docs) { [collection1, collection2, collection3] }
-
-      it { is_expected.to eq [] }
-    end
-
-    context('when parent_collections has more than show limit') do
-      let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
-
-      it { is_expected.to include(collection4, collection5) }
-    end
-  end
-
   describe "#user_can_nest_collection?" do
     before do
       allow(ability).to receive(:can?).with(:deposit, solr_doc).and_return(true)

data/spec/presenters/hyrax/file_set_presenter_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Hyrax::FileSetPresenter do
       # https://github.com/samvera/active_fedora/issues/1251
       allow(file).to receive(:persisted?).and_return(true)
     end
-    it { expect(presenter.stats_path).to eq Hyrax::Engine.routes.url_helpers.stats_file_path(id: file) }
+    it { expect(presenter.stats_path).to eq Hyrax::Engine.routes.url_helpers.stats_file_path(id: file, locale: 'en') }
   end
 
   subject { presenter }
@@ -284,8 +284,13 @@ RSpec.describe Hyrax::FileSetPresenter do
     let(:file_set) { create(:file_set) }
     let(:solr_document) { SolrDocument.new(file_set.to_solr) }
     let(:request) { double(base_url: 'http://test.host') }
-    let(:presenter) { described_class.new(solr_document, nil, request) }
+    let(:presenter) { described_class.new(solr_document, ability, request) }
     let(:id) { CGI.escape(file_set.original_file.id) }
+    let(:read_permission) { true }
+
+    before do
+      allow(ability).to receive(:can?).with(:read, solr_document.id).and_return(read_permission)
+    end
 
     describe "#display_image" do
       subject { presenter.display_image }
@@ -311,6 +316,10 @@ RSpec.describe Hyrax::FileSetPresenter do
         context "when the file is an image" do
           let(:file_path) { File.open(fixture_path + '/world.png') }
 
+          before do
+            allow(solr_document).to receive(:image?).and_return(true)
+          end
+
           it { is_expected.to be_instance_of IIIFManifest::DisplayImage }
           its(:url) { is_expected.to eq "http://test.host/images/#{id}/full/600,/0/default.jpg" }
 
@@ -344,6 +353,12 @@ RSpec.describe Hyrax::FileSetPresenter do
             it { is_expected.to be_instance_of IIIFManifest::DisplayImage }
             its(:url) { is_expected.to eq "http://test.host/downloads/#{id.split('/').first}" }
           end
+
+          context "when the user doesn't have permission to view the image" do
+            let(:read_permission) { false }
+
+            it { is_expected.to be_nil }
+          end
         end
       end
     end

data/spec/presenters/hyrax/menu_presenter_spec.rb

@@ -79,6 +79,12 @@ RSpec.describe Hyrax::MenuPresenter do
 
       it { is_expected.to be false }
     end
+
+    context "for the Hyrax::DepositorsController" do
+      let(:controller) { Hyrax::DepositorsController.new }
+
+      it { is_expected.to be true }
+    end
   end
 
   describe "#show_configuration?" do

data/spec/presenters/hyrax/work_show_presenter_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
       "date_created_tesim" => ['an unformatted date'],
       "depositor_tesim" => user_key }
   end
-  let(:ability) { nil }
+  let(:ability) { double Ability }
   let(:presenter) { described_class.new(solr_document, ability, request) }
 
   subject { described_class.new(double, double) }
@@ -48,10 +48,16 @@ RSpec.describe Hyrax::WorkShowPresenter do
     let(:representative_presenter) { double('representative', present?: false) }
     let(:image_boolean) { false }
     let(:iiif_enabled) { false }
+    let(:file_set_presenter) { Hyrax::FileSetPresenter.new(solr_document, ability) }
+    let(:file_set_presenters) { [file_set_presenter] }
+    let(:read_permission) { true }
 
     before do
       allow(presenter).to receive(:representative_id).and_return(id_present)
       allow(presenter).to receive(:representative_presenter).and_return(representative_presenter)
+      allow(presenter).to receive(:file_set_presenters).and_return(file_set_presenters)
+      allow(file_set_presenter).to receive(:image?).and_return(true)
+      allow(ability).to receive(:can?).with(:read, solr_document.id).and_return(read_permission)
       allow(representative_presenter).to receive(:image?).and_return(image_boolean)
       allow(Hyrax.config).to receive(:iiif_image_server?).and_return(iiif_enabled)
     end
@@ -92,6 +98,12 @@ RSpec.describe Hyrax::WorkShowPresenter do
       let(:iiif_enabled) { true }
 
       it { is_expected.to be true }
+
+      context "when the user doesn't have permission to view the image" do
+        let(:read_permission) { false }
+
+        it { is_expected.to be false }
+      end
     end
   end
 
@@ -106,7 +118,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
       allow(work).to receive(:persisted?).and_return(true)
     end
 
-    it { expect(presenter.stats_path).to eq Hyrax::Engine.routes.url_helpers.stats_work_path(id: work) }
+    it { expect(presenter.stats_path).to eq Hyrax::Engine.routes.url_helpers.stats_work_path(id: work, locale: 'en') }
   end
 
   describe '#itemtype' do
@@ -300,7 +312,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
   describe '#page_title' do
     subject { presenter.page_title }
 
-    it { is_expected.to eq 'foo' }
+    it { is_expected.to eq 'Generic Work | foo | ID: 888888 | Hyrax' }
   end
 
   describe "#valid_child_concerns" do

data/spec/search_builders/hyrax/abstract_type_relation_spec.rb

@@ -0,0 +1,18 @@
+RSpec.describe Hyrax::AbstractTypeRelation, :clean_repo do
+  before do
+    stub_const 'AnotherWork', Class.new
+  end
+  it 'returns nil when no allowable types exist' do
+    allow(subject).to receive(:allowable_types).and_return([])
+    expect(subject.search_model_clause).to be_nil
+  end
+  it 'returns GenericWork when allowable types exist' do
+    allow(subject).to receive(:allowable_types).and_return([GenericWork])
+    expect(subject.search_model_clause).to include('GenericWork')
+  end
+  it 'returns both works when allowable types exist' do
+    allow(subject).to receive(:allowable_types).and_return([GenericWork, AnotherWork])
+    expect(subject.search_model_clause).to include('GenericWork')
+    expect(subject.search_model_clause).to include('AnotherWork')
+  end
+end

data/spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsSearchBuilder do
   let(:ability) do
     ::Ability.new(user)
   end
-  let(:user) { create(:user, groups: 'registered') }
+  let(:user) { build(:user, groups: 'registered') }
   let(:builder) { described_class.new(context) }
 
   describe '#models' do
@@ -49,37 +49,40 @@ RSpec.describe Hyrax::Dashboard::CollectionsSearchBuilder do
   end
 
   describe "#gated_discovery_filters" do
+    let(:user2) { build(:user) }
+    let!(:collection) { build(:collection_lw, user: user2, with_permission_template: permissions, with_solr_document: true) }
+
     subject { builder.gated_discovery_filters }
 
-    let(:collection) { create(:collection) }
-    let(:permission_template) { create(:permission_template, source_id: collection.id) }
+    context "user has manage access" do
+      let(:permissions) { { manage_users: [user] } }
+
+      it { is_expected.to include ["{!terms f=id}#{collection.id}"] }
+    end
 
     context "user has deposit access" do
-      before do
-        create(:permission_template_access,
-               permission_template: permission_template,
-               agent_type: 'user',
-               agent_id: user.user_key,
-               access: 'deposit')
-      end
+      let(:permissions) { { deposit_users: [user] } }
 
       it { is_expected.to include ["{!terms f=id}#{collection.id}"] }
     end
 
-    context "group has deposit access" do
-      before do
-        create(:permission_template_access,
-               permission_template: permission_template,
-               agent_type: 'group',
-               agent_id: 'registered',
-               access: 'deposit')
-      end
+    context "user has view access" do
+      let(:permissions) { { view_users: [user] } }
 
-      it { is_expected.to include ["{!terms f=id}#{collection.id}"] }
+      it { is_expected.not_to include ["{!terms f=id}#{collection.id}"] }
+    end
+
+    context "does not include registered group for read access" do
+      let(:permissions) { { view_groups: ['registered'] } }
+
+      it { is_expected.not_to include ["{!terms f=id}#{collection.id}"] }
     end
 
     context "does not include public group for read access" do
+      let(:permissions) { { view_groups: ['public'] } }
+
       let(:expected_discovery_filters) do
+        # all filters except no additional ids added for deposit collections
         [
           ["({!terms f=edit_access_group_ssim}public,registered)"],
           ["edit_access_person_ssim:#{user.user_key}", "read_access_person_ssim:#{user.user_key}"]
@@ -88,5 +91,13 @@ RSpec.describe Hyrax::Dashboard::CollectionsSearchBuilder do
 
       it { is_expected.to eq expected_discovery_filters }
     end
+
+    context "user has deposit access and registered has deposit access" do
+      # make sure that having registered deposit access, which isn't included, doesn't
+      # remove the user specific deposit access
+      let(:permissions) { { deposit_users: [user], view_groups: ['registered'] } }
+
+      it { is_expected.to include ["{!terms f=id}#{collection.id}"] }
+    end
   end
 end

data/spec/search_builders/hyrax/parent_collection_search_builder_spec.rb

@@ -0,0 +1,15 @@
+RSpec.describe Hyrax::ParentCollectionSearchBuilder do
+  let(:solr_params) { { fq: [] } }
+  let(:item) { double(id: '12345', member_of_collection_ids: ['col1']) }
+  let(:builder) { described_class.new(solr_params, context) }
+  let(:context) { double("context", blacklight_config: CatalogController.blacklight_config, item: item) }
+
+  describe '#include_item_ids' do
+    let(:subject) { builder.include_item_ids(solr_params) }
+
+    it 'updates solr_parameters[:fq]' do
+      subject
+      expect(solr_params[:fq]).to include("{!terms f=id}col1")
+    end
+  end
+end

data/spec/services/hyrax/collection_member_service_spec.rb

@@ -1,28 +1,19 @@
 RSpec.describe Hyrax::CollectionMemberService, :clean_repo do
-  let(:work_attrs) { { id: '123', title_tesim: ['A generic work'] } }
-
-  let(:coll1_attrs) { { id: 'col1', title_tesim: ['A Collection 1'], child_object_ids_ssim: [work.id] } }
-  let(:coll2_attrs) { { id: 'col2', title_tesim: ['A Collection 2'], child_object_ids_ssim: [work.id, 'abc123'] } }
-  let(:coll3_attrs) { { id: 'col3', title_tesim: ['A Collection 3'], child_object_ids_ssim: ['abc123'] } }
-
+  let(:user) { create(:user, groups: 'potato') }
+  let!(:ability) { ::Ability.new(user) }
+  let!(:col1) { build(:collection_lw, id: 'col1', user: user, with_solr_document: true) }
+  let!(:col2) { build(:collection_lw, id: 'col2', with_solr_document: true) }
+  let(:colls) { [col1.id, col2.id] }
+  let(:work_attrs) { { id: '123', title_tesim: ['A generic work'], member_of_collection_ids_ssim: colls } }
   let(:work) { SolrDocument.new(work_attrs) }
 
-  before do
-    ActiveFedora::SolrService.add(coll1_attrs)
-    ActiveFedora::SolrService.add(coll2_attrs)
-    ActiveFedora::SolrService.add(coll3_attrs)
-    ActiveFedora::SolrService.commit
-  end
-
   describe "#run" do
-    subject { described_class.run(work) }
+    subject { described_class.run(work, ability) }
 
-    specify "should return correct collections" do
-      expect(subject.length).to eq(2)
+    it "returns only authorized parent collections" do
+      expect(subject.count).to eq(1)
       ids = subject.map { |col| col[:id] }
-      expect(ids).to include(coll1_attrs[:id])
-      expect(ids).to include(coll2_attrs[:id])
-      expect(ids).not_to include(coll3_attrs[:id])
+      expect(ids).to contain_exactly(col1.id)
     end
   end
 end

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

@@ -8,6 +8,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       expect(ct.description).to eq('')
       expect(ct).to be_nestable
       expect(ct).to be_discoverable
+      expect(ct).to be_brandable
       expect(ct).to be_sharable
       expect(ct).to be_share_applies_to_new_works
       expect(ct).to be_allow_multiple_membership
@@ -42,6 +43,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       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_brandable
       expect(ct).not_to be_discoverable
       expect(ct).to be_sharable
       expect(ct).to be_share_applies_to_new_works
@@ -60,6 +62,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       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_brandable
       expect(ct).to be_discoverable
       expect(ct).to be_sharable
       expect(ct).not_to be_share_applies_to_new_works
@@ -84,8 +87,38 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
     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)
+      expect { described_class.add_participants(coltype.id, participants) }
+        .to change { Hyrax::CollectionType.find(coltype.id).collection_type_participants.to_a }
+        .to contain_exactly an_object_having_attributes(**participants.first)
+    end
+
+    context 'when participants are incomplete' do
+      let(:participants) do
+        [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
+           agent_id:   'test_group',
+           access:     Hyrax::CollectionTypeParticipant::MANAGE_ACCESS },
+         { agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
+           agent_id:   'test_group' }]
+      end
+
+      it 'logs and raises an error' do
+        expect(Rails.logger)
+          .to receive(:error)
+          .with a_string_starting_with('Participants not created')
+
+        expect { described_class.add_participants(coltype.id, participants) }
+          .to raise_error(described_class::InvalidParticipantError)
+      end
+
+      it 'does not add participants' do
+        expect do
+          begin
+            described_class.add_participants(coltype.id, participants)
+          rescue described_class::InvalidParticipantError
+            nil
+          end
+        end.not_to change { Hyrax::CollectionType.find(coltype.id).collection_type_participants.to_a }
+      end
     end
   end
 end