hyrax 2.0.3 → 2.1.0.beta1

data/spec/controllers/hyrax/content_blocks_controller_spec.rb

@@ -1,12 +1,12 @@
 RSpec.describe Hyrax::ContentBlocksController, type: :controller do
   let!(:announcement_text) do
-    FactoryBot.create(:content_block, name: 'announcement_text')
+    create(:content_block, name: 'announcement_text')
   end
   let!(:marketing_text) do
-    FactoryBot.create(:content_block, name: 'marketing_text')
+    create(:content_block, name: 'marketing_text')
   end
   let!(:featured_researcher) do
-    FactoryBot.create(:content_block, name: 'featured_researcher')
+    create(:content_block, name: 'featured_researcher')
   end
 
   before do
@@ -14,7 +14,7 @@ RSpec.describe Hyrax::ContentBlocksController, type: :controller do
   end
 
   context 'with an unprivileged user' do
-    let(:user) { FactoryBot.create(:user) }
+    let(:user) { create(:user) }
 
     describe "GET #edit" do
       it "denies the request" do
@@ -32,7 +32,7 @@ RSpec.describe Hyrax::ContentBlocksController, type: :controller do
   end
 
   context 'with an administrator' do
-    let(:user) { FactoryBot.create(:admin) }
+    let(:user) { create(:admin) }
 
     describe "GET #edit" do
       it "renders breadcrumbs" do

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

@@ -0,0 +1,408 @@
+RSpec.describe Hyrax::Dashboard::CollectionMembersController, :clean_repo do
+  routes { Hyrax::Engine.routes }
+  let(:user)  { create(:user) }
+  let(:other) { build(:user) }
+
+  let(:work_1_own) { create(:work, id: 'work-1-own', title: ['First of the Assets'], user: user) }
+  let(:work_2_own) { create(:work, id: 'work-2-own', title: ['Second of the Assets'], user: user) }
+  let(:work_3_own) { create(:work, id: 'work-3-own', title: ['Third of the Assets'], user: user) }
+  let(:work_4_edit) { create(:work, id: 'work-4-edit', title: ["Other's work with edit access"], user: other, edit_users: [user]) }
+  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_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)
+  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)
+  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)
+  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
+      before do
+        sign_in user
+        [work_1_own, work_2_own].each do |asset|
+          asset.member_of_collections << coll_1_own
+          asset.save!
+        end
+      end
+
+      context 'and user created the work' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_1_own,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id] }
+          end.to change { coll_1_own.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_1_own, locale: 'en')
+          expect(coll_1_own.member_objects).to match_array [work_1_own, work_2_own, work_3_own]
+        end
+      end
+
+      context 'and user has edit access to works' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_1_own,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_4_edit.id] }
+          end.to change { coll_1_own.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_1_own, locale: 'en')
+          expect(coll_1_own.member_objects).to match_array [work_1_own, work_2_own, work_4_edit]
+        end
+      end
+
+      context 'and user has read access to works' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_1_own,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_5_read.id] }
+          end.to change { coll_1_own.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_1_own, locale: 'en')
+          expect(coll_1_own.member_objects).to match_array [work_1_own, work_2_own, work_5_read]
+        end
+      end
+
+      context 'and user has no access to a work' do
+        it 'adds only members with read access' do
+          expect do
+            post :update_members, params: { id: coll_1_own,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id, work_6_noaccess.id] }
+          end.to change { coll_1_own.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_1_own, locale: 'en')
+          expect(coll_1_own.member_objects).to match_array [work_1_own, work_2_own, work_3_own]
+        end
+
+        it 'displays error message if none of the members have read access' do
+          expect do
+            post :update_members, params: { id: coll_1_own,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_6_noaccess.id] }
+          end.to change { coll_1_own.reload.member_objects.size }.by(0)
+          expect(flash[:alert]).to eq 'You do not have sufficient privileges to any of the selected members'
+          expect(response).to redirect_to routes.url_helpers.dashboard_collections_path(locale: 'en')
+          expect(coll_1_own.member_objects).to match_array [work_1_own, work_2_own]
+        end
+      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) }
+
+        it 'adds collection user created' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_1_own.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_1_own]
+        end
+
+        it 'adds collection with manage access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_2_mgr.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_2_mgr]
+        end
+
+        it 'adds collection with deposit access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_3_dep.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_3_dep]
+        end
+
+        it 'adds collection with view access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_4_view.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_4_view]
+        end
+
+        it 'displays error message for collection with no access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_5_noaccess.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(0)
+          expect(flash[:alert]).to eq 'You do not have sufficient privileges to any of the selected members'
+          expect(response).to redirect_to routes.url_helpers.dashboard_collections_path(locale: 'en')
+          expect(parent_collection.member_objects).to match_array []
+        end
+      end
+    end
+
+    context 'when user is manager of the collection' do
+      before do
+        sign_in user
+        [work_1_own, work_2_own].each do |asset|
+          asset.member_of_collections << coll_2_mgr
+          asset.save!
+        end
+      end
+
+      context 'and user created the work' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_2_mgr,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id] }
+          end.to change { coll_2_mgr.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_2_mgr, locale: 'en')
+          expect(coll_2_mgr.member_objects).to match_array [work_1_own, work_2_own, work_3_own]
+        end
+      end
+
+      context 'and user has edit access to works' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_2_mgr,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_4_edit.id] }
+          end.to change { coll_2_mgr.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_2_mgr, locale: 'en')
+          expect(coll_2_mgr.member_objects).to match_array [work_1_own, work_2_own, work_4_edit]
+        end
+      end
+
+      context 'and user has read access to works' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_2_mgr,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_5_read.id] }
+          end.to change { coll_2_mgr.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_2_mgr, locale: 'en')
+          expect(coll_2_mgr.member_objects).to match_array [work_1_own, work_2_own, work_5_read]
+        end
+      end
+
+      context 'and user has no access to a work' do
+        it 'adds only members with read access' do
+          expect do
+            post :update_members, params: { id: coll_2_mgr,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id, work_6_noaccess.id] }
+          end.to change { coll_2_mgr.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_2_mgr, locale: 'en')
+          expect(coll_2_mgr.member_objects).to match_array [work_1_own, work_2_own, work_3_own]
+        end
+      end
+
+      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)
+        end
+
+        it 'adds collection user created' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_1_own.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_1_own]
+        end
+
+        it 'adds collection with manage access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_2_mgr.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_2_mgr]
+        end
+
+        it 'adds collection with deposit access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_3_dep.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_3_dep]
+        end
+
+        it 'adds collection with view access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_4_view.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_4_view]
+        end
+
+        it 'displays error message for collection with no access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_5_noaccess.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(0)
+          expect(flash[:alert]).to eq 'You do not have sufficient privileges to any of the selected members'
+          expect(response).to redirect_to routes.url_helpers.dashboard_collections_path(locale: 'en')
+          expect(parent_collection.member_objects).to match_array []
+        end
+      end
+    end
+
+    context 'when user is depositor of the collection' do
+      before do
+        sign_in user
+        [work_1_own, work_2_own].each do |asset|
+          asset.member_of_collections << coll_3_dep
+          asset.save!
+        end
+      end
+
+      context 'and user created the work' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_3_dep,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id] }
+          end.to change { coll_3_dep.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_3_dep, locale: 'en')
+          expect(coll_3_dep.member_objects).to match_array [work_1_own, work_2_own, work_3_own]
+        end
+      end
+
+      context 'and user has edit access to works' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_3_dep,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_4_edit.id] }
+          end.to change { coll_3_dep.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_3_dep, locale: 'en')
+          expect(coll_3_dep.member_objects).to match_array [work_1_own, work_2_own, work_4_edit]
+        end
+      end
+
+      context 'and user has read access to works' do
+        it 'adds members to the collection' do
+          expect do
+            post :update_members, params: { id: coll_3_dep,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_5_read.id] }
+          end.to change { coll_3_dep.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_3_dep, locale: 'en')
+          expect(coll_3_dep.member_objects).to match_array [work_1_own, work_2_own, work_5_read]
+        end
+      end
+
+      context 'and user has no access to a work' do
+        it 'adds only members with read access' do
+          expect do
+            post :update_members, params: { id: coll_3_dep,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id, work_6_noaccess.id] }
+          end.to change { coll_3_dep.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(coll_3_dep, locale: 'en')
+          expect(coll_3_dep.member_objects).to match_array [work_1_own, work_2_own, work_3_own]
+        end
+      end
+
+      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)
+        end
+
+        it 'adds collection user created' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_1_own.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_1_own]
+        end
+
+        it 'adds collection with manage access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_2_mgr.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_2_mgr]
+        end
+
+        it 'adds collection with deposit access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_3_dep.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_3_dep]
+        end
+
+        it 'adds collection with view access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_4_view.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(1)
+          expect(response).to redirect_to routes.url_helpers.dashboard_collection_path(parent_collection, locale: 'en')
+          expect(parent_collection.member_objects).to match_array [coll_4_view]
+        end
+
+        it 'displays error message for collection with no access' do
+          expect do
+            post :update_members, params: { id: parent_collection,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [coll_5_noaccess.id] }
+          end.to change { parent_collection.reload.member_objects.size }.by(0)
+          expect(flash[:alert]).to eq 'You do not have sufficient privileges to any of the selected members'
+          expect(response).to redirect_to routes.url_helpers.dashboard_collections_path(locale: 'en')
+          expect(parent_collection.member_objects).to match_array []
+        end
+      end
+    end
+
+    context 'when user is viewer of the collection' do
+      before do
+        sign_in user
+        [work_1_own, work_2_own].each do |asset|
+          asset.member_of_collections << coll_4_view
+          asset.save!
+        end
+      end
+
+      context 'and user created the work' do
+        it "displays error message if user can't deposit to collection" do
+          expect do
+            post :update_members, params: { id: coll_4_view,
+                                            collection: { members: 'add' },
+                                            batch_document_ids: [work_3_own.id] }
+          end.to change { coll_4_view.reload.member_objects.size }.by(0)
+          expect(flash[:alert]).to eq 'You do not have sufficient privileges to add members to the collection'
+          expect(response).to redirect_to routes.url_helpers.dashboard_collections_path(locale: 'en')
+          expect(coll_4_view.member_objects).to match_array [work_1_own, work_2_own]
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,8 @@
-RSpec.describe Hyrax::Dashboard::CollectionsController do
+RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
   routes { Hyrax::Engine.routes }
   let(:user)  { create(:user) }
   let(:other) { build(:user) }
+  let(:collection_type_gid) { create(:user_collection_type).gid }
 
   let(:collection) do
     create(:public_collection, title: ["My collection"],
@@ -12,10 +13,12 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
   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(:unowned_asset)  { create(:work, user: other) }
 
   let(:collection_attrs) do
-    { title: ['My First Collection'], description: ["The Description\r\n\r\nand more"] }
+    { title: ['My First Collection'], description: ["The Description\r\n\r\nand more"], collection_type_gid: [collection_type_gid] }
   end
 
   describe '#new' do
@@ -44,6 +47,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
       end.to change { Collection.count }.by(1)
       expect(assigns[:collection].visibility).to eq 'open'
       expect(assigns[:collection].edit_users).to contain_exactly "archivist1", user.email
+      expect(flash[:notice]).to eq "Collection was successfully created."
     end
 
     it "removes blank strings from params before creating Collection" do
@@ -70,7 +74,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
 
       it "adds docs to the collection and adds the collection id to the documents in the collection" do
         post :create, params: {
-          batch_document_ids: [asset1.id],
+          batch_document_ids: [asset1.id, unowned_asset.id],
           collection: collection_attrs
         }
 
@@ -82,6 +86,42 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
       end
     end
 
+    context 'when setting collection type' do
+      let(:collection_type) { create(:collection_type) }
+
+      it "creates a Collection of default type when type is nil" do
+        expect do
+          post :create, params: {
+            collection: collection_attrs
+          }
+        end.to change { Collection.count }.by(1)
+        expect(assigns[:collection].collection_type.machine_id).to eq Hyrax::CollectionType::USER_COLLECTION_MACHINE_ID
+      end
+
+      it "creates a Collection of specified type" do
+        expect do
+          post :create, params: {
+            collection: collection_attrs, collection_type_gid: collection_type.gid
+          }
+        end.to change { Collection.count }.by(1)
+        expect(assigns[:collection].collection_type_gid).to eq collection_type.gid
+      end
+    end
+
+    context "when params includes parent_id" do
+      let(:parent_collection) { create(:collection, title: ['Parent']) }
+
+      it "creates a collection as a subcollection of parent" do
+        parent_collection
+        expect do
+          post :create, params: {
+            collection: collection_attrs, parent_id: parent_collection.id
+          }
+        end.to change { Collection.count }.by(1)
+        expect(assigns[:collection].member_of_collections).to eq [parent_collection]
+      end
+    end
+
     context "when create fails" do
       let(:collection) { Collection.new }
 
@@ -110,7 +150,18 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
         end
       end
 
-      it "adds members to the collection" do
+      it "adds members to the collection from edit form" do
+        expect do
+          put :update, params: { id: collection,
+                                 collection: { members: 'add' },
+                                 batch_document_ids: [asset3.id],
+                                 stay_on_edit: true }
+        end.to change { collection.reload.member_objects.size }.by(1)
+        expect(response).to redirect_to routes.url_helpers.edit_dashboard_collection_path(collection, locale: 'en')
+        expect(assigns[:collection].member_objects).to match_array [asset1, asset2, asset3]
+      end
+
+      it "adds members to the collection from other than the edit form" do
         expect do
           put :update, params: { id: collection,
                                  collection: { members: 'add' },
@@ -135,11 +186,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
       let(:asset1) { create(:generic_work, user: user) }
       let(:asset2) { create(:generic_work, user: user) }
       let(:asset3) { create(:generic_work, user: user) }
-      let(:collection2) do
-        Collection.create(title: ['Some Collection']) do |col|
-          col.apply_depositor_metadata(user.user_key)
-        end
-      end
+      let(:collection2) { create(:collection, title: ['Some Collection'], user: user) }
 
       before do
         [asset1, asset2, asset3].each do |asset|
@@ -166,6 +213,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
         put :update, params: { id: collection, collection: { creator: ['Emily'] } }
         collection.reload
         expect(collection.creator).to eq ['Emily']
+        expect(flash[:notice]).to eq "Collection was successfully updated."
       end
 
       it "removes blank strings from params before updating Collection metadata" do
@@ -182,9 +230,9 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
     end
 
     context "when update fails" do
-      let(:collection) { Collection.new(id: '12345') }
+      let(:collection) { create(:collection, id: '12345') }
       let(:repository) { instance_double(Blacklight::Solr::Repository, search: result) }
-      let(:result) { double(documents: []) }
+      let(:result) { double(documents: [], total: 0) }
 
       before do
         allow(controller).to receive(:authorize!)
@@ -203,33 +251,81 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
         expect(assigns[:member_docs]).to be_kind_of Array
       end
     end
+
+    context "updating a collections branding metadata" do
+      it "saves banner metadata" do
+        val = double("/public/banner.gif")
+        allow(val).to receive(:file_url).and_return("/public/banner.gif")
+        allow(Hyrax::UploadedFile).to receive(:find).with(["1"]).and_return([val])
+
+        allow(File).to receive(:split).with(any_args).and_return(["banner.gif"])
+        allow(FileUtils).to receive(:cp).with(any_args).and_return(nil)
+
+        put :update, params: { id: collection, banner_files: [1], collection: { creator: ['Emily'] }, update_collection: true }
+        collection.reload
+        expect(CollectionBrandingInfo.where(collection_id: collection.id, role: "banner").where("local_path LIKE '%banner.gif'")).to exist
+      end
+
+      it "don't save banner metadata" do
+        val = double("/public/banner.gif")
+        allow(val).to receive(:file_url).and_return("/public/banner.gif")
+        allow(Hyrax::UploadedFile).to receive(:find).with(["1"]).and_return([val])
+
+        allow(File).to receive(:split).with(any_args).and_return(["banner.gif"])
+        allow(FileUtils).to receive(:cp).with(any_args).and_return(nil)
+
+        put :update, params: { id: collection, banner_files: [1], collection: { creator: ['Emily'] } }
+        collection.reload
+        expect(CollectionBrandingInfo.where(collection_id: collection.id, role: "banner").where("local_path LIKE '%banner.gif'")).not_to exist
+      end
+
+      it "saves logo metadata" do
+        val = double(["/public/logo.gif"])
+        allow(val).to receive(:file_url).and_return("/public/logo.gif")
+        allow(Hyrax::UploadedFile).to receive(:find).with("1").and_return(val)
+
+        allow(File).to receive(:split).with(any_args).and_return(["logo.gif"])
+        allow(FileUtils).to receive(:cp).with(any_args).and_return(nil)
+
+        put :update, params: { id: collection, logo_files: [1], alttext: ["Logo alt Text"], linkurl: ["http://abc.com"], collection: { creator: ['Emily'] }, update_collection: true }
+        collection.reload
+
+        expect(CollectionBrandingInfo.where(collection_id: collection.id, role: "logo", alt_text: "Logo alt Text", target_url: "http://abc.com").where("local_path LIKE '%logo.gif'")).to exist
+      end
+    end
   end
 
   describe "#show" do
     context "when signed in" do
       before do
         sign_in user
-        [asset1, asset2, asset3].each do |asset|
+        [asset1, asset2, asset3, asset4, asset5].each do |asset|
           asset.member_of_collections = [collection]
           asset.save
         end
       end
 
-      it "returns the collection and its members" do
+      it "returns the collection and its members", :with_nested_reindexing do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :show, params: { id: collection }
         expect(response).to be_successful
         expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
         expect(assigns[:presenter].title).to match_array collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
+        expect(assigns[:subcollection_docs].map(&:id)).to match_array [asset4, asset5].map(&:id)
+        expect(assigns[:members_count]).to eq(3)
+        expect(assigns[:subcollection_count]).to eq(2)
       end
 
-      context "and searching" do
-        it "returns some works" do
+      context "and searching", :with_nested_reindexing do
+        it "returns some works and collections" do
           # "/dashboard/collections/4m90dv529?utf8=%E2%9C%93&cq=King+Louie&sort="
-          get :show, params: { id: collection, cq: "Third" }
+          get :show, params: { id: collection, cq: "Second" }
           expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
-          expect(assigns[:member_docs].map(&:id)).to match_array [asset3].map(&:id)
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset2].map(&:id)
+          expect(assigns[:subcollection_docs].map(&:id)).to match_array [asset5].map(&:id)
+          expect(assigns[:members_count]).to eq(1)
+          expect(assigns[:subcollection_count]).to eq(1)
         end
       end
 
@@ -288,7 +384,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
     context "when not signed in" do
       it "redirects to sign in page" do
         get :show, params: { id: collection }
-        expect(response).to have_http_status(302)
+        expect(response).to redirect_to('/users/sign_in')
       end
     end
   end