hyrax 1.1.1 → 2.0.0.beta1

data/spec/controllers/hyrax/homepage_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Hyrax::HomepageController, type: :controller do
+RSpec.describe Hyrax::HomepageController, type: :controller do
   routes { Hyrax::Engine.routes }
 
   describe "#index" do
@@ -6,12 +6,10 @@ describe Hyrax::HomepageController, type: :controller do
 
     before do
       sign_in user
-      2.times { create(:work, user: user) }
     end
 
     context 'with existing featured researcher' do
-      let!(:bilbo) { ContentBlock.create!(name: ContentBlock::RESEARCHER, value: 'Biblo Baggins', created_at: 2.hours.ago) }
-      let!(:frodo) { ContentBlock.create!(name: ContentBlock::RESEARCHER, value: 'Frodo Baggins', created_at: Time.zone.now) }
+      let!(:frodo) { ContentBlock.create!(name: ContentBlock::NAME_REGISTRY[:researcher], value: 'Frodo Baggins', created_at: Time.zone.now) }
 
       it 'finds the featured researcher' do
         get :index
@@ -77,35 +75,30 @@ describe Hyrax::HomepageController, type: :controller do
       end
     end
 
-    context "with admin sets enabled" do
-      let(:admin_set_doc) do
-        {
-          "system_create_dtsi" => "2016-09-12T19:36:51Z",
-          "has_model_ssim" => ["AdminSet"],
-          "id" => "w3763695z",
-          "title_tesim" => ["A completely unique name"],
-          "description_tesim" => ["A substantial description"],
-          "thumbnail_path_ss" => "/assets/admin-set-thumb.png",
-          "read_access_group_ssim" => ["public"]
-        }
+    context "with collections" do
+      let(:presenter) { double }
+      let(:repository) { double }
+      let(:collection_results) { double(documents: ['collection results']) }
+
+      before do
+        allow(controller).to receive(:repository).and_return(repository)
+        allow(controller).to receive(:search_results).and_return([nil, ['recent document']])
+        allow(controller.repository).to receive(:search).with(an_instance_of(Hyrax::CollectionSearchBuilder))
+                                                        .and_return(collection_results)
       end
 
-      it "sets the admin_sets" do
-        ActiveFedora::SolrService.add(admin_set_doc, commit: true)
+      it "initializes the presenter with ability and a list of collections" do
+        expect(Hyrax::HomepagePresenter).to receive(:new).with(Ability,
+                                                               ["collection results"])
+                                                         .and_return(presenter)
         get :index
         expect(response).to be_success
-        expect(assigns(:admin_sets).map(&:id)).to eq [admin_set_doc["id"]]
+        expect(assigns(:presenter)).to eq presenter
       end
     end
 
-    it "sets the presenter" do
-      get :index
-      expect(response).to be_success
-      expect(assigns(:presenter)).to be_kind_of Hyrax::HomepagePresenter
-    end
-
     context "with featured works" do
-      let!(:my_work) { FactoryBot.create(:work, user: user) }
+      let!(:my_work) { FactoryGirl.create(:work, user: user) }
 
       before do
         FeaturedWork.create!(work_id: my_work.id)
@@ -130,7 +123,7 @@ describe Hyrax::HomepageController, type: :controller do
     context "without solr" do
       before do
         allow(controller).to receive(:repository).and_return(instance_double(Blacklight::Solr::Repository))
-        allow(controller.repository).to receive(:search).and_raise Blacklight::Exceptions::ECONNREFUSED
+        allow(controller.repository).to receive(:search).and_raise Blacklight::Exceptions::InvalidRequest
       end
 
       it "errors gracefully" do

data/spec/controllers/hyrax/leases_controller_spec.rb

@@ -0,0 +1,106 @@
+RSpec.describe Hyrax::LeasesController do
+  let(:user) { create(:user) }
+  let(:a_work) { create(:generic_work, user: user) }
+  let(:not_my_work) { create(:generic_work) }
+
+  before { sign_in user }
+
+  describe '#index' do
+    context 'when I am NOT a repository manager' do
+      it 'redirects' do
+        get :index
+        expect(response).to redirect_to root_path
+      end
+    end
+    context 'when I am a repository manager' do
+      let(:user) { create(:user, groups: ['admin']) }
+
+      it 'shows me the page' do
+        get :index
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe '#edit' do
+    context 'when I do not have edit permissions for the object' do
+      it 'redirects' do
+        get :edit, params: { id: not_my_work }
+        expect(response.status).to eq 302
+        expect(flash[:alert]).to eq 'You are not authorized to access this page.'
+      end
+    end
+    context 'when I have permission to edit the object' do
+      it 'shows me the page' do
+        get :edit, params: { id: a_work }
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe '#destroy' do
+    context 'when I do not have edit permissions for the object' do
+      it 'denies access' do
+        get :destroy, params: { id: not_my_work }
+        expect(response).to fail_redirect_and_flash(root_path, 'You are not authorized to access this page.')
+      end
+    end
+
+    context 'when I have permission to edit the object' do
+      let(:actor) { double('lease actor') }
+
+      before do
+        allow(Hyrax::Actors::LeaseActor).to receive(:new).with(a_work).and_return(actor)
+      end
+
+      context 'that has no files' do
+        it 'deactivates the lease and redirects' do
+          expect(actor).to receive(:destroy)
+          get :destroy, params: { id: a_work }
+          expect(response).to redirect_to edit_lease_path(a_work)
+        end
+      end
+
+      context 'with files' do
+        before do
+          a_work.members << create(:file_set)
+          a_work.save!
+        end
+
+        it 'deactivates the lease and redirects' do
+          expect(actor).to receive(:destroy)
+          get :destroy, params: { id: a_work }
+          expect(response).to redirect_to confirm_permission_path(a_work)
+        end
+      end
+    end
+  end
+
+  describe '#update' do
+    context 'when I have permission to edit the object' do
+      let(:file_set) { create(:file_set, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
+      let(:expiration_date) { Time.zone.today + 2 }
+
+      before do
+        a_work.members << file_set
+        a_work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        a_work.visibility_during_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        a_work.visibility_after_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        a_work.lease_expiration_date = expiration_date.to_s
+        a_work.lease.save(validate: false)
+        a_work.save(validate: false)
+      end
+
+      context 'with an expired lease' do
+        let(:expiration_date) { Time.zone.today - 2 }
+
+        it 'deactivates lease, update the visibility and redirect' do
+          patch :update, params: { batch_document_ids: [a_work.id], leases: { '0' => { copy_visibility: a_work.id } } }
+          expect(a_work.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          expect(file_set.reload.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          expect(response).to redirect_to leases_path
+        end
+      end
+    end
+  end
+end

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

@@ -1,29 +1,36 @@
-describe Hyrax::My::CollectionsController, type: :controller do
+RSpec.describe Hyrax::My::CollectionsController, type: :controller do
   describe "logged in user" do
     describe "#index" do
-      let(:user)  { create(:user) }
-      let(:other) { create(:user) }
+      let(:user) { create(:user) }
+      let(:response) { instance_double(Blacklight::Solr::Response, response: { 'numFound' => 3 }) }
+      let(:doc_list) { [double(id: 123), double(id: 456)] }
+
       before do
         sign_in user
-        build(:public_collection, user: user, id: 1).update_index
-        build(:public_collection, user: user, id: 2).update_index
-        build(:public_collection, user: user, id: 3).update_index
-        unrelated_collection.update_index
       end
-      let(:unrelated_collection) { build(:public_collection, user: other, id: 4) }
 
-      it "shows only collections I own and paginates the results" do
+      it "shows the search results and sets breadcrumbs" do
+        expect(controller).to receive(:search_results).with(ActionController::Parameters).and_return([response, doc_list])
+
+        expect(controller).to receive(:add_breadcrumb).with('Home', root_path(locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('Administration', dashboard_path(locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('Collections', my_collections_path(locale: 'en'))
+
         get :index, params: { per_page: 2 }
         expect(assigns[:document_list].length).to eq 2
-        expect(assigns[:document_list].map(&:id)).not_to include(unrelated_collection)
-        get :index, params: { per_page: 2, page: 2 }
-        expect(assigns[:document_list].length).to be >= 1
       end
     end
+  end
 
-    describe "#search_facet_path" do
-      subject { controller.send(:search_facet_path, id: 'keyword_sim') }
-      it { is_expected.to eq "/dashboard/collections/facet/keyword_sim?locale=en" }
-    end
+  describe "#search_facet_path" do
+    subject { controller.send(:search_facet_path, id: 'keyword_sim') }
+
+    it { is_expected.to eq "/dashboard/my/collections/facet/keyword_sim?locale=en" }
+  end
+
+  describe "#search_builder_class" do
+    subject { controller.search_builder_class }
+
+    it { is_expected.to eq Hyrax::My::CollectionsSearchBuilder }
   end
 end

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

@@ -1,12 +1,11 @@
-describe Hyrax::My::HighlightsController, type: :controller do
+RSpec.describe Hyrax::My::HighlightsController, type: :controller do
   describe "logged in user" do
     let(:user) { create(:user) }
+
     before { sign_in user }
 
     describe "#index" do
       before do
-        GenericWork.destroy_all
-        Collection.destroy_all
         user.trophies.create(work_id: highlighted_work.id)
         other_user.trophies.create(work_id: unrelated_highlighted_work.id)
       end

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

@@ -1,4 +1,4 @@
-describe Hyrax::My::SharesController, type: :controller do
+RSpec.describe Hyrax::My::SharesController, type: :controller do
   describe "logged in user" do
     let(:user) { create(:user) }
 
@@ -41,6 +41,7 @@ describe Hyrax::My::SharesController, type: :controller do
 
   describe "#search_facet_path" do
     subject { controller.send(:search_facet_path, id: 'keyword_sim') }
+
     it { is_expected.to eq "/dashboard/shares/facet/keyword_sim?locale=en" }
   end
 end

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

@@ -1,48 +1,51 @@
-
-describe Hyrax::My::WorksController, type: :controller do
+RSpec.describe Hyrax::My::WorksController, type: :controller do
   let(:user) { create(:user) }
 
   before { sign_in user }
 
-  context "with multiple pages of works" do
-    before { 3.times { create(:work, user: user) } }
-    it "paginates" do
+  describe "#index" do
+    let(:response) { instance_double(Blacklight::Solr::Response, response: { 'numFound' => 3 }) }
+    let(:doc_list) { [double(id: 123), double(id: 456)] }
+    let(:my_collection) { instance_double(SolrDocument) }
+    let(:collection_service) { instance_double(Hyrax::CollectionsService) }
+
+    before do
+      allow(Hyrax::CollectionsService).to receive(:new).and_return(collection_service)
+    end
+    it "shows search results and breadcrumbs" do
+      expect(controller).to receive(:search_results).with(ActionController::Parameters).and_return([response, doc_list])
+      expect(controller).to receive(:add_breadcrumb).with('Home', root_path(locale: 'en'))
+      expect(controller).to receive(:add_breadcrumb).with('Administration', dashboard_path(locale: 'en'))
+      expect(controller).to receive(:add_breadcrumb).with('Works', my_works_path(locale: 'en'))
+      expect(collection_service).to receive(:search_results).with(:edit).and_return([my_collection])
       get :index, params: { per_page: 2 }
       expect(assigns[:document_list].length).to eq 2
-      get :index, params: { per_page: 2, page: 2 }
-      expect(assigns[:document_list].length).to be >= 1
+      expect(assigns[:user_collections]).to contain_exactly(my_collection)
     end
   end
 
-  context 'with different types of records' do
-    let(:someone_else) { create(:user) }
-
-    let!(:my_collection)    { create(:public_collection, user: user) }
-    let!(:other_collection) { create(:public_collection) }
-    let!(:my_work)          { create(:work, user: user) }
-    let!(:shared_work)      { create(:work, edit_users: [user.user_key], user: someone_else) }
-    let!(:unrelated_work)   { create(:public_work, user: someone_else) }
-    let!(:my_file)          { create(:file_set, user: user) }
-    let!(:wrong_type)       { ActiveFedora::Base.create! }
-
-    it 'shows only the correct records' do
-      get :index
-      expect(response).to be_successful
-      expect(response).to render_template :index
-      expect(assigns[:document_list].map(&:id)).to contain_exactly(my_work.id)
-      expect(assigns[:user_collections].map(&:id)).to contain_exactly(my_collection.id)
-    end
+  describe "#search_builder_class" do
+    subject { controller.search_builder_class }
+
+    it { is_expected.to eq Hyrax::My::WorksSearchBuilder }
   end
 
-  context "when add_files_to_collection is provided" do
-    it "sets add_files_to_collection ivar" do
-      get :index, params: { add_files_to_collection: '12345' }
-      expect(assigns(:add_files_to_collection)).to eql('12345')
+  describe "#collections_service" do
+    subject { controller.send(:collections_service) }
+
+    it { is_expected.to be_an_instance_of Hyrax::CollectionsService }
+  end
+
+  context "when add_works_to_collection is provided" do
+    it "sets add_works_to_collection ivar" do
+      get :index, params: { add_works_to_collection: '12345' }
+      expect(assigns(:add_works_to_collection)).to eql('12345')
     end
   end
 
   describe "#search_facet_path" do
     subject { controller.send(:search_facet_path, id: 'keyword_sim') }
-    it { is_expected.to eq "/dashboard/works/facet/keyword_sim?locale=en" }
+
+    it { is_expected.to eq "/dashboard/my/works/facet/keyword_sim?locale=en" }
   end
 end

data/spec/controllers/hyrax/{mailbox_controller_spec.rb → notifications_controller_spec.rb}

@@ -1,8 +1,8 @@
-describe Hyrax::MailboxController, type: :controller do
+RSpec.describe Hyrax::NotificationsController, type: :controller do
   let(:mock_box) { {} }
 
   before do
-    allow_any_instance_of(described_class).to receive(:authenticate_user!).and_return(true)
+    allow(controller).to receive(:authenticate_user!).and_return(true)
     allow(UserMailbox).to receive(:new).and_return(mock_box)
   end
 

data/spec/controllers/hyrax/operations_controller_spec.rb

@@ -1,11 +1,10 @@
-require 'spec_helper'
-
-describe Hyrax::OperationsController do
+RSpec.describe Hyrax::OperationsController do
   routes { Hyrax::Engine.routes }
   let(:parent) { create(:operation, :pending, user: user) }
   let!(:child1) { create(:operation, :failing, parent: parent, user: user) }
   let!(:child2) { create(:operation, :pending, parent: parent, user: user) }
   let(:user) { create(:user) }
+
   before do
     sign_in user
   end

data/spec/controllers/hyrax/pages_controller_spec.rb

@@ -1,23 +1,111 @@
-describe Hyrax::PagesController, type: :controller do
-  let(:page_name) { "about_page" }
-  context "content exists" do
-    describe "GET #show" do
-      let(:page) { ContentBlock.create!(name: page_name, value: "foo bar") }
-
-      it "updates the node" do
-        get :show, params: { id: page.name }
+RSpec.describe Hyrax::PagesController, type: :controller do
+  let(:user) { FactoryGirl.create(:user) }
+
+  before do
+    sign_in user
+  end
+
+  describe "GET #show" do
+    context "when content exists" do
+      let!(:page) do
+        ContentBlock.about_page = "foo bar"
+        ContentBlock.for(:about)
+      end
+
+      it "updates the node and renders homepage layout" do
+        get :show, params: { key: 'about' }
+        expect(response).to render_template('layouts/homepage')
         expect(response).to be_successful
         expect(assigns[:page]).to eq page
       end
     end
-  end
-  context "content does not exist" do
-    describe "GET #show" do
+    context "when content does not exist" do
       it "creates the node" do
-        get :show, params: { id: "about_page" }
+        get :show, params: { key: 'about' }
         expect(response).to be_successful
         expect(assigns[:page]).not_to be_nil
       end
     end
+    context "with an id that lacks a route" do
+      it "raises an ActionController exception" do
+        expect { get :show, params: { key: 'destroy_all' } }.to raise_error(ActionController::UrlGenerationError)
+      end
+    end
+  end
+  context 'when editing pages' do
+    let!(:about_page) do
+      FactoryGirl.create(:content_block, name: 'about_page')
+    end
+    let!(:help_page) do
+      FactoryGirl.create(:content_block, name: 'help_page')
+    end
+    let!(:agreement_page) do
+      FactoryGirl.create(:content_block, name: 'agreement_page')
+    end
+    let!(:terms_page) do
+      FactoryGirl.create(:content_block, name: 'terms_page')
+    end
+
+    context 'with an unprivileged user' do
+      describe "GET #edit" do
+        it "denies the request" do
+          get :edit
+          expect(response).to have_http_status(401)
+        end
+      end
+
+      describe "PATCH #update" do
+        it "denies the request" do
+          patch :update, params: { id: 1 }
+          expect(response).to have_http_status(401)
+        end
+      end
+    end
+
+    context 'with an administrator' do
+      let(:user) { FactoryGirl.create(:admin) }
+
+      describe "GET #edit" do
+        it "renders breadcrumbs and dashboard layout" do
+          expect(controller).to receive(:add_breadcrumb).with('Home', root_path)
+          expect(controller).to receive(:add_breadcrumb).with('Administration', dashboard_path)
+          expect(controller).to receive(:add_breadcrumb).with('Configuration', '#')
+          expect(controller).to receive(:add_breadcrumb).with('Pages', edit_pages_path)
+          get :edit
+          expect(response).to have_http_status(200)
+          expect(response).to render_template('layouts/dashboard')
+        end
+      end
+
+      describe "PATCH #update" do
+        it "updates the about page" do
+          patch :update, params: { id: about_page.id, content_block: { about: 'This is a new page about us!' } }
+          expect(response).to redirect_to(edit_pages_path)
+          expect(flash[:notice]).to include 'Pages updated'
+          expect(ContentBlock.for(:about).value).to eq "This is a new page about us!"
+        end
+
+        it "updates the help page" do
+          patch :update, params: { id: help_page.id, content_block: { help: 'This page will provide more of the help you need.' } }
+          expect(response).to redirect_to(edit_pages_path)
+          expect(flash[:notice]).to include 'Pages updated'
+          expect(ContentBlock.for(:help).value).to eq 'This page will provide more of the help you need.'
+        end
+
+        it "updates the agreement page" do
+          patch :update, params: { id: agreement_page.id, content_block: { agreement: 'Here is the deposit agreement' } }
+          expect(response).to redirect_to(edit_pages_path)
+          expect(flash[:notice]).to include 'Pages updated'
+          expect(ContentBlock.for(:agreement).value).to eq 'Here is the deposit agreement'
+        end
+
+        it "updates the terms page" do
+          patch :update, params: { id: terms_page.id, content_block: { terms: 'Terms of Use are good' } }
+          expect(response).to redirect_to(edit_pages_path)
+          expect(flash[:notice]).to include 'Pages updated'
+          expect(ContentBlock.for(:terms).value).to eq 'Terms of Use are good'
+        end
+      end
+    end
   end
 end