hyrax 1.1.1 → 2.0.0.beta1

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

@@ -1,4 +1,4 @@
-describe Hyrax::Admin::StatsController, type: :controller do
+RSpec.describe Hyrax::Admin::StatsController, type: :controller do
   let(:user) { create(:user) }
 
   context "a non admin" do

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

@@ -1,27 +1,14 @@
-require 'spec_helper'
-
 RSpec.describe Hyrax::Admin::StrategiesController do
   describe "#update" do
     before do
-      # Added when Flipflop bumped to 2.3.2. See also https://github.com/voormedia/flipflop/issues/26
-      Flipflop::FeatureSet.current.instance_variable_set(:@features, original_feature_hash.merge(feature_id => feature))
-
       sign_in user
     end
-
-    after do
-      Flipflop::FeatureSet.current.instance_variable_set(:@features, original_feature_hash)
-    end
-
-    let(:original_feature_hash) { Flipflop::FeatureSet.current.instance_variable_get(:@features) }
     let(:user) { create(:user) }
     let(:strategy) { Flipflop::Strategies::ActiveRecordStrategy.new(class: Hyrax::Feature).key }
-    let(:feature) { double('feature', id: feature_id, key: 'foo') }
-    let(:feature_id) { :my_feature }
 
     context "when not authorized" do
       it "redirects away" do
-        patch :update, params: { feature_id: feature.id, id: strategy }
+        patch :update, params: { feature_id: '123', id: strategy }
         expect(response).to redirect_to root_path
       end
     end
@@ -33,7 +20,7 @@ RSpec.describe Hyrax::Admin::StrategiesController do
       end
 
       it "is successful" do
-        patch :update, params: { feature_id: feature.id, id: strategy }
+        patch :update, params: { feature_id: '123', id: strategy }
         expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.admin_features_path(locale: 'en')
       end
     end

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

@@ -1,27 +1,17 @@
-describe Hyrax::Admin::UsersController, type: :controller do
-  let!(:user) { FactoryBot.create(:user) }
+RSpec.describe Hyrax::Admin::UsersController, type: :controller do
   before do
     expect(controller).to receive(:authorize!).with(:read, :admin_dashboard).and_return(true)
   end
-  let!(:admin_user) { FactoryBot.create(:user, groups: 'admin') }
-  let!(:audit_user) { User.audit_user }
-  let!(:batch_user) { User.batch_user }
-  let!(:guest_user) { FactoryBot.create(:user, :guest) }
 
   describe "#index" do
     it "is successful" do
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.controls.home'), root_path)
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.toolbar.admin.menu'), admin_path)
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.breadcrumbs.admin'), dashboard_path)
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.admin.users.index.title'), admin_users_path)
 
       get :index
       expect(response).to be_successful
-    end
-
-    it "excludes audit_user, batch_user, and guest user" do
-      get :index
-      expect(assigns[:presenter].users.to_a).to match_array [user, admin_user]
-      expect(response).to be_successful
+      expect(assigns[:presenter]).to be_kind_of Hyrax::Admin::UsersPresenter
     end
   end
 end

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

@@ -1,8 +1,4 @@
-require 'spec_helper'
-
-RSpec.describe Hyrax::Admin::WorkflowRolesController, :no_clean do
-  routes { Hyrax::Engine.routes }
-
+RSpec.describe Hyrax::Admin::WorkflowRolesController do
   describe "#get" do
     context "when you have permission" do
       before do
@@ -11,12 +7,12 @@ RSpec.describe Hyrax::Admin::WorkflowRolesController, :no_clean do
 
       it "is successful" do
         expect(controller).to receive(:add_breadcrumb).with('Home', root_path(locale: 'en'))
-        expect(controller).to receive(:add_breadcrumb).with('Administration', Hyrax::Engine.routes.url_helpers.admin_path(locale: 'en'))
-        expect(controller).to receive(:add_breadcrumb).with('Workflow Roles', Hyrax::Engine.routes.url_helpers.admin_workflow_roles_path(locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('Administration', dashboard_path(locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('Workflow Roles', admin_workflow_roles_path(locale: 'en'))
         get :index
         expect(response).to be_success
         expect(assigns[:presenter]).to be_kind_of Hyrax::Admin::WorkflowRolesPresenter
-        expect(response).to render_template('layouts/admin')
+        expect(response).to render_template('dashboard')
       end
     end
 

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

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
 RSpec.describe Hyrax::Admin::WorkflowsController do
   describe "#index" do
     before do
-      expect(controller).to receive(:authorize!).with(:read, :admin_dashboard).and_return(true)
+      expect(controller).to receive(:authorize!).with(:review, :submissions).and_return(true)
     end
     it "is successful" do
       expect(controller).to receive(:add_breadcrumb).with('Home', root_path)
-      expect(controller).to receive(:add_breadcrumb).with('Administration', admin_path)
+      expect(controller).to receive(:add_breadcrumb).with('Administration', dashboard_path)
       expect(controller).to receive(:add_breadcrumb).with('Tasks', '#')
       expect(controller).to receive(:add_breadcrumb).with('Review Submissions', "/admin/workflows")
 

data/spec/controllers/hyrax/api/items_controller_spec.rb

@@ -1,13 +1,5 @@
-describe Hyrax::API::ItemsController, type: :controller do
+RSpec.describe Hyrax::API::ItemsController, type: :controller do
   let(:arkivo_actor) { double Hyrax::Arkivo::Actor }
-
-  before do
-    # Mock Arkivo Actor
-    allow(controller).to receive(:actor).and_return(arkivo_actor)
-    # Don't test characterization on these items; it breaks TravisCI and it's slow
-    allow(CharacterizeJob).to receive(:perform_later)
-  end
-
   let!(:user) { create(:user) }
   let!(:default_work) do
     GenericWork.create(title: ['Foo Bar']) do |gf|
@@ -16,11 +8,18 @@ describe Hyrax::API::ItemsController, type: :controller do
     end
   end
 
+  before do
+    # Mock Arkivo Actor
+    allow(controller).to receive(:actor).and_return(arkivo_actor)
+    # Don't test characterization on these items; it breaks TravisCI and it's slow
+    allow(CharacterizeJob).to receive(:perform_later)
+  end
+
   subject { response }
 
   context 'with an HTTP GET or HEAD' do
     let(:token) { user.arkivo_token }
-    let(:item) { FactoryBot.json(:post_item, token: token) }
+    let(:item) { FactoryGirl.json(:post_item, token: token) }
     let(:item_hash) { JSON.parse(item) }
 
     context 'with a missing token' do
@@ -69,6 +68,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with a resource not found in the repository' do
       let(:relation) { double }
+
       before do
         allow(Hyrax::WorkRelation).to receive(:new).and_return(relation)
         allow(relation).to receive(:find).with(default_work.id).and_raise(ActiveFedora::ObjectNotFoundError)
@@ -115,12 +115,14 @@ describe Hyrax::API::ItemsController, type: :controller do
       let(:deposited_file) { FileSet.where(label: item_hash['file']['filename']).take }
       let(:a_work) { build :generic_work, id: '123' }
       let!(:token) { user.arkivo_token }
-      let(:item) { FactoryBot.json(:post_item, token: token) }
+      let(:item) { FactoryGirl.json(:post_item, token: token) }
       let(:item_hash) { JSON.parse(item) }
 
       before do
         # Mock arkivo actor functions
         allow(arkivo_actor).to receive(:create_work_from_item).and_return(a_work)
+        # https://github.com/samvera/active_fedora/issues/1251
+        allow(a_work).to receive(:persisted?).and_return(true)
       end
 
       it "delegates creating the work to the actor" do
@@ -157,7 +159,7 @@ describe Hyrax::API::ItemsController, type: :controller do
       before { post :create, body: item, params: { format: :json } }
 
       let(:token) { 'unfamiliar_token' }
-      let(:item) { FactoryBot.json(:post_item, token: token) }
+      let(:item) { FactoryGirl.json(:post_item, token: token) }
 
       it "is unathorized" do
         expect(response).not_to be_success
@@ -168,7 +170,7 @@ describe Hyrax::API::ItemsController, type: :controller do
   end
 
   context 'with an HTTP PUT' do
-    let(:put_item) { FactoryBot.json(:put_item, token: token) }
+    let(:put_item) { FactoryGirl.json(:put_item, token: token) }
     let(:token) { user.arkivo_token }
     let(:gw) { build :generic_work, id: '123' }
     let(:relation) { double }
@@ -204,6 +206,7 @@ describe Hyrax::API::ItemsController, type: :controller do
     context 'with a valid item, matching token, authorized resource, but not Arkivo-deposited' do
       let(:non_arkivo_gw) { create :generic_work, id: 'abc123xyz', arkivo_checksum: nil }
       let(:relation) { double }
+
       before do
         # Mock user authorization
         allow(controller).to receive(:user).and_return(user)
@@ -226,6 +229,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with a valid item, matching token, missing resource' do
       let(:relation) { double }
+
       before do
         allow(Hyrax::WorkRelation).to receive(:new).and_return(relation)
         allow(relation).to receive(:find).with(gw.id) do
@@ -261,7 +265,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with a valid item and unfamiliar token' do
       let(:bad_token) { 'unfamiliar_token' }
-      let(:bad_token_item) { FactoryBot.json(:put_item, token: bad_token) }
+      let(:bad_token_item) { FactoryGirl.json(:put_item, token: bad_token) }
 
       before do
         request.env['RAW_POST_DATA'] = bad_token_item
@@ -277,6 +281,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with an invalid item' do
       let(:invalid_item) { { foo: 'bar' }.to_json }
+
       before do
         request.env['RAW_POST_DATA'] = invalid_item
         put :update, params: { id: gw.id, format: :json }
@@ -291,7 +296,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
   context 'with an HTTP DELETE' do
     let(:token) { user.arkivo_token }
-    let(:item) { FactoryBot.json(:post_item, token: token) }
+    let(:item) { FactoryGirl.json(:post_item, token: token) }
     let(:item_hash) { JSON.parse(item) }
     let(:gw) { build :generic_work, id: '123' }
     let(:relation) { double }
@@ -345,6 +350,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with a resource not deposited via Arkivo' do
       let(:non_arkivo_gw) { create :generic_work, id: 'xyz789abc', arkivo_checksum: nil }
+
       before do
         # Mock user authorization
         allow(controller).to receive(:user).and_return(user)
@@ -364,6 +370,7 @@ describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with a resource not found in the repository' do
       let(:not_found_id) { '409' }
+
       before do
         # Mock ActiveFedora
         allow(Hyrax::WorkRelation).to receive(:new).and_return(relation)

data/spec/controllers/hyrax/api/zotero_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Hyrax::API::ZoteroController, type: :controller do
+RSpec.describe Hyrax::API::ZoteroController, type: :controller do
   let(:user) { create(:user) }
 
   subject { response }
@@ -111,7 +111,7 @@ describe Hyrax::API::ZoteroController, type: :controller do
 
       specify do
         expect(subject).to have_http_status(302)
-        expect(subject).to redirect_to(routes.url_helpers.edit_profile_path(user, locale: 'en'))
+        expect(subject).to redirect_to(routes.url_helpers.edit_dashboard_profile_path(user, locale: 'en'))
         expect(flash[:alert]).to eq 'Malformed request from Zotero'
       end
     end
@@ -124,7 +124,7 @@ describe Hyrax::API::ZoteroController, type: :controller do
 
       specify do
         expect(subject).to have_http_status(302)
-        expect(subject).to redirect_to(routes.url_helpers.edit_profile_path(user, locale: 'en'))
+        expect(subject).to redirect_to(routes.url_helpers.edit_dashboard_profile_path(user, locale: 'en'))
         expect(flash[:alert]).to eq 'You have not yet connected to Zotero'
       end
     end
@@ -152,7 +152,7 @@ describe Hyrax::API::ZoteroController, type: :controller do
       specify do
         expect(subject).to have_http_status(302)
         expect(Hyrax::Arkivo::CreateSubscriptionJob).to have_received(:perform_later)
-        expect(subject).to redirect_to(routes.url_helpers.profile_path(user, locale: 'en'))
+        expect(subject).to redirect_to(routes.url_helpers.dashboard_profile_path(user, locale: 'en'))
         expect(flash[:alert]).to be_nil
         expect(flash[:notice]).to eq 'Successfully connected to Zotero!'
         expect(user.reload.zotero_userid).to eq zuserid

data/spec/controllers/hyrax/batch_edits_controller_spec.rb

@@ -1,5 +1,6 @@
-describe Hyrax::BatchEditsController, type: :controller do
+RSpec.describe Hyrax::BatchEditsController, type: :controller do
   let(:user) { create(:user) }
+
   before do
     sign_in user
     allow_any_instance_of(User).to receive(:groups).and_return([])
@@ -9,6 +10,7 @@ describe Hyrax::BatchEditsController, type: :controller do
   describe "#edit" do
     let(:one) { create(:work, creator: ["Fred"], title: ["abc"], language: ['en']) }
     let(:two) { create(:work, creator: ["Wilma"], title: ["abc2"], publisher: ['Rand McNally'], language: ['en'], resource_type: ['bar']) }
+
     before do
       controller.batch = [one.id, two.id]
       expect(controller).to receive(:can?).with(:edit, one.id).and_return(true)
@@ -16,8 +18,8 @@ describe Hyrax::BatchEditsController, type: :controller do
     end
 
     it "is successful" do
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.my.works'), Hyrax::Engine.routes.url_helpers.dashboard_works_path(locale: 'en'))
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.my.works'), Hyrax::Engine.routes.url_helpers.my_works_path(locale: 'en'))
       get :edit
       expect(response).to be_successful
       expect(assigns[:form].model.creator).to match_array ["Fred", "Wilma"]
@@ -36,6 +38,7 @@ describe Hyrax::BatchEditsController, type: :controller do
         gw.apply_depositor_metadata('mjg36')
       end
     end
+    let(:mycontroller) { "hyrax/my/works" }
 
     before do
       # TODO: why aren't we just submitting batch_document_ids[] as a parameter?
@@ -44,11 +47,9 @@ describe Hyrax::BatchEditsController, type: :controller do
       expect(controller).to receive(:can?).with(:edit, two.id).and_return(true)
     end
 
-    let(:mycontroller) { "hyrax/my/works" }
-
     it "is successful" do
       put :update, params: { update_type: "delete_all" }
-      expect(response).to redirect_to(dashboard_index_path(locale: 'en'))
+      expect(response).to redirect_to(dashboard_path(locale: 'en'))
       expect { GenericWork.find(one.id) }.to raise_error(Ldp::Gone)
       expect { GenericWork.find(two.id) }.to raise_error(Ldp::Gone)
     end

data/spec/controllers/hyrax/batch_uploads_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Hyrax::BatchUploadsController do
+RSpec.describe Hyrax::BatchUploadsController do
   let(:user) { create(:user) }
   let(:expected_types) do
     { '1' => 'Article',
@@ -32,10 +32,29 @@ describe Hyrax::BatchUploadsController do
       get :new
       expect(response).to be_successful
       expect(assigns[:form]).to be_kind_of Hyrax::Forms::BatchUploadForm
+      expect(response).to render_template('dashboard')
     end
   end
 
   describe "#create" do
+    context 'when feature is disabled' do
+      before do
+        allow(Flipflop).to receive(:batch_upload?).and_return(false)
+      end
+      it 'redirects with an error message' do
+        post :create, params: post_params.merge(format: :html)
+        expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.my_works_path(locale: 'en')
+        expect(flash[:alert]).to include('Feature disabled by administrator')
+      end
+      context 'when json is requested' do
+        it 'returns an HTTP 403' do
+          post :create, params: post_params.merge(format: :json)
+          expect(response).to have_http_status(403)
+          expect(response.body).to include('Feature disabled by administrator')
+        end
+      end
+    end
+
     context "with expected params" do
       it 'spawns a job, redirects to dashboard, and has an html_safe flash notice' do
         expect(BatchCreateJob).to receive(:perform_later)
@@ -46,7 +65,7 @@ describe Hyrax::BatchUploadsController do
                 expected_shared_params,
                 Hyrax::BatchCreateOperation)
         post :create, params: post_params
-        expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.dashboard_works_path(locale: 'en')
+        expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.my_works_path(locale: 'en')
         expect(flash[:notice]).to be_html_safe
         expect(flash[:notice]).to include("Your files are being processed")
       end
@@ -60,6 +79,7 @@ describe Hyrax::BatchUploadsController do
           batch_upload_item: batch_upload_item
         }
       end
+
       it 'is successful' do
         expect(BatchCreateJob).to receive(:perform_later)
           .with(user,
@@ -69,7 +89,7 @@ describe Hyrax::BatchUploadsController do
                 expected_shared_params,
                 a_kind_of(Hyrax::BatchCreateOperation))
         post :create, params: post_params
-        expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.dashboard_works_path(locale: 'en')
+        expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.my_works_path(locale: 'en')
         expect(flash[:notice]).to include("Your files are being processed")
       end
     end
@@ -95,12 +115,14 @@ describe Hyrax::BatchUploadsController do
 
   describe "#attributes_for_actor" do
     subject { controller.send(:attributes_for_actor) }
+
     before do
       controller.params = post_params
     end
     let(:expected_shared_params) do
       ActionController::Parameters.new(keyword: [], visibility: 'open').permit!
     end
+
     it "excludes uploaded_files and title" do
       expect(subject).not_to include('title', :title, 'uploaded_files', :uploaded_files)
       expect(subject).to eq expected_shared_params

data/spec/controllers/hyrax/citations_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Hyrax::CitationsController do
+RSpec.describe Hyrax::CitationsController do
   describe "#work" do
     let(:user) { create(:user) }
     let(:work) { create(:work, user: user) }
@@ -11,7 +11,7 @@ describe Hyrax::CitationsController do
       end
 
       it "is successful" do
-        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :work, params: { id: work }
         expect(response).to be_successful
         expect(assigns(:presenter)).to be_kind_of Hyrax::WorkShowPresenter
@@ -38,7 +38,7 @@ describe Hyrax::CitationsController do
       end
 
       it "is successful" do
-        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :file, params: { id: file_set }
         expect(response).to be_successful
         expect(assigns(:presenter)).to be_kind_of Hyrax::FileSetPresenter

data/spec/controllers/hyrax/collections_controller_spec.rb

@@ -1,9 +1,7 @@
-describe Hyrax::CollectionsController do
+RSpec.describe Hyrax::CollectionsController do
   routes { Hyrax::Engine.routes }
-  before { allow_any_instance_of(User).to receive(:groups).and_return([]) }
-
   let(:user)  { create(:user) }
-  let(:other) { create(:user) }
+  let(:other) { build(:user) }
 
   let(:collection) do
     create(:public_collection, title: ["My collection"],
@@ -20,160 +18,7 @@ describe Hyrax::CollectionsController do
     { title: ['My First Collection'], description: ["The Description\r\n\r\nand more"] }
   end
 
-  describe '#new' do
-    before { sign_in user }
-
-    it 'assigns @collection' do
-      get :new
-      expect(assigns(:collection)).to be_kind_of(Collection)
-    end
-  end
-
-  describe '#create' do
-    before { sign_in user }
-
-    it "creates a Collection" do
-      expect do
-        post :create, params: {
-          collection: collection_attrs.merge(visibility: 'open')
-        }
-      end.to change { Collection.count }.by(1)
-      expect(assigns[:collection].visibility).to eq 'open'
-    end
-
-    it "removes blank strings from params before creating Collection" do
-      expect do
-        post :create, params: {
-          collection: collection_attrs.merge(creator: [''])
-        }
-      end.to change { Collection.count }.by(1)
-      expect(assigns[:collection].title).to eq ["My First Collection"]
-      expect(assigns[:collection].creator).to eq []
-    end
-
-    context "with files I can access" do
-      it "creates a collection using only the accessible files" do
-        expect do
-          post :create, params: {
-            collection: collection_attrs,
-            batch_document_ids: [asset1.id, asset2.id, unowned_asset.id]
-          }
-        end.to change { Collection.count }.by(1)
-        collection = assigns(:collection)
-        expect(collection.member_objects).to match_array [asset1, asset2]
-      end
-
-      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],
-          collection: collection_attrs
-        }
-
-        expect(assigns[:collection].member_objects).to eq [asset1]
-        asset_results = ActiveFedora::SolrService.instance.conn.get "select", params: { fq: ["id:\"#{asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
-        expect(asset_results["response"]["numFound"]).to eq 1
-        doc = asset_results["response"]["docs"].first
-        expect(doc["id"]).to eq asset1.id
-      end
-    end
-  end
-
-  describe '#index' do
-    let!(:collection1) { create(:collection, :public, title: ['Beta']) }
-    let!(:collection2) { create(:collection, :public, title: ['Alpha']) }
-    let!(:generic_work) { create(:generic_work, :public) }
-
-    it 'shows a list of collections sorted alphabetically' do
-      get :index
-      expect(response).to be_successful
-      expect(assigns[:document_list].map(&:id)).not_to include generic_work.id
-      expect(assigns[:document_list].map(&:id)).to match_array [collection2.id, collection1.id]
-    end
-  end
-
-  describe "#update" do
-    before { sign_in user }
-
-    context 'collection members' do
-      before do
-        [asset1, asset2].each do |asset|
-          asset.member_of_collections << collection
-          asset.save!
-        end
-      end
-
-      it "adds members to the collection" do
-        expect do
-          put :update, params: { id: collection,
-                                 collection: { members: 'add' },
-                                 batch_document_ids: [asset3.id] }
-        end.to change { collection.reload.member_objects.size }.by(1)
-        expect(response).to redirect_to routes.url_helpers.collection_path(collection, locale: 'en')
-        expect(assigns[:collection].member_objects).to match_array [asset1, asset2, asset3]
-      end
-
-      it "removes members from the collection" do
-        # TODO: Using size until count is fixed https://github.com/projecthydra-labs/activefedora-aggregation/issues/78
-        expect do
-          put :update, params: { id: collection,
-                                 collection: { members: 'remove' },
-                                 batch_document_ids: [asset2] }
-        end.to change { asset2.reload.member_of_collections.size }.by(-1)
-        expect(assigns[:collection].member_objects).to match_array [asset1]
-      end
-    end
-
-    context 'when moving members between collections' 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
-      before do
-        [asset1, asset2, asset3].each do |asset|
-          asset.member_of_collections << collection
-          asset.save
-        end
-      end
-
-      it 'moves the members' do
-        put :update,
-            params: {
-              id: collection,
-              collection: { members: 'move' },
-              destination_collection_id: collection2,
-              batch_document_ids: [asset2, asset3]
-            }
-        expect(collection.reload.member_objects).to eq [asset1]
-        expect(collection2.reload.member_objects).to match_array [asset2, asset3]
-      end
-    end
-
-    context "updating a collections metadata" do
-      it "saves the metadata" do
-        put :update, params: { id: collection, collection: { creator: ['Emily'] } }
-        collection.reload
-        expect(collection.creator).to eq ['Emily']
-      end
-
-      it "removes blank strings from params before updating Collection metadata" do
-        put :update, params: {
-          id: collection,
-          collection: {
-            title: ["My Next Collection "],
-            creator: [""]
-          }
-        }
-        expect(assigns[:collection].title).to eq ["My Next Collection "]
-        expect(assigns[:collection].creator).to eq []
-      end
-    end
-  end
-
-  describe "#show" do
+  describe "#show" do # public landing page
     context "when signed in" do
       before do
         sign_in user
@@ -184,7 +29,7 @@ describe Hyrax::CollectionsController do
       end
 
       it "returns the collection and its members" do
-        expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
+        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
@@ -212,7 +57,7 @@ describe Hyrax::CollectionsController do
 
       context "without a referer" do
         it "sets breadcrumbs" do
-          expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
+          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
         end
@@ -224,8 +69,8 @@ describe Hyrax::CollectionsController do
         end
 
         it "sets breadcrumbs" do
-          expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
-          expect(controller).to receive(:add_breadcrumb).with('My Collections', Hyrax::Engine.routes.url_helpers.dashboard_collections_path(locale: 'en'))
+          expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
+          expect(controller).to receive(:add_breadcrumb).with('Your Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
           expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'))
           get :show, params: { id: collection }
           expect(response).to be_successful
@@ -240,71 +85,4 @@ describe Hyrax::CollectionsController do
       end
     end
   end
-
-  describe "#delete" do
-    before { sign_in user }
-    context "when it succeeds" do
-      it "redirects to My Collections" do
-        delete :destroy, params: { id: collection }
-        expect(response).to have_http_status(:found)
-        expect(response).to redirect_to(Hyrax::Engine.routes.url_helpers.dashboard_collections_path(locale: 'en'))
-        expect(flash[:notice]).to eq "Collection #{collection.id} was successfully deleted"
-      end
-
-      it "returns json" do
-        delete :destroy, params: { format: :json, id: collection }
-        expect(response).to have_http_status(:no_content)
-      end
-    end
-
-    context "when an error occurs" do
-      before do
-        allow_any_instance_of(Collection).to receive(:destroy).and_return(nil)
-      end
-      it "renders the edit view" do
-        delete :destroy, params: { id: collection }
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(response).to render_template(:edit)
-        expect(flash[:notice]).to eq "Collection #{collection.id} could not be deleted"
-      end
-
-      it "returns json" do
-        delete :destroy, params: { format: :json, id: collection }
-        expect(response).to have_http_status(:unprocessable_entity)
-      end
-    end
-  end
-
-  describe "#edit" do
-    before { sign_in user }
-
-    it "is successful" do
-      get :edit, params: { id: collection }
-      expect(response).to be_success
-      expect(assigns[:form]).to be_instance_of Hyrax::Forms::CollectionForm
-      expect(flash[:notice]).to be_nil
-    end
-
-    context "without a referer" do
-      it "sets breadcrumbs" do
-        expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
-        get :edit, params: { id: collection }
-        expect(response).to be_successful
-      end
-    end
-
-    context "with a referer" do
-      before do
-        request.env['HTTP_REFERER'] = 'http://test.host/foo'
-      end
-
-      it "sets breadcrumbs" do
-        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_index_path(locale: 'en'))
-        expect(controller).to receive(:add_breadcrumb).with('My Collections', Hyrax::Engine.routes.url_helpers.dashboard_collections_path(locale: 'en'))
-        expect(controller).to receive(:add_breadcrumb).with(I18n.t("hyrax.collection.browse_view"), collection_path(collection.id, locale: 'en'))
-        get :edit, params: { id: collection }
-        expect(response).to be_successful
-      end
-    end
-  end
 end