hyrax 3.0.0.pre.beta1 → 3.0.0.pre.beta2

data/spec/lib/hyrax/resource_sync/change_list_writer_spec.rb

@@ -10,6 +10,27 @@ RSpec.describe Hyrax::ResourceSync::ChangeListWriter, :clean_repo do
     described_class.new(resource_host: 'example.com',
                         capability_list_url: capability_list)
   end
+  let(:namespaces) do
+    {
+      'rs' => "http://www.openarchives.org/rs/terms/",
+      'x' => sitemap
+    }
+  end
+  let(:capability_element) { xml.xpath('//rs:ln/@href', 'rs' => "http://www.openarchives.org/rs/terms/") }
+  # The creation and modified dates are used in order to determine whether or
+  # not the status is "created" or "updated"
+  # This avoids any potential delays/conflicts when testing against Solr and
+  # Fedora within the testing environment
+  # @see Hyrax::ResourceSync::ChangeListWriter#build_resource
+  let(:file_set_status) do
+    file_set.create_date.to_i == file_set.modified_date.to_i ? 'created' : 'updated'
+  end
+  let(:public_work_status) do
+    public_work.create_date.to_i == public_work.modified_date.to_i ? 'created' : 'updated'
+  end
+  let(:public_collection_status) do
+    public_collection.create_date.to_i == public_collection.modified_date.to_i ? 'created' : 'updated'
+  end
 
   subject { instance.write }
 
@@ -22,43 +43,36 @@ RSpec.describe Hyrax::ResourceSync::ChangeListWriter, :clean_repo do
   context "when resources exist" do
     before do
       # These private items should not show up.
-      create(:private_collection)
+      build(:private_collection_lw)
       create(:work)
 
-      # Sleep in between to ensure modified dates are different
       public_collection
-      sleep(1)
       public_work
-      sleep(1)
       file_set
     end
 
     it "has a list of resources" do
-      capability = xml.xpath('//rs:ln/@href', 'rs' => "http://www.openarchives.org/rs/terms/").text
-      expect(capability).to eq capability_list
-
-      expect(location(1)).to eq "http://example.com/concern/file_sets/#{file_set.id}"
-      expect(change(1)).to eq "created"
-
-      expect(location(2)).to eq "http://example.com/concern/generic_works/#{public_work.id}"
-      expect(change(2)).to eq "created"
-
-      expect(location(3)).to eq "http://example.com/collections/#{public_collection.id}"
-      expect(change(3)).to eq "created"
+      expect(capability_element.text).to eq capability_list
+      locations = location_elements(namespaces).map(&:text)
+      expect(locations).to include "http://example.com/concern/file_sets/#{file_set.id}"
+      expect(locations).to include "http://example.com/concern/generic_works/#{public_work.id}"
+      expect(locations).to include "http://example.com/collections/#{public_collection.id}"
+      changed = changed_elements(namespaces).map(&:value)
+      expect(changed).to match_array([public_collection_status, public_work_status, file_set_status])
 
       expect(url_list.count).to eq 3
     end
   end
 
-  def change(n)
-    query(n, 'rs:md/@change', 'rs' => "http://www.openarchives.org/rs/terms/")
+  def changed_elements(namespaces = {})
+    query("rs:md/@change", namespaces)
   end
 
-  def location(n)
-    query(n, 'x:loc')
+  def location_elements(namespaces = {})
+    query("x:loc", namespaces)
   end
 
-  def query(n, part, ns = {})
-    xml.xpath("//x:url[#{n}]/#{part}", ns.merge('x' => sitemap)).text
+  def query(part, ns = {})
+    xml.xpath("//x:url/#{part}", ns)
   end
 end

data/spec/lib/hyrax/resource_sync/resource_list_writer_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Hyrax::ResourceSync::ResourceListWriter, :clean_repo do
   let(:sitemap) { 'http://www.sitemaps.org/schemas/sitemap/0.9' }
-  let!(:private_collection) { create(:private_collection) }
+  let!(:private_collection) { build(:private_collection_lw) }
   let!(:public_collection) { create(:public_collection) }
   let!(:public_work) { create(:public_generic_work) }
   let!(:private_work) { create(:work) }

data/spec/models/collection_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Collection, type: :model do
-  let(:collection) { build(:public_collection) }
+  let(:collection) { build(:public_collection_lw) }
 
   it "has open visibility" do
     expect(collection.read_groups).to eq ['public']
@@ -15,7 +15,7 @@ RSpec.describe Collection, type: :model do
 
   describe "#to_solr" do
     let(:user) { build(:user) }
-    let(:collection) { build(:collection, user: user, title: ['A good title']) }
+    let(:collection) { build(:collection_lw, user: user, title: ['A good title']) }
 
     let(:solr_document) { collection.to_solr }
 
@@ -40,7 +40,7 @@ RSpec.describe Collection, type: :model do
   end
 
   describe "#members_objects", clean_repo: true do
-    let(:collection) { create(:collection) }
+    let(:collection) { create(:collection_lw) }
 
     it "is empty by default" do
       expect(collection.member_objects).to match_array []
@@ -80,7 +80,7 @@ RSpec.describe Collection, type: :model do
   end
 
   describe "#destroy", clean_repo: true do
-    let(:collection) { build(:collection) }
+    let(:collection) { build(:collection_lw) }
     let(:work1) { create(:work) }
 
     before do
@@ -130,7 +130,7 @@ RSpec.describe Collection, type: :model do
   end
 
   describe '#collection_type_gid=' do
-    let(:collection) { build(:collection) }
+    let(:collection) { build(:collection_lw) }
     let(:collection_type) { create(:collection_type) }
 
     it 'sets gid' do
@@ -170,7 +170,7 @@ RSpec.describe Collection, type: :model do
   end
 
   describe 'collection type delegated methods' do
-    subject { build(:collection) }
+    subject { build(:collection_lw) }
 
     it { is_expected.to delegate_method(:nestable?).to(:collection_type) }
     it { is_expected.to delegate_method(:discoverable?).to(:collection_type) }
@@ -185,7 +185,7 @@ RSpec.describe Collection, type: :model do
 
   describe '.after_destroy' do
     it 'will destroy the associated permission template' do
-      collection = create(:collection, with_permission_template: true)
+      collection = build(:collection_lw, with_permission_template: true)
       expect { collection.destroy }.to change { Hyrax::PermissionTemplate.count }.by(-1)
     end
   end
@@ -193,7 +193,7 @@ RSpec.describe Collection, type: :model do
   describe '#reset_access_controls!' do
     let!(:user) { build(:user) }
     let(:collection_type) { create(:collection_type) }
-    let!(:collection) { create(:collection, user: user, collection_type_gid: collection_type.gid) }
+    let!(:collection) { build(:collection_lw, user: user, collection_type_gid: collection_type.gid) }
     let!(:permission_template) { build(:permission_template) }
 
     before do
@@ -236,20 +236,20 @@ RSpec.describe Collection, type: :model do
 
     describe 'permission template' do
       it 'will be created when with_permission_template is true' do
-        expect { create(:collection, with_permission_template: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:collection_lw, with_permission_template: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
       end
 
       it 'will be created when with_permission_template is set to attributes identifying access' do
-        expect { create(:collection, with_permission_template: { manage_users: [user] }) }.to change { Hyrax::PermissionTemplate.count }.by(1)
-        expect { create(:collection, with_permission_template: { manage_users: [user], deposit_users: [user] }) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:collection_lw, with_permission_template: { manage_users: [user] }) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:collection_lw, with_permission_template: { manage_users: [user], deposit_users: [user] }) }.to change { Hyrax::PermissionTemplate.count }.by(1)
       end
 
       it 'will be created when create_access is true' do
-        expect { create(:collection, create_access: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { create(:collection_lw, with_permission_template: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
       end
 
       it 'will not be created by default' do
-        expect { create(:collection) }.not_to change { Hyrax::PermissionTemplate.count }
+        expect { build(:collection_lw) }.not_to change { Hyrax::PermissionTemplate.count }
       end
     end
 
@@ -264,11 +264,11 @@ RSpec.describe Collection, type: :model do
       end
 
       it 'will be created when create_access is true' do
-        expect { create(:collection, user: user, create_access: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:collection_lw, user: user, with_permission_template: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
       end
 
       it 'will not be created by default' do
-        expect { create(:collection) }.not_to change { Hyrax::PermissionTemplateAccess.count }
+        expect { build(:collection_lw) }.not_to change { Hyrax::PermissionTemplateAccess.count }
       end
     end
 
@@ -293,7 +293,7 @@ RSpec.describe Collection, type: :model do
 
       context 'when building a collection' do
         let(:coll123) do
-          build(:collection,
+          build(:collection_lw,
                 id: 'Collection123',
                 collection_type_gid: collection_type.gid,
                 with_nesting_attributes:
@@ -318,8 +318,8 @@ RSpec.describe Collection, type: :model do
   end
 
   describe '#update_nested_collection_relationship_indices', :with_nested_reindexing do
-    it 'will be called after save' do
-      expect(Samvera::NestingIndexer).to receive(:reindex_relationships).with(id: kind_of(String), extent: kind_of(String))
+    it 'will be called once for the Collection resource and once for the nested ACL permission resource' do
+      expect(Samvera::NestingIndexer).to receive(:reindex_relationships).exactly(2).times.with(id: kind_of(String), extent: kind_of(String))
       collection.save!
     end
   end

data/spec/models/concerns/hyrax/collection_nesting_spec.rb

@@ -31,8 +31,8 @@ RSpec.describe Hyrax::CollectionNesting do
     end
 
     let(:user) { create(:user) }
-    let!(:collection) { create(:collection, collection_type_settings: [:nestable]) }
-    let!(:child_collection) { create(:collection, collection_type_settings: [:nestable]) }
+    let!(:collection) { build(:collection_lw, collection_type_settings: [:nestable]) }
+    let!(:child_collection) { create(:collection_lw, collection_type_settings: [:nestable]) }
     let(:extent) { Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX }
 
     before do

data/spec/models/file_set_spec.rb

@@ -487,8 +487,8 @@ RSpec.describe FileSet do
     end
 
     let(:depositor) { 'jcoyne' }
-    let(:depositor_key) { Solrizer.solr_name('depositor') }
-    let(:title_key) { Solrizer.solr_name('title', :stored_searchable, type: :string) }
+    let(:depositor_key) { ActiveFedora.index_field_mapper.solr_name('depositor') }
+    let(:title_key) { ActiveFedora.index_field_mapper.solr_name('title', :stored_searchable, type: :string) }
     let(:title) { ['abc123'] }
     let(:no_terms) { described_class.find(subject.id).to_solr }
     let(:terms) do

data/spec/models/hyrax/collection_type_spec.rb

@@ -134,7 +134,7 @@ RSpec.describe Hyrax::CollectionType, type: :model do
   end
 
   describe "collections" do
-    let!(:collection) { create(:collection, collection_type_gid: collection_type.gid.to_s) }
+    let!(:collection) { create(:collection_lw, collection_type_gid: collection_type.gid.to_s) }
     let(:collection_type) { create(:collection_type) }
 
     it 'returns collections of this collection type' do
@@ -151,7 +151,7 @@ RSpec.describe Hyrax::CollectionType, type: :model do
     let(:collection_type) { create(:collection_type) }
 
     it 'returns true if there are any collections of this collection type' do
-      create(:collection, collection_type_gid: collection_type.gid.to_s)
+      create(:collection_lw, collection_type_gid: collection_type.gid.to_s)
       expect(collection_type).to have_collections
     end
     it 'returns false if there are not any collections of this collection type' do

data/spec/models/user_spec.rb

@@ -35,8 +35,33 @@ RSpec.describe User, type: :model do
     end
   end
 
+  describe '#user_key' do
+    it 'is email by default' do
+      expect(user.user_key).to eq user.email
+    end
+
+    context 'with a custom user_key_field' do
+      let(:user)  { build(:user, display_name: value) }
+      let(:value) { 'moomin' }
+
+      before do
+        allow(Hydra.config).to receive(:user_key_field).and_return(:display_name)
+      end
+
+      it 'is email by default' do
+        expect(user.user_key).to eq value
+      end
+
+      it 'is findable by user_key' do
+        user.save
+
+        expect(User.find_by_user_key(value)).to eq user
+      end
+    end
+  end
+
   it "has an email" do
-    expect(user.user_key).to be_kind_of String
+    expect(user.email).to be_kind_of String
   end
   it "has activity stream-related methods defined" do
     expect(user).to respond_to(:stream)

data/spec/presenters/hyrax/collection_presenter_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Hyrax::CollectionPresenter do
   end
 
   let(:collection) do
-    build(:collection,
+    build(:collection_lw,
           id: 'adc12v',
           description: ['a nice collection'],
           based_near: ['Over there'],
@@ -61,7 +61,7 @@ RSpec.describe Hyrax::CollectionPresenter do
     let(:collection_type) { create(:collection_type) }
 
     describe 'when solr_document#collection_type_gid exists' do
-      let(:collection) { build(:collection, collection_type_gid: collection_type.gid) }
+      let(:collection) { build(:collection_lw, collection_type_gid: collection_type.gid) }
       let(:solr_doc) { SolrDocument.new(collection.to_solr) }
 
       it 'finds the collection type based on the solr_document#collection_type_gid if one exists' do
@@ -173,7 +173,7 @@ RSpec.describe Hyrax::CollectionPresenter do
     end
 
     context "collection with private collection" do
-      let!(:work) { create(:private_collection, member_of_collections: [collection]) }
+      let!(:work) { build(:private_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 0 }
     end
@@ -185,14 +185,14 @@ RSpec.describe Hyrax::CollectionPresenter do
     end
 
     context "collection with public collection" do
-      let!(:subcollection) { create(:public_collection, member_of_collections: [collection]) }
+      let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 1 }
     end
 
     context "collection with public work and sub-collection" do
       let!(:work) { create(:public_work, member_of_collections: [collection]) }
-      let!(:subcollection) { create(:public_collection, member_of_collections: [collection]) }
+      let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 2 }
     end
@@ -232,7 +232,7 @@ RSpec.describe Hyrax::CollectionPresenter do
 
     context "collection with public work and sub-collection" do
       let!(:work) { create(:public_work, member_of_collections: [collection]) }
-      let!(:subcollection) { create(:public_collection, member_of_collections: [collection]) }
+      let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 1 }
     end
@@ -259,20 +259,20 @@ RSpec.describe Hyrax::CollectionPresenter do
     end
 
     context "collection with private collection" do
-      let!(:subcollection) { create(:private_collection, member_of_collections: [collection]) }
+      let!(:subcollection) { build(:private_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 0 }
     end
 
     context "collection with public collection" do
-      let!(:subcollection) { create(:public_collection, member_of_collections: [collection]) }
+      let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 1 }
     end
 
     context "collection with public work and sub-collection" do
       let!(:work) { create(:public_work, member_of_collections: [collection]) }
-      let!(:subcollection) { create(:public_collection, member_of_collections: [collection]) }
+      let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
 
       it { is_expected.to eq 1 }
     end
@@ -310,8 +310,8 @@ RSpec.describe Hyrax::CollectionPresenter do
     end
 
     context('when parent_collections is has collections') do
-      let(:collection1) { build(:collection, title: ['col1']) }
-      let(:collection2) { build(:collection, title: ['col2']) }
+      let(:collection1) { build(:collection_lw, title: ['col1']) }
+      let(:collection2) { build(:collection_lw, title: ['col2']) }
       let!(:parent_docs) { [collection1, collection2] }
 
       before do

data/spec/presenters/hyrax/work_show_presenter_spec.rb

@@ -22,6 +22,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
   it { is_expected.to delegate_method(:date_modified).to(:solr_document) }
   it { is_expected.to delegate_method(:date_uploaded).to(:solr_document) }
   it { is_expected.to delegate_method(:rights_statement).to(:solr_document) }
+  it { is_expected.to delegate_method(:rights_notes).to(:solr_document) }
 
   it { is_expected.to delegate_method(:based_near_label).to(:solr_document) }
   it { is_expected.to delegate_method(:related_url).to(:solr_document) }
@@ -531,6 +532,16 @@ RSpec.describe Hyrax::WorkShowPresenter do
         expect(subject[0]['label']).to eq('Title')
         expect(subject[0]['value']).to include('Test title', 'Another test title')
       end
+
+      context "when there are html tags in the metadata" do
+        before do
+          work.title = ["The title<img src=xx:x onerror=eval('\x61ler\x74(1)') />", 'Another test title']
+        end
+
+        it "sanitizes the metadata values" do
+          expect(subject[0]['value']).to include('The title<img>', 'Another test title')
+        end
+      end
     end
   end
 

data/spec/search_builders/hyrax/collection_member_search_builder_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Hyrax::CollectionMemberSearchBuilder do
   let(:context) { double("context", blacklight_config: CatalogController.blacklight_config) }
   let(:solr_params) { { fq: [] } }
   let(:include_models) { :both }
-  let(:collection) { build(:collection, id: '12345') }
+  let(:collection) { build(:collection_lw, id: '12345') }
   let(:builder) { described_class.new(scope: context, collection: collection, search_includes_models: include_models) }
 
   describe ".default_processor_chain" do

data/spec/search_builders/hyrax/collection_search_builder_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe Hyrax::CollectionSearchBuilder do
 
     context 'when access is :deposit' do
       let(:access) { "deposit" }
-      let!(:collection) { create(:collection, with_permission_template: attributes) }
+      let!(:collection) { create(:collection_lw, with_permission_template: attributes) }
 
       context 'and user has access' do
         let(:attributes) { { deposit_users: [user.user_key] } }

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

@@ -61,7 +61,7 @@ RSpec.describe Hyrax::Dashboard::NestedCollectionsSearchBuilder do
 
     context 'when access is :deposit' do
       let(:access) { "deposit" }
-      let!(:collection) { create(:collection, with_permission_template: attributes) }
+      let!(:collection) { create(:collection_lw, with_permission_template: attributes) }
 
       context 'and user has access' do
         let(:attributes) { { deposit_users: [user.user_key] } }

data/spec/search_builders/hyrax/work_relation_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Hyrax::WorkRelation, :clean_repo do
   let!(:work) { create(:generic_work) }
   let!(:file_set) { create(:file_set) }
-  let!(:collection) { create(:collection) }
+  let!(:collection) { build(:collection_lw) }
 
   it 'has works and not collections or file sets' do
     expect(subject).to eq [work]

data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb

@@ -64,8 +64,8 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
   end
 
   describe '.each_perservation_document_id_and_parent_ids', clean_repo: true do
-    let!(:nested_parent) { create(:collection, member_of_collections: []) }
-    let!(:nested_with_parent) { create(:collection, member_of_collections: [nested_parent]) }
+    let!(:nested_parent) { build(:collection_lw, member_of_collections: []) }
+    let!(:nested_with_parent) { create(:collection_lw, member_of_collections: [nested_parent]) }
     let!(:work) { create(:generic_work) }
     let(:count_of_items) { ActiveFedora::Base.descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true).count }