hyrax 2.4.1 → 2.5.0

data/spec/actors/hyrax/actors/collections_membership_actor_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
   end
 
   describe 'the next actor' do
-    let(:collection) { create(:collection, create_access: true) }
+    let(:collection) { build(:collection_lw, with_permission_template: true) }
     let(:attributes) do
       {
         member_of_collections_attributes: { '0' => { id: '123' } },
@@ -68,7 +68,7 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
     end
 
     context "when work is in user's own collection and destroy is passed" do
-      let(:collection) { create(:collection, user: user, title: ['A good title'], create_access: true) }
+      let(:collection) { build(:collection_lw, user: user, title: ['A good title'], with_permission_template: true) }
       let(:attributes) do
         { member_of_collections_attributes: { '0' => { id: collection.id, _destroy: 'true' } } }
       end
@@ -86,7 +86,7 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
 
     context "when work is in another user's collection" do
       let(:other_user) { create(:user) }
-      let(:other_collection) { create(:collection, user: other_user, title: ['A good title'], create_access: true) }
+      let(:other_collection) { build(:collection_lw, user: other_user, title: ['A good title'], with_permission_template: true) }
 
       before do
         curation_concern.member_of_collections = [other_collection]
@@ -172,7 +172,7 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
 
     context "updates env" do
       let!(:collection_type) { create(:collection_type) }
-      let!(:collection) { create(:collection, collection_type_gid: collection_type.gid, create_access: true) }
+      let!(:collection) { create(:collection_lw, collection_type_gid: collection_type.gid, with_permission_template: true) }
 
       subject(:middleware) do
         stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
@@ -205,7 +205,7 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
         end
 
         context "when more than one collection" do
-          let(:collection2) { create(:collection, create_access: true) }
+          let(:collection2) { create(:collection_lw, with_permission_template: true) }
           let(:attributes) do
             {
               member_of_collections_attributes: {

data/spec/actors/hyrax/actors/transactional_request_spec.rb

@@ -35,10 +35,12 @@ RSpec.describe Hyrax::Actors::TransactionalRequest do
 
     subject { middleware.create(env) }
 
-    it "rolls back any database changes" do
+    # Note that this test changed behavior with the
+    # backport of https://github.com/samvera/hyrax/pull/3482
+    it "does NOT roll back any database changes" do
       expect do
         expect { subject }.to raise_error 'boom'
-      end.not_to change { User.count } # Note the above good actor creates a user
+      end.to change { User.count } # Note the above good actor creates a user
     end
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe CatalogController, type: :controller do
     end
 
     context 'with collections' do
-      let(:collection) { create(:public_collection, keyword: ['rocks']) }
+      let(:collection) { create(:public_collection_lw, keyword: ['rocks']) }
       let(:objects) { [collection, rocks, clouds] }
 
       it 'finds collections' do

data/spec/controllers/hyrax/admin/collection_types_controller_spec.rb

@@ -306,7 +306,7 @@ RSpec.describe Hyrax::Admin::CollectionTypesController, type: :controller, clean
       end
 
       context "when collections exist of this type" do
-        let!(:collection) { create(:collection, collection_type_gid: collection_type_to_destroy.gid) }
+        let!(:collection) { create(:collection_lw, collection_type_gid: collection_type_to_destroy.gid) }
 
         it "doesn't delete the collection type or collection" do
           delete :destroy, params: { id: collection_type_to_destroy }

data/spec/controllers/hyrax/batch_edits_controller_spec.rb

@@ -174,15 +174,15 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
     let(:user) { create(:user) }
 
     let(:collection1) do
-      create(:public_collection, title: ["My First Collection"],
-                                 description: ["My incredibly detailed description of the collection"],
-                                 user: user)
+      create(:public_collection_lw, title: ["My First Collection"],
+                                    description: ["My incredibly detailed description of the collection"],
+                                    user: user)
     end
 
     let(:collection2) do
-      create(:public_collection, title: ["My Other Collection"],
-                                 description: ["My incredibly detailed description of the other collection"],
-                                 user: user)
+      create(:public_collection_lw, title: ["My Other Collection"],
+                                    description: ["My incredibly detailed description of the other collection"],
+                                    user: user)
     end
 
     let!(:work1) { create(:work, title: ["First of the Assets"], member_of_collections: [collection1], user: user) }
@@ -204,9 +204,9 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
       let(:user2) { create(:user) }
 
       let(:collection3) do
-        create(:public_collection, title: ["User2's Collection"],
-                                   description: ["Collection created by user2"],
-                                   user: user2)
+        create(:public_collection_lw, title: ["User2's Collection"],
+                                      description: ["Collection created by user2"],
+                                      user: user2)
       end
 
       before do

data/spec/controllers/hyrax/collections_controller_spec.rb

@@ -4,16 +4,16 @@ RSpec.describe Hyrax::CollectionsController do
   let(:other) { build(:user) }
 
   let(:collection) do
-    create(:public_collection, title: ["My collection"],
-                               description: ["My incredibly detailed description of the collection"],
-                               user: user)
+    create(:public_collection_lw, title: ["My collection"],
+                                  description: ["My incredibly detailed description of the collection"],
+                                  user: user)
   end
 
   let(:asset1)         { create(:work, title: ["First of the Assets"], user: user) }
   let(:asset2)         { create(:work, title: ["Second of the Assets"], user: user) }
   let(:asset3)         { create(:work, title: ["Third of the Assets"], user: user) }
-  let(:asset4)         { create(:collection, title: ["First subcollection"], user: user) }
-  let(:asset5)         { create(:collection, title: ["Second subcollection"], user: user) }
+  let(:asset4)         { build(:collection_lw, title: ["First subcollection"], user: user) }
+  let(:asset5)         { build(:collection_lw, title: ["Second subcollection"], user: user) }
   let(:unowned_asset)  { create(:work, user: other) }
 
   let(:collection_attrs) do

data/spec/controllers/hyrax/dashboard/collection_members_controller_spec.rb

@@ -10,20 +10,23 @@ RSpec.describe Hyrax::Dashboard::CollectionMembersController, :clean_repo do
   let(:work_5_read) { create(:work, id: 'work-5-read', title: ["Other's work with read access"], user: other, read_users: [user]) }
   let(:work_6_noaccess) { create(:work, id: 'work-6-no_access', title: ["Other's work with no access"], user: other) }
 
-  let(:coll_1_own) { create(:private_collection, id: 'col-1-own', title: ['User created'], user: user, create_access: true) }
+  let(:coll_1_own) { create(:private_collection_lw, id: 'col-1-own', title: ['User created'], user: user, with_permission_template: true) }
   let(:coll_2_mgr) do
-    create(:private_collection, id: 'col-2-mgr', title: ['User has manage access'], user: other,
-                                with_permission_template: { manage_users: [user] }, create_access: true)
+    create(:private_collection_lw, id: 'col-2-mgr', title: ['User has manage access'], user: other,
+                                   with_permission_template: { manage_users: [user] })
   end
   let(:coll_3_dep) do
-    create(:private_collection, id: 'col-3-dep', title: ['User has deposit access'], user: other,
-                                with_permission_template: { deposit_users: [user] }, create_access: true)
+    create(:private_collection_lw, id: 'col-3-dep', title: ['User has deposit access'], user: other,
+                                   with_permission_template: { deposit_users: [user] })
   end
   let(:coll_4_view) do
-    create(:private_collection, id: 'col-4-dep', title: ['User has view access'], user: other,
-                                with_permission_template: { view_users: [user] }, create_access: true)
+    create(:private_collection_lw, id: 'col-4-dep', title: ['User has view access'], user: other,
+                                   with_permission_template: { view_users: [user] })
+  end
+  let(:coll_5_noaccess) do
+    create(:private_collection_lw, id: 'col-5-no_access', title: ['Other user created'],
+                                   user: other, with_permission_template: true)
   end
-  let(:coll_5_noaccess) { create(:private_collection, id: 'col-5-no_access', title: ['Other user created'], user: other, create_access: true) }
 
   describe '#update_members' do
     context 'when user created the collection' do
@@ -95,7 +98,7 @@ RSpec.describe Hyrax::Dashboard::CollectionMembersController, :clean_repo do
       end
 
       context 'and user adds a subcollection' do
-        let(:parent_collection) { create(:private_collection, id: 'pcol', title: ['User created another'], user: user, create_access: true) }
+        let(:parent_collection) { create(:private_collection_lw, id: 'pcol', title: ['User created another'], user: user, with_permission_template: true) }
 
         it 'adds collection user created' do
           expect do
@@ -209,8 +212,8 @@ RSpec.describe Hyrax::Dashboard::CollectionMembersController, :clean_repo do
 
       context 'and user adds a subcollection' do
         let(:parent_collection) do
-          create(:private_collection, id: 'pcol-mgr', title: ['User has manage access to another'], user: other,
-                                      with_permission_template: { manage_users: [user] }, create_access: true)
+          create(:private_collection_lw, id: 'pcol-mgr', title: ['User has manage access to another'], user: other,
+                                         with_permission_template: { manage_users: [user] })
         end
 
         it 'adds collection user created' do
@@ -325,8 +328,8 @@ RSpec.describe Hyrax::Dashboard::CollectionMembersController, :clean_repo do
 
       context 'and user adds a subcollection' do
         let(:parent_collection) do
-          create(:private_collection, id: 'pcol-dep', title: ['User has deposit access to another'], user: other,
-                                      with_permission_template: { deposit_users: [user] }, create_access: true)
+          create(:private_collection_lw, id: 'pcol-dep', title: ['User has deposit access to another'], user: other,
+                                         with_permission_template: { deposit_users: [user] })
         end
 
         it 'adds collection user created' do

data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb

@@ -5,16 +5,16 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
   let(:collection_type_gid) { create(:user_collection_type).gid }
 
   let(:collection) do
-    create(:public_collection, title: ["My collection"],
-                               description: ["My incredibly detailed description of the collection"],
-                               user: user)
+    create(:public_collection_lw, title: ["My collection"],
+                                  description: ["My incredibly detailed description of the collection"],
+                                  user: user)
   end
 
   let(:asset1)         { create(:work, title: ["First of the Assets"], user: user) }
   let(:asset2)         { create(:work, title: ["Second of the Assets"], user: user) }
   let(:asset3)         { create(:work, title: ["Third of the Assets"], user: user) }
-  let(:asset4)         { create(:collection, title: ["First subcollection"], user: user) }
-  let(:asset5)         { create(:collection, title: ["Second subcollection"], user: user) }
+  let(:asset4)         { build(:collection_lw, title: ["First subcollection"], user: user) }
+  let(:asset5)         { build(:collection_lw, title: ["Second subcollection"], user: user) }
   let(:unowned_asset)  { create(:work, user: other) }
 
   let(:collection_attrs) do
@@ -112,7 +112,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
     end
 
     context "when params includes parent_id" do
-      let(:parent_collection) { create(:collection, title: ['Parent']) }
+      let(:parent_collection) { create(:collection_lw, title: ['Parent']) }
 
       it "creates a collection as a subcollection of parent" do
         parent_collection
@@ -189,7 +189,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
       let(:asset1) { create(:generic_work, user: user) }
       let(:asset2) { create(:generic_work, user: user) }
       let(:asset3) { create(:generic_work, user: user) }
-      let(:collection2) { create(:collection, title: ['Some Collection'], user: user) }
+      let(:collection2) { create(:collection_lw, title: ['Some Collection'], user: user) }
 
       before do
         [asset1, asset2, asset3].each do |asset|
@@ -233,7 +233,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
     end
 
     context "when update fails" do
-      let(:collection) { create(:collection, id: '12345') }
+      let(:collection) { build(:collection_lw, id: '12345') }
       let(:repository) { instance_double(Blacklight::Solr::Repository, search: result) }
       let(:result) { double(documents: [], total: 0) }
 

data/spec/controllers/hyrax/dashboard/nest_collections_controller_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Hyrax::Dashboard::NestCollectionsController do
   routes { Hyrax::Engine.routes }
   let(:child_id) { 'child1' }
   let(:child) { instance_double(Collection, title: ["Awesome Child"]) }
-  let(:parent) { create(:collection, id: 'parent1', collection_type_settings: :nestable, title: ["Uncool Parent"]) }
+  let(:parent) { create(:collection_lw, id: 'parent1', collection_type_settings: :nestable, title: ["Uncool Parent"]) }
 
   describe '#blacklight_config' do
     subject { controller.blacklight_config }

data/spec/controllers/hyrax/generic_works_controller_spec.rb

@@ -534,7 +534,7 @@ RSpec.describe Hyrax::GenericWorksController do
 
   describe '#destroy' do
     let(:work_to_be_deleted) { create(:private_generic_work, user: user) }
-    let(:parent_collection) { create(:collection) }
+    let(:parent_collection) { build(:collection_lw) }
 
     it 'deletes the work' do
       delete :destroy, params: { id: work_to_be_deleted }

data/spec/controllers/hyrax/my/shares_controller_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Hyrax::My::SharesController, type: :controller do
       let!(:shared_with_me)           { create(:work, user: other_user, edit_users: [user, other_user]) }
       let!(:read_shared_with_me)      { create(:work, user: other_user, read_users: [user, other_user]) }
       let!(:shared_with_someone_else) { create(:work, user: other_user, edit_users: [someone_else, other_user]) }
-      let!(:my_collection)            { create(:public_collection, user: user) }
+      let!(:my_collection)            { create(:public_collection_lw, user: user) }
 
       it "responds with success" do
         get :index

data/spec/features/actor_stack_spec.rb

@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+# Integration tests for the full midddleware stack
+RSpec.describe Hyrax::DefaultMiddlewareStack, :clean_repo do
+  subject(:actor)  { stack.build(Hyrax::Actors::Terminator.new) }
+  let(:ability)    { ::Ability.new(user) }
+  let(:attributes) { {} }
+  let(:stack)      { described_class.build_stack }
+  let(:terminator) { Hyrax::Actors::Terminator.new }
+  let(:user)       { FactoryBot.create(:user) }
+  let(:work)       { FactoryBot.build(:work) }
+  let(:env)        { Hyrax::Actors::Environment.new(work, ability, attributes) }
+
+  let(:delayed_failure_actor) do
+    Class.new(Hyrax::Actors::AbstractActor) do
+      def create(env)
+        next_actor.create(env) && raise('ALWAYS RAISE')
+      end
+    end
+  end
+
+  describe '#create' do
+    it 'persists the work' do
+      expect { actor.create(env) }
+        .to change { work.persisted? }
+        .to true
+    end
+
+    context 'when failing on the way back up the actor stack' do
+      before { stack.insert_before(Hyrax::Actors::ModelActor, delayed_failure_actor) }
+
+      before(:context) do
+        Hyrax.config.enable_noids = true
+        # we need to mint once to set the `rand` database column and
+        # make minter behavior predictable
+        ::Noid::Rails.config.minter_class.new.mint
+      end
+
+      after(:context) { Hyrax.config.enable_noids = false }
+
+      it 'leaves a valid minter state', :aggregate_failures do
+        expect { actor.create(env) }.to raise_error 'ALWAYS RAISE'
+
+        expect(GenericWork.new.assign_id).not_to eq work.id
+      end
+    end
+  end
+end

data/spec/features/catalog_search_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe 'catalog searching', type: :feature do
       create(:public_work, title: ["Jack's Research"], keyword: ['jacks_keyword', 'shared_keyword'])
     end
 
-    let!(:collection) { create(:public_collection, keyword: ['collection_keyword', 'shared_keyword']) }
+    let!(:collection) { create(:public_collection_lw, keyword: ['collection_keyword', 'shared_keyword']) }
 
     it 'performing a search' do
       within('#search-form-header') do
@@ -30,7 +30,7 @@ RSpec.describe 'catalog searching', type: :feature do
   end
 
   context 'with public works and private collections', clean_repo: true do
-    let!(:collection) { create(:private_collection) }
+    let!(:collection) { build(:private_collection_lw) }
 
     let!(:jills_work) do
       create(:public_work, title: ["Jill's Research"], keyword: ['jills_keyword'], member_of_collections: [collection])

data/spec/features/collection_multi_membership_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
   end
 
   describe 'when both collections support multiple membership' do
-    let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid, title: ['OldCollectionTitle']) }
+    let(:old_collection) { build(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid, title: ['OldCollectionTitle']) }
     let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
 
     context 'and are of different types' do
@@ -56,7 +56,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
   end
 
   describe 'when both collections require single membership' do
-    let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid, title: ['OldCollectionTitle']) }
+    let(:old_collection) { build(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid, title: ['OldCollectionTitle']) }
     let!(:work) do
       create(:generic_work,
              user: admin_user,

data/spec/features/collection_spec.rb

@@ -1,17 +1,17 @@
 RSpec.describe 'collection', type: :feature, clean_repo: true do
   let(:user) { create(:user) }
 
-  let(:collection1) { create(:public_collection, user: user) }
-  let(:collection2) { create(:public_collection, user: user) }
+  let(:collection1) { create(:public_collection_lw, user: user) }
+  let(:collection2) { create(:public_collection_lw, user: user) }
 
   describe 'collection show page' do
     let(:collection) do
-      create(:public_collection, user: user, description: ['collection description'], collection_type_settings: :nestable)
+      create(:public_collection_lw, user: user, description: ['collection description'], collection_type_settings: :nestable)
     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) }
-    let!(:col1) { create(:public_collection, title: ["Sub-collection 1"], member_of_collections: [collection], user: user) }
-    let!(:col2) { create(:public_collection, title: ["Sub-collection 2"], member_of_collections: [collection], user: user) }
+    let!(:col1) { create(:public_collection_lw, title: ["Sub-collection 1"], member_of_collections: [collection], user: user) }
+    let!(:col2) { create(:public_collection_lw, title: ["Sub-collection 2"], member_of_collections: [collection], user: user) }
 
     before do
       sign_in user
@@ -90,7 +90,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
       sign_in user
     end
-    let(:collection) { create(:named_collection, user: user) }
+    let(:collection) { create(:named_collection_lw, user: user) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit "/collections/#{collection.id}"
@@ -112,7 +112,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
       sign_in user
     end
-    let(:collection) { create(:named_collection, user: user) }
+    let(:collection) { create(:named_collection_lw, user: user) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit "/collections/#{collection.id}"

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
@@ -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) }
 
@@ -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"