hyrax 2.1.0.beta2 → 2.1.0.rc1

data/spec/renderers/hyrax/renderers/attribute_renderer_spec.rb

@@ -73,6 +73,25 @@ RSpec.describe Hyrax::Renderers::AttributeRenderer do
     end
   end
 
+  describe "#render_dl_row" do
+    subject { Nokogiri::HTML(renderer.render_dl_row) }
+
+    let(:expected) { Nokogiri::HTML(dl_content) }
+    let(:dl_content) do
+      "<dt>Name</dt>\n" \
+       "<dd><ul class='tabular'><li class=\"attribute attribute-name\">Bob</li>\n" \
+       "<li class=\"attribute attribute-name\">Jessica</li>\n" \
+       "</ul></dd>"
+    end
+
+    before do
+      allow(Hyrax.config).to receive(:display_microdata?).and_return(false)
+    end
+
+    it { expect(renderer).not_to be_microdata(field) }
+    it { expect(subject).to be_equivalent_to(expected) }
+  end
+
   describe "#label" do
     subject { renderer }
 

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

@@ -80,13 +80,15 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
 
   describe '.each_child_document_of', clean_repo: true do
     let(:ancestors_key) { described_class.solr_field_name_for_storing_ancestors }
+    let(:pathnames_key) { described_class.solr_field_name_for_storing_pathnames }
     let(:index_document_class) { Samvera::NestingIndexer::Documents::IndexDocument }
     let(:parent) { { id: document.id } }
     let(:document) { index_document_class.new(id: 'parent-1', pathnames: ['parent-1'], parent_ids: [], ancestors: []) }
     let(:children) do
       [{ id: 'child-1',
          member_of_collection_ids_ssim: [document.id],
-         ancestors_key => [document.id] },
+         ancestors_key => [document.id],
+         pathnames_key => ['child-1'] },
        { id: 'child-2',
          member_of_collection_ids_ssim: [document.id],
          ancestors_key => [document.id] }]
@@ -94,10 +96,12 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
     let(:not_my_children) do
       [{ id: 'youre-not-my-dad-1',
          member_of_collection_ids_ssim: ['parent-2'],
-         ancestors_key => ['parent-2'] },
+         ancestors_key => ['parent-2'],
+         pathnames_key => ['youre-not-my-dad-1'] },
        { id: 'i-am-your-grandchild',
          member_of_collection_ids_ssim: ['parent-3'],
-         ancestors_key => ['parent-1/parent-3'] }]
+         ancestors_key => ['parent-1/parent-3'],
+         pathnames_key => ['i-am-your-grandchild'] }]
     end
 
     before do
@@ -106,15 +110,31 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
       end
     end
 
-    it 'yields all of the child solr-documents of the given document' do
-      child_index_documents = []
-      described_class.each_child_document_of(document: document) do |doc|
-        child_index_documents << doc
+    context 'with full reindexing extent' do
+      it 'yields all of the child solr-documents of the given document' do
+        child_index_documents = []
+        described_class.each_child_document_of(document: document, extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX) do |doc|
+          child_index_documents << doc
+        end
+        expect(child_index_documents.count).to eq(2)
+        child_index_documents.each do |child|
+          expect(child).to be_a(index_document_class)
+          expect(child.ancestors).to eq([document.id])
+        end
       end
-      expect(child_index_documents.count).to eq(2)
-      child_index_documents.each do |child|
-        expect(child).to be_a(index_document_class)
-        expect(child.ancestors).to eq([document.id])
+    end
+
+    context 'with limited reindexing extent' do
+      it 'yields only child documents without pathnames' do
+        child_index_documents = []
+        described_class.each_child_document_of(document: document, extent: Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX) do |doc|
+          child_index_documents << doc
+        end
+        expect(child_index_documents.count).to eq(1)
+        child_index_documents.each do |child|
+          expect(child).to be_a(index_document_class)
+          expect(child.ancestors).to eq([document.id])
+        end
       end
     end
   end
@@ -159,16 +179,6 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
     # rubocop:enable RSpec/ExampleLength
   end
 
-  describe '.write_document_attributes_to_index_layer' do
-    it 'is not implemented and deprecated' do
-      expect do
-        described_class.write_document_attributes_to_index_layer(
-          id: 1, parent_ids: 2, ancestors: 3, pathnames: 4, deepest_nested_depth: 5
-        )
-      end.to raise_error(NotImplementedError)
-    end
-  end
-
   describe '.solr_field_name_for_storing_ancestors' do
     subject { described_class.solr_field_name_for_storing_ancestors }
 

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

@@ -6,6 +6,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       expect(ct.machine_id).to eq('custom_type')
       expect(ct.title).to eq('Custom Type')
       expect(ct.description).to eq('')
+      expect(ct.badge_color).to eq('#663333')
       expect(ct).to be_nestable
       expect(ct).to be_discoverable
       expect(ct).to be_brandable
@@ -18,13 +19,13 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
     end
 
     it 'creates a collection type for the options received' do
-      options = {
-        description: 'A collection type with options.',
-        discoverable: false
-      }
+      options = { description: 'A collection type with options.',
+                  badge_color: '#ffa510',
+                  discoverable: false }
       described_class.create_collection_type(machine_id: 'custom_type', title: 'Custom Type', options: options)
       ct = Hyrax::CollectionType.find_by_machine_id('custom_type')
       expect(ct.description).to include('with options')
+      expect(ct.badge_color).to include('#ffa510')
       expect(ct).not_to be_discoverable
     end
 
@@ -42,6 +43,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       expect(ct.machine_id).to eq(Hyrax::CollectionType::ADMIN_SET_MACHINE_ID)
       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.badge_color).to eq('#663333')
       expect(ct).not_to be_nestable
       expect(ct).not_to be_brandable
       expect(ct).not_to be_discoverable
@@ -61,6 +63,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       expect(ct.machine_id).to eq(Hyrax::CollectionType::USER_COLLECTION_MACHINE_ID)
       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.badge_color).to eq('#663333')
       expect(ct).to be_nestable
       expect(ct).to be_brandable
       expect(ct).to be_discoverable

data/spec/services/hyrax/collections/migration_service_spec.rb

@@ -4,15 +4,21 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
   let(:editor2) { create(:user) }
   let(:reader1) { create(:user) }
   let(:reader2) { create(:user) }
+  let(:manager1) { create(:user) }
+  let(:manager2) { create(:user) }
+  let(:depositor1) { create(:user) }
+  let(:depositor2) { create(:user) }
+  let(:viewer1) { create(:user) }
+  let(:viewer2) { create(:user) }
   let(:default_gid) { create(:user_collection_type).gid }
 
   describe ".migrate_all_collections" do
     context 'when legacy collections are found (e.g. collections created before Hyrax 2.1.0)' do
       let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
       let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-      let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], do_save: true) }
+      let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
       let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-      let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], do_save: true) }
+      let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
       it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
         Collection.all.each do |col|
@@ -28,6 +34,8 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
           expect(pt_id).not_to be_nil
           expect_access(pt_id, 'user', :manage, col.edit_users)
           expect_access(pt_id, 'group', :manage, col.edit_groups)
+          expect_access(pt_id, 'user', :deposit, [])
+          expect_access(pt_id, 'group', :deposit, [])
           expect_access(pt_id, 'user', :view, col.read_users)
           expect_access(pt_id, 'group', :view, col.read_groups)
         end
@@ -36,24 +44,107 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
 
     context 'when newer collections are found (e.g. collections created at or after Hyrax 2.1.0)' do
       let!(:collection) do
-        create(:collection, id: 'col_newer', user: user, with_permission_template: true,
-                            collection_type_settings: [:discoverable], edit_users: [user.user_key],
-                            create_access: true)
+        build(:collection_lw,
+              id: 'col_newer', user: user,
+              with_permission_template: { manage_users: [manager1.user_key] },
+              with_solr_document: true)
       end
       let!(:permission_template) { collection.permission_template }
       let!(:collection_type_gid) { collection.collection_type_gid }
       let!(:edit_users) { collection.edit_users }
 
+      before do
+        allow(Collection).to receive(:all).and_return([collection])
+      end
+
       it "doesn't change the collection" do
         expect(collection.collection_type_gid).to eq collection_type_gid
         expect(Hyrax::PermissionTemplate.find_by!(source_id: collection.id).id).to eq permission_template.id
-        expect_access(permission_template.id, 'user', :manage, edit_users)
+        expect_access(permission_template.id, 'user', :manage, [user.user_key, manager1.user_key])
 
         Hyrax::Collections::MigrationService.migrate_all_collections
 
         expect(collection.collection_type_gid).to eq collection_type_gid
         expect(Hyrax::PermissionTemplate.find_by!(source_id: collection.id).id).to eq permission_template.id
-        expect_access(permission_template.id, 'user', :manage, edit_users)
+        expect_access(permission_template.id, 'user', :manage, [user.user_key, manager1.user_key])
+      end
+    end
+
+    context 'when legacy adminsets are found (e.g. adminsets created before Hyrax 2.1.0)' do
+      let!(:as_none) { build(:no_solr_grants_adminset, id: 'as_none', user: user) }
+      let!(:as_vu) { build(:no_solr_grants_adminset, id: 'as_vu', user: user, with_permission_template: { view_users: [reader1.user_key, reader2.user_key] }) }
+      let!(:as_vg) { build(:no_solr_grants_adminset, id: 'as_vg', user: user, with_permission_template: { view_groups: ['read_group_1', 'read_group_2'] }) }
+      let!(:as_du) { build(:no_solr_grants_adminset, id: 'as_du', user: user, with_permission_template: { deposit_users: [depositor1.user_key, depositor2.user_key] }) }
+      let!(:as_dg) { build(:no_solr_grants_adminset, id: 'as_dg', user: user, with_permission_template: { deposit_groups: ['deposit_group_1', 'deposit_group_2'] }) }
+      let!(:as_mu) { build(:no_solr_grants_adminset, id: 'as_mu', user: user, with_permission_template: { manage_users: [editor1.user_key, editor2.user_key] }) }
+      let!(:as_mg) { build(:no_solr_grants_adminset, id: 'as_mg', user: user, with_permission_template: { manage_groups: ['edit_group_1', 'edit_group_2'] }) }
+
+      before do
+        allow(AdminSet).to receive(:all).and_return([as_none, as_vu, as_vg, as_du, as_dg, as_mu, as_mg])
+      end
+
+      it 'sets read and edit access in solr doc' do # rubocop:disable RSpec/ExampleLength
+        AdminSet.all.each do |adminset|
+          expect(adminset.edit_users).to include(user.user_key)
+          expect(adminset.read_users).to eq []
+        end
+
+        Hyrax::Collections::MigrationService.migrate_all_collections
+
+        AdminSet.all.each do |adminset|
+          pt_id = Hyrax::PermissionTemplate.find_by!(source_id: adminset.id)
+          expect(pt_id).not_to be_nil
+          expect_solr_access(pt_id, 'user', :manage, adminset.edit_users)
+          expect_solr_access(pt_id, 'group', :manage, adminset.edit_groups)
+          expect_solr_access(pt_id, 'user', :deposit, adminset.read_users)
+          expect_solr_access(pt_id, 'group', :deposit, adminset.read_groups)
+          expect_solr_access(pt_id, 'user', :view, adminset.read_users)
+          expect_solr_access(pt_id, 'group', :view, adminset.read_groups)
+        end
+      end
+    end
+
+    context 'when newer adminsets are found (e.g. adminsets created at or after Hyrax 2.1.0)' do
+      let!(:adminset) do
+        build(:adminset_lw,
+              id: 'as_newer', user: user,
+              with_permission_template: {
+                manage_users: [editor1.user_key, editor2.user_key],
+                deposit_users: [depositor1.user_key, depositor2.user_key],
+                view_users: [viewer1.user_key, viewer2.user_key],
+                manage_groups: ['manage_group_1', 'manage_group_2'],
+                deposit_groups: ['deposit_group_1', 'deposit_group_2'],
+                view_groups: ['view_group_1', 'view_group_2']
+              },
+              with_solr_document: true)
+      end
+      let!(:permission_template) { adminset.permission_template }
+      let!(:edit_users) { adminset.edit_users }
+
+      before do
+        allow(AdminSet).to receive(:all).and_return([adminset])
+      end
+
+      it "doesn't change the adminset" do # rubocop:disable RSpec/ExampleLength
+        pt_id = Hyrax::PermissionTemplate.find_by!(source_id: adminset.id).id
+        expect(pt_id).to eq permission_template.id
+        expect_solr_access(pt_id, 'user', :manage, adminset.edit_users)
+        expect_solr_access(pt_id, 'group', :manage, adminset.edit_groups)
+        expect_solr_access(pt_id, 'user', :deposit, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :deposit, adminset.read_groups)
+        expect_solr_access(pt_id, 'user', :view, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :view, adminset.read_groups)
+
+        Hyrax::Collections::MigrationService.migrate_all_collections
+
+        pt_id = Hyrax::PermissionTemplate.find_by!(source_id: adminset.id).id
+        expect(pt_id).to eq permission_template.id
+        expect_solr_access(pt_id, 'user', :manage, adminset.edit_users)
+        expect_solr_access(pt_id, 'group', :manage, adminset.edit_groups)
+        expect_solr_access(pt_id, 'user', :deposit, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :deposit, adminset.read_groups)
+        expect_solr_access(pt_id, 'user', :view, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :view, adminset.read_groups)
       end
     end
   end
@@ -62,16 +153,16 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
     context 'when legacy collections are found (e.g. collections created before Hyrax 2.1.0)' do
       let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
       let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-      let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], do_save: true) }
+      let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
       let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-      let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], do_save: true) }
+      let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
       context "and collection wasn't migrated at all" do
         let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
         let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-        let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], do_save: true) }
+        let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
         let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-        let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], do_save: true) }
+        let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
         it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
           Collection.all.each do |col|
@@ -96,9 +187,9 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       context "and collection type gid is set but permission template doesn't exist" do
         let!(:col_none) { create(:user_collection, id: 'col_none', user: user, edit_users: [user.user_key], collection_type_gid: default_gid) }
         let!(:col_vu) { create(:user_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], collection_type_gid: default_gid) }
-        let!(:col_vg) { create(:user_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], collection_type_gid: default_gid) }
+        let!(:col_vg) { create(:user_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], collection_type_gid: default_gid) }
         let!(:col_mu) { create(:user_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], collection_type_gid: default_gid) }
-        let!(:col_mg) { create(:user_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], collection_type_gid: default_gid) }
+        let!(:col_mg) { create(:user_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], collection_type_gid: default_gid) }
 
         it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
           Collection.all.each do |col|
@@ -127,7 +218,7 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_vg) do
-          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'],
+          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mu) do
@@ -135,7 +226,7 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mg) do
-          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'],
+          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
                                       do_save: true, with_permission_template: true)
         end
 
@@ -191,7 +282,7 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_vg) do
-          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'],
+          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mu) do
@@ -199,7 +290,7 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mg) do
-          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'],
+          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
                                       do_save: true, with_permission_template: true)
         end
 
@@ -250,6 +341,84 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
         expect_access(permission_template.id, 'user', :manage, edit_users)
       end
     end
+
+    context 'when legacy adminsets are found (e.g. adminsets created before Hyrax 2.1.0)' do
+      let!(:as_none) { build(:no_solr_grants_adminset, id: 'as_none', user: user) }
+      let!(:as_vu) { build(:no_solr_grants_adminset, id: 'as_vu', user: user, with_permission_template: { view_users: [reader1.user_key, reader2.user_key] }) }
+      let!(:as_vg) { build(:no_solr_grants_adminset, id: 'as_vg', user: user, with_permission_template: { view_groups: ['read_group_1', 'read_group_2'] }) }
+      let!(:as_du) { build(:no_solr_grants_adminset, id: 'as_du', user: user, with_permission_template: { deposit_users: [depositor1.user_key, depositor2.user_key] }) }
+      let!(:as_dg) { build(:no_solr_grants_adminset, id: 'as_dg', user: user, with_permission_template: { deposit_groups: ['deposit_group_1', 'deposit_group_2'] }) }
+      let!(:as_mu) { build(:no_solr_grants_adminset, id: 'as_mu', user: user, with_permission_template: { manage_users: [editor1.user_key, editor2.user_key] }) }
+      let!(:as_mg) { build(:no_solr_grants_adminset, id: 'as_mg', user: user, with_permission_template: { manage_groups: ['edit_group_1', 'edit_group_2'] }) }
+
+      before do
+        allow(AdminSet).to receive(:all).and_return([as_none, as_vu, as_vg, as_du, as_dg, as_mu, as_mg])
+      end
+
+      it 'sets read and edit access in solr doc' do # rubocop:disable RSpec/ExampleLength
+        AdminSet.all.each do |adminset|
+          expect(adminset.edit_users).to include(user.user_key)
+          expect(adminset.read_users).to eq []
+        end
+
+        Hyrax::Collections::MigrationService.repair_migrated_collections
+
+        AdminSet.all.each do |adminset|
+          pt_id = Hyrax::PermissionTemplate.find_by!(source_id: adminset.id)
+          expect(pt_id).not_to be_nil
+          expect_solr_access(pt_id, 'user', :manage, adminset.edit_users)
+          expect_solr_access(pt_id, 'group', :manage, adminset.edit_groups)
+          expect_solr_access(pt_id, 'user', :deposit, adminset.read_users)
+          expect_solr_access(pt_id, 'group', :deposit, adminset.read_groups)
+          expect_solr_access(pt_id, 'user', :view, adminset.read_users)
+          expect_solr_access(pt_id, 'group', :view, adminset.read_groups)
+        end
+      end
+    end
+
+    context 'when newer adminsets are found (e.g. adminsets created at or after Hyrax 2.1.0)' do
+      let!(:adminset) do
+        build(:adminset_lw,
+              id: 'as_newer', user: user,
+              with_permission_template: {
+                manage_users: [editor1.user_key, editor2.user_key],
+                deposit_users: [depositor1.user_key, depositor2.user_key],
+                view_users: [viewer1.user_key, viewer2.user_key],
+                manage_groups: ['manage_group_1', 'manage_group_2'],
+                deposit_groups: ['deposit_group_1', 'deposit_group_2'],
+                view_groups: ['view_group_1', 'view_group_2']
+              },
+              with_solr_document: true)
+      end
+      let!(:permission_template) { adminset.permission_template }
+      let!(:edit_users) { adminset.edit_users }
+
+      before do
+        allow(AdminSet).to receive(:all).and_return([adminset])
+      end
+
+      it "doesn't change the adminset" do # rubocop:disable RSpec/ExampleLength
+        pt_id = Hyrax::PermissionTemplate.find_by!(source_id: adminset.id).id
+        expect(pt_id).to eq permission_template.id
+        expect_solr_access(pt_id, 'user', :manage, adminset.edit_users)
+        expect_solr_access(pt_id, 'group', :manage, adminset.edit_groups)
+        expect_solr_access(pt_id, 'user', :deposit, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :deposit, adminset.read_groups)
+        expect_solr_access(pt_id, 'user', :view, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :view, adminset.read_groups)
+
+        Hyrax::Collections::MigrationService.repair_migrated_collections
+
+        pt_id = Hyrax::PermissionTemplate.find_by!(source_id: adminset.id).id
+        expect(pt_id).to eq permission_template.id
+        expect_solr_access(pt_id, 'user', :manage, adminset.edit_users)
+        expect_solr_access(pt_id, 'group', :manage, adminset.edit_groups)
+        expect_solr_access(pt_id, 'user', :deposit, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :deposit, adminset.read_groups)
+        expect_solr_access(pt_id, 'user', :view, adminset.read_users)
+        expect_solr_access(pt_id, 'group', :view, adminset.read_groups)
+      end
+    end
   end
 
   def create_access(permission_template_id, agent_type, access, agent_ids)
@@ -277,4 +446,22 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       expect(pta).to be_empty
     end
   end
+
+  def expect_solr_access(permission_template_id, pt_agent_type, pt_access, solrdoc_access)
+    ptas = Hyrax::PermissionTemplateAccess.where(permission_template_id: permission_template_id, agent_type: pt_agent_type, access: pt_access)
+    expect_solr_group_access(ptas, solrdoc_access) if pt_agent_type == 'group'
+    expect_solr_user_access(ptas, solrdoc_access) if pt_agent_type == 'user'
+  end
+
+  def expect_solr_group_access(permission_templates, solrdoc_access)
+    permission_templates.each do |pta|
+      expect(solrdoc_access).to include pta.agent_id
+    end
+  end
+
+  def expect_solr_user_access(permission_templates, solrdoc_access)
+    permission_templates.each do |pta|
+      expect(solrdoc_access).to include pta.agent_id
+    end
+  end
 end