hyrax 2.0.3 → 2.1.0.beta1

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -53,46 +53,8 @@ RSpec.describe Hyrax::CollectionsHelper do
     end
   end
 
-  describe "button_for_remove_from_collection" do
-    let(:item) { double(id: 'changeme:123') }
-    let(:collection) { FactoryBot.create(:collection) }
-
-    it "generates a form that can remove the item" do
-      str = button_for_remove_from_collection collection, item
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq hyrax.dashboard_collection_path(collection)
-      expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
-      expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
-    end
-
-    describe "for a collection of another name" do
-      before do
-        class OtherCollection < ActiveFedora::Base
-          include Hyrax::CollectionBehavior
-          include Hydra::Works::WorkBehavior
-        end
-      end
-
-      let!(:collection) { OtherCollection.create!(title: ['foo']) }
-
-      after do
-        Object.send(:remove_const, :OtherCollection)
-      end
-
-      it "generates a form that can remove the item" do
-        str = button_for_remove_from_collection collection, item
-        doc = Nokogiri::HTML(str)
-        form = doc.xpath('//form').first
-        expect(form.attr('action')).to eq hyrax.dashboard_collection_path(collection)
-        expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
-        expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
-      end
-    end
-  end
-
   describe "button_for_remove_selected_from_collection" do
-    let(:collection) { FactoryBot.create(:collection) }
+    let(:collection) { create(:collection) }
 
     it "creates a button to the collections delete path" do
       str = button_for_remove_selected_from_collection collection
@@ -112,4 +74,20 @@ RSpec.describe Hyrax::CollectionsHelper do
       expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
     end
   end
+
+  describe "collection_type_label" do
+    context "when the CollectionType is found" do
+      let(:test_collection_type) { FactoryBot.create(:collection_type) }
+
+      it "returns the CollectionType title" do
+        expect(collection_type_label(test_collection_type.gid)).to match %r{^Title \d+$}
+      end
+    end
+
+    context "when the CollectionType cannot be found" do
+      it "returns the input gid unchanged" do
+        expect(collection_type_label(nil)).to eq "User Collection"
+      end
+    end
+  end
 end

data/spec/helpers/hyrax/content_block_helper_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::ContentBlockHelper, type: :helper do
-  let(:content_block) { FactoryBot.create(:content_block, value: "<p>foo bar</p>") }
+  let(:content_block) { create(:content_block, value: "<p>foo bar</p>") }
 
   describe '#displayable_content_block' do
     let(:options) { {} }

data/spec/helpers/{dashboard_helper_spec.rb → hyrax/dashboard_helper_behavior_spec.rb}

@@ -1,4 +1,4 @@
-RSpec.describe DashboardHelper, type: :helper do
+RSpec.describe Hyrax::DashboardHelperBehavior, type: :helper do
   describe "#on_the_dashboard?" do
     it "returns false for controllers that aren't a part of the dashboard" do
       allow(helper).to receive(:params).and_return(controller: "foo")
@@ -17,17 +17,6 @@ RSpec.describe DashboardHelper, type: :helper do
     end
   end
 
-  describe "#on_my_works" do
-    it "returns false when the controller isn't my works" do
-      allow(helper).to receive(:params).and_return(controller: "hyrax/my/collections")
-      expect(helper).not_to be_on_my_works
-    end
-    it "returns true when the controller is my works" do
-      allow(helper).to receive(:params).and_return(controller: "hyrax/my/works")
-      expect(helper).to be_on_my_works
-    end
-  end
-
   describe "#number_of_works" do
     let(:conn) { ActiveFedora::SolrService.instance.conn }
     let(:user1) { User.new(email: "abc@test") }

data/spec/helpers/hyrax/trophy_helper_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Hyrax::TrophyHelper, type: :helper do
   describe "#display_trophy_link" do
-    let(:user) { FactoryBot.create(:user) }
+    let(:user) { create(:user) }
     let(:id) { '9999' }
 
     let(:text_attributes) { '[data-add-text="Highlight Work on Profile"][data-remove-text="Unhighlight Work"]' }

data/spec/helpers/hyrax_helper_spec.rb

@@ -82,7 +82,6 @@ RSpec.describe HyraxHelper, type: :helper do
           car_link   = search_catalog_path(f: { 'vehicle_type_sim' => ['car'] })
           truck_link = search_catalog_path(f: { 'vehicle_type_sim' => ['truck'] })
           expect(subject).to eq "<a href=\"#{car_link}\">car</a>, <a href=\"#{truck_link}\">truck</a>"
-          expect(subject).to be_a ActiveSupport::SafeBuffer
           expect(subject).to be_html_safe
         end
       end
@@ -92,8 +91,6 @@ RSpec.describe HyraxHelper, type: :helper do
 
         it "shows the default text" do
           expect(subject).to eq "No value entered"
-          expect(subject).to be_a ActiveSupport::SafeBuffer
-          expect(subject).to be_html_safe
         end
       end
     end

data/spec/indexers/hyrax/generic_work_indexer_spec.rb

@@ -90,22 +90,22 @@ RSpec.describe GenericWorkIndexer do
     end
     it "indexed the roles and state" do
       expect(solr_document.fetch('actionable_workflow_roles_ssim')).to eq [
-        "#{sipity_entity.workflow.permission_template.admin_set_id}-#{sipity_entity.workflow.name}-approve",
-        "#{sipity_entity.workflow.permission_template.admin_set_id}-#{sipity_entity.workflow.name}-reject"
+        "#{sipity_entity.workflow.permission_template.source_id}-#{sipity_entity.workflow.name}-approve",
+        "#{sipity_entity.workflow.permission_template.source_id}-#{sipity_entity.workflow.name}-reject"
       ]
       expect(solr_document.fetch('workflow_state_name_ssim')).to eq "initial"
     end
   end
 
   describe "with a remote resource (based near)" do
-    mpls = <<EOF.strip_heredoc
+    mpls = <<RDFXML.strip_heredoc
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
           <rdf:RDF xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:gn="http://www.geonames.org/ontology#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
           <gn:Feature rdf:about="http://sws.geonames.org/5037649/">
           <gn:name>Minneapolis</gn:name>
           </gn:Feature>
           </rdf:RDF>
-EOF
+RDFXML
 
     before do
       allow(service).to receive(:rdf_service).and_return(Hyrax::DeepIndexingService)

data/spec/indexers/hyrax/repository_reindexer_spec.rb

@@ -0,0 +1,8 @@
+RSpec.describe Hyrax::RepositoryReindexer do
+  let(:subject) { Samvera::NestingIndexer }
+
+  it 'overrides ActiveFedora#reindex_everything' do
+    expect(subject).to receive(:reindex_all!)
+    ActiveFedora::Base.reindex_everything
+  end
+end

data/spec/javascripts/relationships_control_spec.js.coffee

@@ -7,7 +7,7 @@ describe 'RelationshipsControl', ->
   beforeEach ->
     fixture = setFixtures(test_fixtures.relationships_table.html)
     element = $("table")
-    target = new RelationshipsControl(element, 'work_members_attributes', 'tmpl-child-work')
+    target = new RelationshipsControl(element, [], 'generic_work', 'work_members_attributes', 'tmpl-child-work')
     jasmine.Ajax.install()
 
   afterEach ->
@@ -21,7 +21,7 @@ describe 'RelationshipsControl', ->
     it 'creates a row when something is selected', ->
       spyOn(target.input, 'val').and.returnValue('123')
       spyOn(target, 'searchData').and.returnValue({ id: '123', text: 'foo bar' })
-      expect(target.registry.nextIndex()).toEqual(0)
+      expect(target.registry.items.length).toEqual(0)
       target.attemptToAddRow()
       expect(target.errors).toBeNull()
-      expect(target.registry.nextIndex()).toEqual(1)
+      expect(target.registry.items.length).toEqual(1)

data/spec/javascripts/settings_spec.js

@@ -0,0 +1,73 @@
+describe("Settings", function() {
+  var Settings = require('hyrax/admin/collection_type/settings');
+  var target = null;
+  var element = null;
+  var form = null;
+
+  beforeEach(function() {
+    var fixture = setFixtures(settingsForm());
+    element = fixture.find("input[type='checkbox'][name$='[sharable]']");
+    form = element.closest('form');
+    target = new Settings($('form'));
+  });
+
+  //sharableChanged
+  describe("sharableChanged", function() {
+    describe("with sharable checked", function() {
+      beforeEach(function() {
+        form.find("input[type='checkbox'][name$='[sharable]']").prop("checked", true).prop("disabled", false);
+        target.setup();
+      });
+      it("share_applies_to_new_works options is enabled", function() {
+        target.sharableChanged();
+        expect(form.find("input[type='checkbox'][name$='[share_applies_to_new_works]']")).toBeChecked();
+        expect(form.find("input[type='checkbox'][name$='[share_applies_to_new_works]']")).not.toBeDisabled();
+      });
+    });
+    describe("with sharable unchecked", function() {
+      beforeEach(function() {
+        form.find("input[type='checkbox'][name$='[sharable]']").prop("checked", false).prop("disabled", false);
+        target.setup();
+      });
+      it("share_applies_to_new_works option is disabled", function() {
+        target.sharableChanged();
+        expect(form.find("input[type='checkbox'][name$='[share_applies_to_new_works]']")).not.toBeChecked();
+        expect(form.find("input[type='checkbox'][name$='[share_applies_to_new_works]']")).toBeDisabled();
+      });
+    });
+  });
+});
+
+// Generate a form that collection type settings
+function settingsForm() {
+    return '<form class="simple_form edit_collection_type" id="edit_collection_type" action="/admin/collection_types/3?locale=en" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="_method" value="patch" /><input type="hidden" name="authenticity_token" value="2Si+G8crN9SzhkKeVUl6gAZofiPFvm49ma998urlMgtW5fHbfzQlv71P9y8i8LybucAc3AkSrk9uwnF99jmz0A==" />' +
+        '  <div class="tab-content">' +
+        '    <div id="settings" class="tab-pane">' +
+        '      <div class="panel panel-default labels">' +
+        '        <div class="panel-body">' +
+        '          <p>These settings determine how collections of this type can be managed and discovered.</p>' +
+        '          <p><strong>Warning: These settings cannot be changed after a collection of this type has been created.</strong></p>' +
+        '          <div class="collection-types-settings">' +
+        '            <div class="form-inline">' +
+        '              <p><div class="form-group boolean optional collection_type_nestable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[nestable]" /><label class="boolean optional" for="collection_type_nestable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[nestable]" id="collection_type_nestable" />NESTABLE</label></div><p class="help-block">Allow collections of this type to be nested (a collection can contain other collections)</p></div></p>' +
+        '              <p><div class="form-group boolean optional collection_type_discoverable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[discoverable]" /><label class="boolean optional" for="collection_type_discoverable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[discoverable]" id="collection_type_discoverable" />DISCOVERY</label></div><p class="help-block">Allow collections of this type to be discoverable</p></div></p>' +
+        '              <p><div class="form-group boolean optional collection_type_sharable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[sharable]" /><label class="boolean optional" for="collection_type_sharable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[sharable]" id="collection_type_sharable" />SHARING</label></div><p class="help-block">Allow users to assign collection managers, depositors, and viewers for collections they manage</p></div></p>' +
+        '              <div class="form-group collection-type-share-applies-to">' +
+        '                <div class="form-group boolean optional collection_type_share_applies_to_new_works"><div class="checkbox"><input value="0" type="hidden" name="collection_type[share_applies_to_new_works]" /><label class="boolean optional" for="collection_type_share_applies_to_new_works"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[share_applies_to_new_works]" id="collection_type_share_applies_to_new_works" />APPLY TO NEW WORKS</label></div><p class="help-block">When new works are created directly in the collection, grant sharing users and groups permissions for the new work according to their collection roles.</p></div>' +
+        '              </div>' +
+        '              <p><div class="form-group boolean optional collection_type_allow_multiple_membership"><div class="checkbox"><input value="0" type="hidden" name="collection_type[allow_multiple_membership]" /><label class="boolean optional" for="collection_type_allow_multiple_membership"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[allow_multiple_membership]" id="collection_type_allow_multiple_membership" />MULTIPLE MEMBERSHIP</label></div><p class="help-block">Allow works to belong to multiple collections of this type</p></div></p>' +
+        '              <p><div class="form-group boolean optional disabled collection_type_require_membership"><div class="checkbox"><input value="0" disabled="disabled" type="hidden" name="collection_type[require_membership]" /><label class="boolean optional disabled" for="collection_type_require_membership"><input class="boolean optional disabled" disabled="disabled" type="checkbox" value="1" name="collection_type[require_membership]" id="collection_type_require_membership" />REQUIRE MEMBERSHIP</label></div><p class="help-block">A work must belong to at least one collection of this type</p></div></p>' +
+        '              <p><div class="form-group boolean optional disabled collection_type_assigns_workflow"><div class="checkbox"><input value="0" disabled="disabled" type="hidden" name="collection_type[assigns_workflow]" /><label class="boolean optional disabled" for="collection_type_assigns_workflow"><input class="boolean optional disabled" disabled="disabled" type="checkbox" value="1" name="collection_type[assigns_workflow]" id="collection_type_assigns_workflow" />WORKFLOW</label></div><p class="help-block">Allow collections of this type to assign workflow to a new work</p></div></p>' +
+        '              <p><div class="form-group boolean optional disabled collection_type_assigns_visibility"><div class="checkbox"><input value="0" disabled="disabled" type="hidden" name="collection_type[assigns_visibility]" /><label class="boolean optional disabled" for="collection_type_assigns_visibility"><input class="boolean optional disabled" disabled="disabled" type="checkbox" value="1" name="collection_type[assigns_visibility]" id="collection_type_assigns_visibility" />VISIBILITY</label></div><p class="help-block">Allow collections of this type to assign initial visibility settings to a new work</p></div></p>' +
+        '            </div>' +
+        '          </div>' +
+        '        </div>' +
+        '      </div>' +
+        '    </div>' +
+        '    <div class="panel-footer">' +
+        '      <input type="submit" name="update_collection_type" value="Save changes" class="btn btn-primary" onclick="confirmation_needed = false;" id="update_submit" data-disable-with="Save changes" />' +
+        '      <a class="btn btn-link" href="/admin/collection_types?locale=en">Cancel</a>' +
+        '    </div>' +
+        '  </div>' +
+        '</form>';
+}

data/spec/jobs/user_edit_profile_event_job_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe UserEditProfileEventJob do
   let(:user) { create(:user) }
   let(:mock_time) { Time.zone.at(1) }
-  let(:event) { { action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has edited his or her profile", timestamp: '1' } }
+  let(:event) { { action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has edited their profile", timestamp: '1' } }
 
   before do
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)

data/spec/lib/hyrax/configuration_spec.rb

@@ -42,6 +42,18 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:feature_config_path) }
   it { is_expected.to respond_to(:google_analytics_id?) }
   it { is_expected.to respond_to(:google_analytics_id) }
+  it { is_expected.to respond_to(:iiif_image_server?) }
+  it { is_expected.to respond_to(:iiif_image_server=) }
+  it { is_expected.to respond_to(:iiif_image_url_builder) }
+  it { is_expected.to respond_to(:iiif_image_url_builder=) }
+  it { is_expected.to respond_to(:iiif_info_url_builder) }
+  it { is_expected.to respond_to(:iiif_info_url_builder=) }
+  it { is_expected.to respond_to(:iiif_image_compliance_level_uri) }
+  it { is_expected.to respond_to(:iiif_image_compliance_level_uri=) }
+  it { is_expected.to respond_to(:iiif_image_size_default) }
+  it { is_expected.to respond_to(:iiif_image_size_default=) }
+  it { is_expected.to respond_to(:iiif_metadata_fields) }
+  it { is_expected.to respond_to(:iiif_metadata_fields=) }
   it { is_expected.to respond_to(:libreoffice_path) }
   it { is_expected.to respond_to(:license_service_class) }
   it { is_expected.to respond_to(:license_service_class=) }
@@ -54,6 +66,8 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:persistent_hostpath) }
   it { is_expected.to respond_to(:realtime_notifications?) }
   it { is_expected.to respond_to(:realtime_notifications=) }
+  it { is_expected.to respond_to(:rendering_predicate) }
+  it { is_expected.to respond_to(:rendering_predicate=) }
   it { is_expected.to respond_to(:rights_statement_service_class) }
   it { is_expected.to respond_to(:rights_statement_service_class=) }
   it { is_expected.to respond_to(:redis_namespace) }
@@ -63,6 +77,8 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:upload_path) }
   it { is_expected.to respond_to(:work_requires_files?) }
   it { is_expected.to respond_to(:extract_full_text?) }
+  it { is_expected.to respond_to(:nested_relationship_reindexer) }
+  it { is_expected.to respond_to(:default_nested_relationship_reindexer) }
   it { is_expected.to respond_to(:whitelisted_ingest_dirs) }
   it { is_expected.to respond_to(:whitelisted_ingest_dirs=) }
 end

data/spec/models/admin_set_spec.rb

@@ -16,10 +16,10 @@ RSpec.describe AdminSet, type: :model do
   end
 
   describe '#permission_template' do
-    it 'queries for a Hyrax::PermissionTemplate with a matching admin_set_id' do
+    it 'queries for a Hyrax::PermissionTemplate with a matching source_id' do
       admin_set = build(:admin_set, id: '123')
       permission_template = build(:permission_template)
-      expect(Hyrax::PermissionTemplate).to receive(:find_by!).with(admin_set_id: '123').and_return(permission_template)
+      expect(Hyrax::PermissionTemplate).to receive(:find_by!).with(source_id: '123').and_return(permission_template)
       expect(admin_set.permission_template).to eq(permission_template)
     end
   end
@@ -47,9 +47,13 @@ RSpec.describe AdminSet, type: :model do
   end
 
   describe '.after_destroy' do
-    it 'will destroy the associated permission template' do
+    let(:permission_template_access) { create(:permission_template_access) }
+
+    it 'will destroy the associated permission template and permission template access' do
       admin_set = create(:admin_set, with_permission_template: true)
-      expect { admin_set.destroy }.to change { Hyrax::PermissionTemplate.count }.by(-1)
+      permission_template_access.permission_template_id = admin_set.permission_template.id
+      permission_template_access.save
+      expect { admin_set.destroy }.to change { Hyrax::PermissionTemplate.count }.by(-1).and change { Hyrax::PermissionTemplateAccess.count }.by(-1)
     end
   end
 
@@ -186,4 +190,38 @@ RSpec.describe AdminSet, type: :model do
       end
     end
   end
+
+  describe '#reset_access_controls!' do
+    let!(:user) { build(:user) }
+    let!(:admin_set) { create(:admin_set, creator: [user.user_key], edit_users: [user.user_key], edit_groups: [::Ability.admin_group_name], read_users: [], read_groups: ['public']) }
+    let!(:permission_template) { build(:permission_template) }
+
+    before do
+      allow(admin_set).to receive(:permission_template).and_return(permission_template)
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'user').and_return(['mgr1.ex.com', 'mgr2.ex.com', user.user_key])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'group').and_return(['managers', ::Ability.admin_group_name])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'user').and_return(['vw1.ex.com', 'vw2.ex.com'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'group').and_return(['viewers'])
+    end
+
+    it 'resets user edit access' do
+      admin_set.reset_access_controls!
+      expect(admin_set.edit_users).to match_array([user.user_key, 'mgr1.ex.com', 'mgr2.ex.com'])
+    end
+
+    it 'resets group edit access' do
+      admin_set.reset_access_controls!
+      expect(admin_set.edit_groups).to match_array(['managers', ::Ability.admin_group_name])
+    end
+
+    it "doesn't reset user read access" do
+      admin_set.reset_access_controls!
+      expect(admin_set.read_users).to match_array([]) # different behavior from Collections which grants participant Viewers to have read_access in the solr doc
+    end
+
+    it "doesn't reset group read access" do
+      admin_set.reset_access_controls!
+      expect(admin_set.read_groups).to match_array(['public']) # different behavior from Collections which grants participant Viewers to have read_access in the solr doc
+    end
+  end
 end

data/spec/models/collection_branding_info_spec.rb

@@ -0,0 +1,61 @@
+RSpec.describe CollectionBrandingInfo, type: :model do
+  let(:banner_info) do
+    CollectionBrandingInfo.new(
+      collection_id: "123",
+      filename: "banner.gif",
+      role: "banner",
+      alt_txt: "banner alt txt",
+      target_url: ""
+    )
+  end
+
+  let(:logo_info) do
+    CollectionBrandingInfo.new(
+      collection_id: "123",
+      filename: "logo.gif",
+      role: "logo",
+      alt_txt: "This is the logo",
+      target_url: "http://logo.com"
+    )
+  end
+
+  describe "save banner and logo info" do
+    it "saves the banner info, copy banner to public area, and remove it from temp area" do
+      expect(FileUtils).to receive(:mkdir_p).with(banner_info.find_local_dir_name('123', 'banner')).and_return("/public/123/banner/")
+      expect(FileUtils).to receive(:cp).with('/tmp/12/34/56', banner_info.find_local_dir_name('123', 'banner') + "/banner.gif")
+      expect(FileUtils).to receive(:remove_file).with('/tmp/12/34/56')
+      expect(File).to receive(:exist?).and_return(true)
+      banner_info.save("/tmp/12/34/56")
+
+      expect(banner_info.local_path).to eq(banner_info.find_local_dir_name('123', 'banner') + "/banner.gif")
+      expect(banner_info.alt_text).to eq("banner alt txt")
+      expect(banner_info.target_url).to eq("")
+    end
+
+    it "saves the logo info, copy logo to public area, and remove it from temp area" do
+      expect(FileUtils).to receive(:mkdir_p).with(logo_info.find_local_dir_name('123', 'logo')).and_return("/public/123/logo/")
+      expect(FileUtils).to receive(:cp).with('/tmp/12/34/56', logo_info.find_local_dir_name('123', 'logo') + "/logo.gif")
+      expect(FileUtils).to receive(:remove_file).with('/tmp/12/34/56')
+      expect(File).to receive(:exist?).and_return(true)
+      logo_info.save("/tmp/12/34/56")
+
+      expect(logo_info.local_path).to eq(logo_info.find_local_dir_name('123', 'logo') + "/logo.gif")
+      expect(logo_info.alt_text).to eq("This is the logo")
+      expect(logo_info.target_url).to eq("http://logo.com")
+    end
+  end
+
+  describe "remove banner and log files from the public directroy" do
+    it "removes banner file from public directory" do
+      expect(FileUtils).to receive(:remove_file).with(banner_info.find_local_dir_name('123', 'banner') + "/banner.gif")
+      expect(File).to receive(:exist?).and_return(true)
+      banner_info.delete(banner_info.find_local_dir_name('123', 'banner') + "/banner.gif")
+    end
+
+    it "removes logo file from public directory" do
+      expect(FileUtils).to receive(:remove_file).with(logo_info.find_local_dir_name('123', 'logo') + "/logo.gif")
+      expect(File).to receive(:exist?).and_return(true)
+      logo_info.delete(logo_info.find_local_dir_name('123', 'logo') + "/logo.gif")
+    end
+  end
+end

data/spec/models/collection_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Collection do
+RSpec.describe Collection, type: :model do
   let(:collection) { build(:public_collection) }
 
   it "has open visibility" do
@@ -46,15 +46,36 @@ RSpec.describe Collection do
       expect(collection.member_objects).to match_array []
     end
 
-    context "adding members" do
+    context "when adding members" do
       let(:work1) { create(:work) }
       let(:work2) { create(:work) }
+      let(:work3) { create(:work) }
 
       it "allows multiple files to be added" do
         collection.add_member_objects [work1.id, work2.id]
         collection.save!
         expect(collection.reload.member_objects).to match_array [work1, work2]
       end
+
+      context 'when multiple membership checker returns a non-nil value' do
+        before do
+          allow(Hyrax::MultipleMembershipChecker).to receive(:new).with(item: work1).and_return(nil_checker)
+          allow(Hyrax::MultipleMembershipChecker).to receive(:new).with(item: work2).and_return(checker)
+          allow(Hyrax::MultipleMembershipChecker).to receive(:new).with(item: work3).and_return(nil_checker)
+          allow(nil_checker).to receive(:check).and_return(nil)
+          allow(checker).to receive(:check).and_return(error_message)
+        end
+
+        let(:checker) { double }
+        let(:nil_checker) { double }
+        let(:error_message) { 'Error: foo bar' }
+
+        it 'fails to add the member' do
+          collection.add_member_objects [work1.id, work2.id, work3.id]
+          collection.save!
+          expect(collection.reload.member_objects).to match_array [work1, work3]
+        end
+      end
     end
   end
 
@@ -90,11 +111,215 @@ RSpec.describe Collection do
     end
 
     let(:member) { Member.create }
-    let(:collection) { OtherCollection.create(title: ['test title']) }
+    let(:collection) { OtherCollection.create(title: ['test title'], collection_type_gid: create(:user_collection_type).gid) }
 
     it "have members that know about the collection", clean_repo: true do
       member.reload
       expect(member.member_of_collections).to eq [collection]
     end
   end
+
+  describe '#collection_type_gid', :clean_repo do
+    subject(:collection) { described_class.new(collection_type_gid: collection_type.gid) }
+
+    let(:collection_type) { create(:collection_type) }
+
+    it 'has a collection_type_gid' do
+      expect(collection.collection_type_gid).to eq collection_type.gid
+    end
+  end
+
+  describe '#collection_type_gid=' do
+    let(:collection) { build(:collection) }
+    let(:collection_type) { create(:collection_type) }
+
+    it 'sets gid' do
+      collection.collection_type_gid = collection_type.gid
+      expect(collection.collection_type_gid).to eq collection_type.gid
+    end
+
+    it 'throws ActiveRecord::RecordNotFound if cannot find collection type for the gid' do
+      gid = 'gid://internal/hyrax-collectiontype/999'
+      expect { collection.collection_type_gid = gid }.to raise_error(ActiveRecord::RecordNotFound, "Couldn't find Hyrax::CollectionType matching GID '#{gid}'")
+    end
+
+    it 'throws ActiveRecord::RecordNotFound if set to nil' do
+      expect { collection.collection_type_gid = nil }.to raise_error(ActiveRecord::RecordNotFound, "Couldn't find Hyrax::CollectionType matching GID ''")
+    end
+
+    it 'updates the collection_type instance variable' do
+      expect { collection.collection_type_gid = collection_type.gid }.to change { collection.collection_type }.from(create(:user_collection_type)).to(collection_type)
+    end
+
+    it 'throws ArgumentError if collection has already been persisted with a collection type' do
+      collection.save!
+      expect(collection.collection_type_gid).not_to be_nil
+      expect { collection.collection_type_gid = create(:collection_type).gid }.to raise_error(RuntimeError, "Can't modify collection type of this collection")
+    end
+  end
+
+  describe '#collection_type' do
+    let(:collection) { described_class.new(collection_type: collection_type) }
+    let(:collection_type) { create(:collection_type) }
+
+    it 'returns a collection_type instance from the collection_type_gid' do
+      expect(collection.collection_type).to be_kind_of(Hyrax::CollectionType)
+      expect(collection.collection_type).to eq collection_type
+      expect(collection.collection_type.gid).to eq collection_type.gid
+    end
+  end
+
+  describe 'collection type delegated methods' do
+    subject { build(:collection) }
+
+    it { is_expected.to delegate_method(:nestable?).to(:collection_type) }
+    it { is_expected.to delegate_method(:discoverable?).to(:collection_type) }
+    it { is_expected.to delegate_method(:sharable?).to(:collection_type) }
+    it { is_expected.to delegate_method(:share_applies_to_new_works?).to(:collection_type) }
+    it { is_expected.to delegate_method(:allow_multiple_membership?).to(:collection_type) }
+    it { is_expected.to delegate_method(:require_membership?).to(:collection_type) }
+    it { is_expected.to delegate_method(:assigns_workflow?).to(:collection_type) }
+    it { is_expected.to delegate_method(:assigns_visibility?).to(:collection_type) }
+  end
+
+  describe '.after_destroy' do
+    it 'will destroy the associated permission template' do
+      collection = create(:collection, with_permission_template: true)
+      expect { collection.destroy }.to change { Hyrax::PermissionTemplate.count }.by(-1)
+    end
+  end
+
+  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!(:permission_template) { build(:permission_template) }
+
+    before do
+      allow(collection).to receive(:permission_template).and_return(permission_template)
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'user').and_return(['mgr1@ex.com', 'mgr2@ex.com', user.user_key])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'group').and_return(['managers', ::Ability.admin_group_name])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'deposit', agent_type: 'user').and_return(['dep1@ex.com', 'dep2@ex.com'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'deposit', agent_type: 'group').and_return(['depositors', ::Ability.admin_group_name])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'user').and_return(['vw1@ex.com', 'vw2@ex.com'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'group').and_return(['viewers', ::Ability.admin_group_name])
+    end
+
+    it 'resets user edit access' do
+      expect(collection.edit_users).to match_array([user.user_key])
+      collection.reset_access_controls!
+      expect(collection.edit_users).to match_array([user.user_key, 'mgr1@ex.com', 'mgr2@ex.com'])
+    end
+
+    it 'resets group edit access' do
+      expect(collection.edit_groups).to match_array([])
+      collection.reset_access_controls!
+      expect(collection.edit_groups).to match_array(['managers', ::Ability.admin_group_name])
+    end
+
+    it 'resets user read access' do
+      expect(collection.read_users).to match_array([])
+      collection.reset_access_controls!
+      expect(collection.read_users).to match_array(['vw1@ex.com', 'vw2@ex.com', 'dep1@ex.com', 'dep2@ex.com'])
+    end
+
+    it 'resets group read access' do
+      expect(collection.read_groups).to match_array([])
+      collection.reset_access_controls!
+      expect(collection.read_groups).to match_array(['viewers', 'depositors', ::Ability.admin_group_name])
+    end
+  end
+
+  context 'collection factory' do
+    let(:user) { build(:user) }
+
+    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)
+      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)
+      end
+
+      it 'will be created when create_access is true' do
+        expect { create(:collection, create_access: 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 }
+      end
+    end
+
+    describe 'permission template access' do
+      it 'will not be created when with_permission_template is true' do
+        expect { create(:collection, with_permission_template: true) }.not_to change { Hyrax::PermissionTemplateAccess.count }
+      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::PermissionTemplateAccess.count }.by(1)
+        expect { create(:collection, with_permission_template: { manage_users: [user], deposit_users: [user] }) }.to change { Hyrax::PermissionTemplateAccess.count }.by(2)
+      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)
+      end
+
+      it 'will not be created by default' do
+        expect { create(:collection) }.not_to change { Hyrax::PermissionTemplateAccess.count }
+      end
+    end
+
+    describe 'when including nesting indexing', with_nested_reindexing: true do
+      # Nested indexing requires that the user's permissions be saved
+      # on the Fedora object... if simply in local memory, they are
+      # lost when the adapter pulls the object from Fedora to reindex.
+      let(:user) { create(:user) }
+      let(:collection) { create(:collection, user: user) }
+
+      it 'will authorize the creating user' do
+        expect(user.can?(:edit, collection)).to be true
+      end
+    end
+
+    describe 'when including with_nesting_attributes' do
+      let(:collection_type) { create(:collection_type) }
+      let(:blacklight_config) { CatalogController.blacklight_config }
+      let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
+      let(:current_ability) { instance_double(Ability, admin?: true) }
+      let(:scope) { double('Scope', can?: true, current_ability: current_ability, repository: repository, blacklight_config: blacklight_config) }
+
+      context 'when building a collection' do
+        let(:coll123) do
+          build(:collection,
+                id: 'Collection123',
+                collection_type_gid: collection_type.gid,
+                with_nesting_attributes:
+                { ancestors: ['Parent_1'],
+                  parent_ids: ['Parent_1'],
+                  pathnames: ['Parent_1/Collection123'],
+                  depth: 2 })
+        end
+        let(:nesting_attributes) do
+          Hyrax::Collections::NestedCollectionQueryService::NestingAttributes.new(id: coll123.id, scope: scope)
+        end
+
+        it 'will persist a queryable solr document with the given attributes' do
+          expect(nesting_attributes.id).to eq('Collection123')
+          expect(nesting_attributes.parents).to eq(['Parent_1'])
+          expect(nesting_attributes.pathnames).to eq(['Parent_1/Collection123'])
+          expect(nesting_attributes.ancestors).to eq(['Parent_1'])
+          expect(nesting_attributes.depth).to eq(2)
+        end
+      end
+    end
+  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))
+      collection.save!
+    end
+  end
 end