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

data/spec/features/collection_type_spec.rb

@@ -292,7 +292,7 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
     end
 
     context 'when collections exist of this type' do
-      let!(:collection1) { create(:public_collection, user: build(:user), collection_type_gid: exhibit_collection_type.gid) }
+      let!(:collection1) { create(:public_collection_lw, user: build(:user), collection_type_gid: exhibit_collection_type.gid) }
 
       before do
         exhibit_collection_type
@@ -352,7 +352,7 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
 
     context 'when collections exist of this type' do
       let!(:not_empty_collection_type) { create(:collection_type, title: 'Not Empty Type', creator_user: admin_user) }
-      let!(:collection1) { create(:public_collection, user: admin_user, collection_type_gid: not_empty_collection_type.gid) }
+      let!(:collection1) { create(:public_collection_lw, user: admin_user, collection_type_gid: not_empty_collection_type.gid) }
       let(:deny_delete_modal_text) do
         'You cannot delete this collection type because one or more collections of this type have already been created. ' \
         'To delete this collection type, first ensure that all collections of this type have been deleted.'

data/spec/features/dashboard/collection_spec.rb

@@ -11,10 +11,10 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
   # Setting Title on admin sets to avoid false positive matches with collections.
   let(:admin_set_a) { create(:admin_set, creator: [admin_user.user_key], title: ['Set A'], with_permission_template: true) }
   let(:admin_set_b) { create(:admin_set, creator: [user.user_key], title: ['Set B'], edit_users: [user.user_key], with_permission_template: true) }
-  let(:collection1) { create(:public_collection, user: user, collection_type_gid: collection_type.gid, create_access: true) }
-  let(:collection2) { create(:public_collection, user: user, collection_type_gid: collection_type.gid, create_access: true) }
-  let(:collection3) { create(:public_collection, user: admin_user, collection_type_gid: collection_type.gid, create_access: true) }
-  let(:collection4) { create(:public_collection, user: admin_user, collection_type_gid: user_collection_type.gid, create_access: true) }
+  let(:collection1) { create(:public_collection_lw, user: user, collection_type_gid: collection_type.gid, with_permission_template: true) }
+  let(:collection2) { create(:public_collection_lw, user: user, collection_type_gid: collection_type.gid, with_permission_template: true) }
+  let(:collection3) { create(:public_collection_lw, user: admin_user, collection_type_gid: collection_type.gid, with_permission_template: true) }
+  let(:collection4) { create(:public_collection_lw, user: admin_user, collection_type_gid: user_collection_type.gid, with_permission_template: true) }
 
   describe 'Your Collections tab' do
     context 'when non-admin user' do
@@ -250,7 +250,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         expect(page).to have_selector "input.collection_creator.multi_value"
 
         fill_in('Title', with: title)
-        fill_in('Abstract or Summary', with: description)
+        fill_in('Description', with: description)
         fill_in('Related URL', with: 'http://example.com/')
 
         click_button("Save")
@@ -281,7 +281,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         expect(page).to have_selector "input.collection_creator.multi_value"
 
         fill_in('Title', with: title)
-        fill_in('Abstract or Summary', with: description)
+        fill_in('Description', with: description)
         fill_in('Related URL', with: 'http://example.com/')
 
         click_button("Save")
@@ -328,8 +328,8 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
   end
 
   describe 'delete collection' do
-    let!(:empty_collection) { create(:public_collection, title: ['Empty Collection'], user: user, create_access: true) }
-    let!(:collection) { create(:public_collection, title: ['Collection with Work'], user: user, create_access: true) }
+    let!(:empty_collection) { create(:public_collection_lw, title: ['Empty Collection'], user: user, with_permission_template: true) }
+    let!(:collection) { create(:public_collection_lw, title: ['Collection with Work'], user: user, with_permission_template: true) }
     let!(:admin_user) { create(:admin) }
     let!(:empty_adminset) { create(:admin_set, title: ['Empty Admin Set'], creator: [admin_user.user_key], with_permission_template: true) }
     let!(:adminset) { create(:admin_set, title: ['Admin Set with Work'], creator: [admin_user.user_key], with_permission_template: true) }
@@ -564,7 +564,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
   describe 'collection show page' do
     let(:collection) do
-      create(:public_collection, user: user, description: ['collection description'], create_access: true)
+      build(:public_collection_lw, user: user, description: ['collection description'], with_permission_template: true)
     end
     let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user: user) }
     let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user: user) }
@@ -707,7 +707,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
       sign_in user
     end
-    let(:collection) { create(:named_collection, user: user, create_access: true) }
+    let(:collection) { create(:named_collection_lw, user: user, with_permission_template: true) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit '/dashboard/my/collections'
@@ -762,7 +762,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
   end
 
   describe 'edit collection' do
-    let(:collection) { create(:named_collection, user: user, create_access: true) }
+    let(:collection) { build(:named_collection_lw, user: user, with_permission_template: true) }
     let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user: user) }
     let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user: user) }
 
@@ -815,7 +815,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           creators = ["Dorje Trollo", "Vajrayogini"]
 
           fill_in('Title', with: new_title)
-          fill_in('Abstract or Summary', with: new_description)
+          fill_in('Description', with: new_description)
           fill_in('Creator', with: creators.first)
           within('.panel-footer') do
             click_button('Save changes')
@@ -856,8 +856,8 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       end
 
       context 'with brandable set' do
-        let(:brandable_collection_id) { create(:collection, user: user, collection_type_settings: [:brandable], create_access: true).id }
-        let(:not_brandable_collection_id) { create(:collection, user: user, collection_type_settings: [:not_brandable], create_access: true).id }
+        let(:brandable_collection_id) { create(:collection_lw, user: user, collection_type_settings: [:brandable], with_permission_template: true).id }
+        let(:not_brandable_collection_id) { create(:collection_lw, user: user, collection_type_settings: [:not_brandable], with_permission_template: true).id }
 
         it 'to true, it shows Branding tab' do
           visit "/dashboard/collections/#{brandable_collection_id}/edit"
@@ -871,8 +871,8 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       end
 
       context 'with discoverable set' do
-        let(:discoverable_collection_id) { create(:collection, user: user, collection_type_settings: [:discoverable], create_access: true).id }
-        let(:not_discoverable_collection_id) { create(:collection, user: user, collection_type_settings: [:not_discoverable], create_access: true).id }
+        let(:discoverable_collection_id) { create(:collection_lw, user: user, collection_type_settings: [:discoverable], with_permission_template: true).id }
+        let(:not_discoverable_collection_id) { create(:collection_lw, user: user, collection_type_settings: [:not_discoverable], with_permission_template: true).id }
 
         it 'to true, it shows Discovery tab' do
           visit "/dashboard/collections/#{discoverable_collection_id}/edit"
@@ -886,8 +886,8 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       end
 
       context 'with sharable set' do
-        let(:sharable_collection_id) { create(:collection, user: user, collection_type_settings: [:sharable], create_access: true).id }
-        let(:not_sharable_collection_id) { create(:collection, user: user, collection_type_settings: [:not_sharable], create_access: true).id }
+        let(:sharable_collection_id) { create(:collection_lw, user: user, collection_type_settings: [:sharable], with_permission_template: true).id }
+        let(:not_sharable_collection_id) { create(:collection_lw, user: user, collection_type_settings: [:not_sharable], with_permission_template: true).id }
 
         it 'to true, it shows Sharable tab' do
           visit "/dashboard/collections/#{sharable_collection_id}/edit"

data/spec/features/delete_work_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe 'Deleting a work', type: :feature do
     it 'redirects to my dashboard' do
       visit hyrax_generic_work_path(work)
       click_on('Delete', match: :first)
-      expect(page).to have_current_path(hyrax.my_works_path, only_path: true)
+      expect(page).to have_current_path(hyrax.my_works_path, ignore_query: true)
       expect(page).to have_content 'Deleted Test title'
     end
   end

data/spec/features/search_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'searching' do
   end
 
   let!(:collection) do
-    create(:public_collection, title: ['collection title abc'], description: [subject_value], user: user, members: [work])
+    create(:public_collection_lw, title: ['collection title abc'], description: [subject_value], user: user, members: [work])
   end
 
   context "as a public user", :clean_repo do
@@ -53,7 +53,7 @@ RSpec.describe 'searching' do
       expect(page).to have_content('Search Results')
       expect(page).to have_content "Toothbrush"
       expect(page).to have_content('collection title abc')
-      expect(page).to have_css("span.collection-icon-search")
+      expect(page).to have_selector("//img")
 
       expect(page.body).to include "<span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=taco&amp;locale=en\">taco</a></span>"
       expect(page.body).to include "<span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=mustache&amp;locale=en\">mustache</a></span>"

data/spec/features/work_show_spec.rb

@@ -53,11 +53,14 @@ RSpec.describe "work show view" do
     it "allows adding work to a collection", clean_repo: true, js: true do
       optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
       click_button "Add to collection" # opens the modal
-      select_member_of_collection(collection)
+      # Really ensure that this Collection model is persisted
+      Collection.all.map(&:destroy!)
+      persisted_collection = create(:collection_lw, user: user, collection_type_gid: multi_membership_type_1.gid)
+      select_member_of_collection(persisted_collection)
       click_button 'Save changes'
 
       # forwards to collection show page
-      expect(page).to have_content collection.title.first
+      expect(page).to have_content persisted_collection.title.first
       expect(page).to have_content work.title.first
       expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
     end

data/spec/forms/hyrax/forms/batch_upload_form_spec.rb

@@ -47,6 +47,7 @@ RSpec.describe Hyrax::Forms::BatchUploadForm do
                          :keyword,
                          :license,
                          :rights_statement,
+                         :rights_notes,
                          :publisher,
                          :date_created,
                          :subject,

data/spec/forms/hyrax/forms/collection_form_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Hyrax::Forms::CollectionForm do
     end
   end
 
-  let(:collection) { build(:collection) }
+  let(:collection) { build(:collection_lw) }
   let(:ability) { Ability.new(create(:user)) }
   let(:repository) { double }
   let(:form) { described_class.new(collection, ability, repository) }
@@ -74,8 +74,8 @@ RSpec.describe Hyrax::Forms::CollectionForm do
   end
 
   context "nested relationships" do
-    let(:child_collection) { build(:collection) }
-    let(:parent_collection) { build(:collection) }
+    let(:child_collection) { build(:collection_lw) }
+    let(:parent_collection) { build(:collection_lw) }
     let(:service_object) { double(available_member_subcollections: double(documents: [child_collection])) }
 
     before do
@@ -174,7 +174,7 @@ RSpec.describe Hyrax::Forms::CollectionForm do
     subject { form.permission_template }
 
     context "when the PermissionTemplate doesn't exist" do
-      let(:model) { create(:collection) }
+      let(:model) { build(:collection_lw) }
 
       it "gets created" do
         expect(subject).to be_instance_of Hyrax::Forms::PermissionTemplateForm
@@ -185,7 +185,7 @@ RSpec.describe Hyrax::Forms::CollectionForm do
     context "when the PermissionTemplate exists" do
       let(:form) { described_class.new(model, ability, repository) }
       let(:permission_template) { Hyrax::PermissionTemplate.find_by(source_id: model.id) }
-      let(:model) { create(:collection, with_permission_template: true) }
+      let(:model) { build(:collection_lw, with_permission_template: true) }
 
       it "uses the existing template" do
         expect(subject).to be_instance_of Hyrax::Forms::PermissionTemplateForm

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

@@ -3,7 +3,7 @@ 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) }
+  let(:collection) { build(:collection_lw) }
 
   subject { form }
 

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

@@ -109,6 +109,7 @@ RSpec.describe Hyrax::Forms::WorkForm do
         keyword: ['penguin'],
         source: ['related'],
         rights_statement: 'http://rightsstatements.org/vocab/InC-EDU/1.0/',
+        rights_notes: ['Notes on the rights'],
         license: ['http://creativecommons.org/licenses/by/3.0/us/']
       }
     end
@@ -121,6 +122,7 @@ RSpec.describe Hyrax::Forms::WorkForm do
       expect(subject['visibility']).to eq 'open'
       expect(subject['license']).to eq ['http://creativecommons.org/licenses/by/3.0/us/']
       expect(subject['rights_statement']).to eq 'http://rightsstatements.org/vocab/InC-EDU/1.0/'
+      expect(subject['rights_notes']).to eq ['Notes on the rights']
       expect(subject['keyword']).to eq ['penguin']
       expect(subject['source']).to eq ['related']
     end

data/spec/helpers/blacklight_helper_spec.rb

@@ -33,7 +33,9 @@ RSpec.describe BlacklightHelper, type: :helper do
       search_catalog_path(stuff)
     end
 
-    subject { index_presenter(document).field_value field_name }
+    let(:presenter) { index_presenter(document) }
+    let(:field) { blacklight_config.index_fields.fetch(field_name) }
+    subject { presenter.field_value field }
 
     context "description_tesim" do
       let(:field_name) { 'description_tesim' }

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -47,6 +47,48 @@ RSpec.describe Hyrax::CollectionsHelper do
     end
   end
 
+  describe '#render_other_collection_links' do
+    before do
+      allow(controller).to receive(:current_ability).and_return(ability)
+    end
+
+    context 'when a GenericWork belongs to one collection' do
+      let(:coll_ids) { ['111'] }
+      let(:coll_titles) { ['Collection 111'] }
+      let(:coll1_attrs) { { id: coll_ids[0], title_tesim: [coll_titles[0]] } }
+      let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork'], member_of_collection_ids_ssim: coll_ids) }
+
+      before do
+        ActiveFedora::SolrService.add(coll1_attrs)
+        ActiveFedora::SolrService.commit
+      end
+
+      it 'renders nothing' do
+        expect(helper.render_other_collection_links(work_doc, coll_ids[0])).to be_nil
+      end
+    end
+
+    context 'when a GenericWork belongs to more than one collection' do
+      let(:coll_ids) { ['111', '222'] }
+      let(:coll_titles) { ['Collection 111', 'Collection 222'] }
+      let(:coll1_attrs) { { id: coll_ids[0], title_tesim: [coll_titles[0]] } }
+      let(:coll2_attrs) { { id: coll_ids[1], title_tesim: [coll_titles[1]] } }
+      let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork'], member_of_collection_ids_ssim: coll_ids) }
+
+      before do
+        ActiveFedora::SolrService.add(coll1_attrs)
+        ActiveFedora::SolrService.add(coll2_attrs)
+        ActiveFedora::SolrService.commit
+      end
+
+      it 'renders a list of links to the collections' do
+        expect(helper.render_other_collection_links(work_doc, coll_ids[0])).to match(/This work also belongs to/i)
+        expect(helper.render_other_collection_links(work_doc, coll_ids[0])).to match("href=\"/collections/#{coll_ids[1]}\"")
+        expect(helper.render_other_collection_links(work_doc, coll_ids[0])).to match(coll_titles[1])
+      end
+    end
+  end
+
   describe "has_collection_search_parameters?" do
     subject { helper }
 

data/spec/helpers/hyrax/dashboard_helper_behavior_spec.rb

@@ -62,13 +62,13 @@ RSpec.describe Hyrax::DashboardHelperBehavior, type: :helper do
   def create_models(model, user1, user2)
     # deposited by the first user
     3.times do |t|
-      conn.add id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim" => [model],
-               Solrizer.solr_name('depositor', :symbol) => user1.user_key
+      conn.add id: "199#{t}", ActiveFedora.index_field_mapper.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim" => [model],
+               ActiveFedora.index_field_mapper.solr_name('depositor', :symbol) => user1.user_key
     end
 
     # deposited by the second user, but editable by the first
-    conn.add id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim" => [model],
-             Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" => user1.user_key
+    conn.add id: "1994", ActiveFedora.index_field_mapper.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim" => [model],
+             ActiveFedora.index_field_mapper.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" => user1.user_key
     conn.commit
   end
 end

data/spec/helpers/hyrax_helper_spec.rb

@@ -117,7 +117,7 @@ RSpec.describe HyraxHelper, type: :helper do
     subject { helper.link_to_each_facet_field(options) }
 
     context "with helper_facet and default separator" do
-      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym }, value: ["Imaging > Object Photography"] } }
+      let(:options) { { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym }, value: ["Imaging > Object Photography"] } }
 
       it do
         is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">" \
@@ -127,7 +127,7 @@ RSpec.describe HyraxHelper, type: :helper do
     end
 
     context "with helper_facet and optional separator" do
-      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym, separator: " : " }, value: ["Imaging : Object Photography"] } }
+      let(:options) { { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym, separator: " : " }, value: ["Imaging : Object Photography"] } }
 
       it do
         is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">" \
@@ -137,7 +137,9 @@ RSpec.describe HyraxHelper, type: :helper do
     end
 
     context "with :output_separator" do
-      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym, output_separator: ' ~ ', separator: ":" }, value: ["Imaging : Object Photography"] } }
+      let(:options) do
+        { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym, output_separator: ' ~ ', separator: ":" }, value: ["Imaging : Object Photography"] }
+      end
 
       it do
         is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">" \
@@ -147,7 +149,9 @@ RSpec.describe HyraxHelper, type: :helper do
     end
 
     context "with :no_spaces_around_separator" do
-      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym, output_separator: '~', separator: ":" }, value: ["Imaging : Object Photography"] } }
+      let(:options) do
+        { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym, output_separator: '~', separator: ":" }, value: ["Imaging : Object Photography"] }
+      end
 
       it do
         is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">" \

data/spec/hyrax/transactions/destroy_work_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'hyrax/transactions'
+
+RSpec.describe Hyrax::Transactions::DestroyWork do
+  subject(:transaction) { described_class.new }
+  let(:work)            { create(:generic_work) }
+
+  describe '#call' do
+    it 'is a success' do
+      expect(transaction.call(work)).to be_success
+    end
+
+    it 'destroys the work' do
+      expect { transaction.call(work) }
+        .to change { work.persisted? }
+        .from(true)
+        .to false
+    end
+
+    context 'with an unsaved work' do
+      let(:work) { build(:generic_work) }
+
+      it 'is a success' do
+        expect(transaction.call(work)).to be_success
+      end
+
+      it 'leaves the work unpersisted' do
+        expect { transaction.call(work) }
+          .not_to change { work.persisted? }
+          .from false
+      end
+    end
+  end
+end

data/spec/hyrax/transactions/steps/destroy_work_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'hyrax/transactions'
+
+RSpec.describe Hyrax::Transactions::Steps::DestroyWork do
+  subject(:step) { described_class.new }
+  let(:work)     { build(:generic_work) }
+
+  it 'is a success' do
+    expect(step.call(work)).to be_success
+  end
+
+  context 'with an existing work' do
+    let(:work) { create(:generic_work) }
+
+    it 'destroys the work' do
+      expect { step.call(work) }
+        .to change { work.persisted? }
+        .from(true)
+        .to false
+    end
+
+    context 'when destruction fails for an unknown reason' do
+      let(:message) { 'moomin message' }
+
+      before { allow(work).to receive(:destroy).and_raise(message) }
+
+      it 'is a failure' do
+        expect(step.call(work).failure).to have_attributes(message: message)
+      end
+    end
+  end
+end

data/spec/indexers/hyrax/collection_indexer_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Hyrax::CollectionIndexer do
   let(:indexer) { described_class.new(collection) }
-  let(:collection) { build(:collection) }
+  let(:collection) { build(:collection_lw) }
   let(:col1id) { 'col1' }
   let(:col2id) { 'col2' }
   let(:col1title) { 'col1 title' }

data/spec/jobs/characterize_job_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe CharacterizeJob do
 
   context "when the file set's work is in a collection" do
     let(:work)       { build(:generic_work) }
-    let(:collection) { build(:collection) }
+    let(:collection) { build(:collection_lw) }
 
     before do
       allow(file_set).to receive(:parent).and_return(work)