hyrax 1.1.1 → 2.0.0.beta1

data/spec/controllers/hyrax/permissions_controller_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
-
-describe Hyrax::PermissionsController do
+RSpec.describe Hyrax::PermissionsController do
   let(:user) { create(:user) }
+
   before do
     sign_in user
     allow(ActiveFedora::Base).to receive(:find).with(work.id).and_return(work)
@@ -10,6 +9,11 @@ describe Hyrax::PermissionsController do
   describe '#confirm' do
     let(:work) { build(:generic_work, user: user, id: 'abc') }
 
+    before do
+      # https://github.com/samvera/active_fedora/issues/1251
+      allow(work).to receive(:persisted?).and_return(true)
+    end
+
     it 'draws the page' do
       get :confirm, params: { id: work }
       expect(response).to be_success

data/spec/controllers/hyrax/resource_sync_controller_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::ResourceSyncController, :no_clean do
+RSpec.describe Hyrax::ResourceSyncController do
   before do
     Rails.cache.clear
   end

data/spec/controllers/hyrax/single_use_links_controller_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Hyrax::SingleUseLinksController, type: :controller do
+RSpec.describe Hyrax::SingleUseLinksController, type: :controller do
   routes { Hyrax::Engine.routes }
 
   let(:user) { create(:user) }
@@ -8,6 +6,7 @@ describe Hyrax::SingleUseLinksController, type: :controller do
 
   describe "::show_presenter" do
     subject { described_class }
+
     its(:show_presenter) { is_expected.to eq(Hyrax::SingleUseLinkPresenter) }
   end
 
@@ -42,12 +41,14 @@ describe Hyrax::SingleUseLinksController, type: :controller do
       describe "viewing existing links" do
         before { get :index, params: { id: file } }
         subject { response }
+
         it { is_expected.to be_success }
       end
     end
 
     context "DELETE destroy" do
       let!(:link) { create(:download_link) }
+
       it "deletes the link" do
         expect { delete :destroy, params: { id: file, link_id: link } }.to change { SingleUseLink.count }.by(-1)
         expect(response).to be_success

data/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Hyrax::SingleUseLinksViewerController do
+RSpec.describe Hyrax::SingleUseLinksViewerController do
   routes { Hyrax::Engine.routes }
   let(:file) do
     FileSet.create! do |lfile|

data/spec/controllers/hyrax/static_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Hyrax::StaticController, type: :controller do
+RSpec.describe Hyrax::StaticController, type: :controller do
   routes { Hyrax::Engine.routes }
   describe "#mendeley" do
     it "renders page" do

data/spec/controllers/hyrax/stats_controller_spec.rb

@@ -1,13 +1,14 @@
-describe Hyrax::StatsController do
+RSpec.describe Hyrax::StatsController do
   let(:user) { create(:user) }
+  let(:usage) { double }
+
   before do
     allow_any_instance_of(User).to receive(:groups).and_return([])
   end
   routes { Hyrax::Engine.routes }
-  let(:usage) { double }
-
   describe '#file' do
     let(:file_set) { create(:file_set, user: user) }
+
     context 'when user has access to file' do
       before do
         sign_in user
@@ -16,8 +17,8 @@ describe Hyrax::StatsController do
 
       it 'renders the stats view' do
         expect(Hyrax::FileUsage).to receive(:new).with(file_set.id).and_return(usage)
-        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'))
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.file_set.browse_view'), Rails.application.routes.url_helpers.hyrax_file_set_path(file_set, locale: 'en'))
         get :file, params: { id: file_set }
         expect(response).to be_success
@@ -37,6 +38,7 @@ describe Hyrax::StatsController do
 
     context 'when user lacks access to file' do
       let(:file_set) { create(:file_set) }
+
       before do
         sign_in user
       end
@@ -50,6 +52,7 @@ describe Hyrax::StatsController do
 
   describe 'work' do
     let(:work) { create(:generic_work, user: user) }
+
     before do
       sign_in user
       request.env['HTTP_REFERER'] = 'http://test.host/foo'
@@ -57,8 +60,8 @@ describe Hyrax::StatsController do
 
     it 'renders the stats view' do
       expect(Hyrax::WorkUsage).to receive(:new).with(work.id).and_return(usage)
-      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_index_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'))
+      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('Test title', main_app.hyrax_generic_work_path(work, locale: 'en'))
       get :work, params: { id: work }
       expect(response).to be_success

data/spec/controllers/hyrax/transfers_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Hyrax::TransfersController, type: :controller do
+RSpec.describe Hyrax::TransfersController, type: :controller do
   describe "without a signed in user" do
     describe "#index" do
       it "redirects to sign in" do
@@ -18,46 +18,20 @@ describe Hyrax::TransfersController, type: :controller do
     end
 
     describe "#index" do
-      let!(:incoming_work) do
-        GenericWork.new(title: ['incoming title']) do |w|
-          w.apply_depositor_metadata(another_user.user_key)
-          w.save!
-          w.request_transfer_to(user)
-        end
-      end
-      let!(:outgoing_work) do
-        GenericWork.new(title: ['outgoing title']) do |w|
-          w.apply_depositor_metadata(user.user_key)
-          w.save!
-          w.request_transfer_to(another_user)
-        end
-      end
-
       it "is successful" do
+        expect(controller).to receive(:add_breadcrumb).exactly(3).times
         get :index
         expect(response).to be_success
-        expect(assigns[:incoming].first).to be_kind_of ProxyDepositRequest
-        expect(assigns[:incoming].first.work_id).to eq(incoming_work.id)
-        expect(assigns[:outgoing].first).to be_kind_of ProxyDepositRequest
-        expect(assigns[:outgoing].first.work_id).to eq(outgoing_work.id)
-      end
-
-      describe "When the incoming request is for a deleted work" do
-        before do
-          incoming_work.destroy
-        end
-        it "does not show that work" do
-          get :index
-          expect(response).to be_success
-          expect(assigns[:incoming]).to be_empty
-        end
+        expect(assigns[:presenter]).to be_instance_of Hyrax::TransfersPresenter
       end
     end
 
     describe "#new" do
       let(:work) { create(:work, user: user) }
+
       context 'when user is the depositor' do
         it "is successful" do
+          expect(controller).to receive(:add_breadcrumb).exactly(3).times
           sign_in user
           get :new, params: { id: work.id }
           expect(response).to be_success
@@ -70,6 +44,7 @@ describe Hyrax::TransfersController, type: :controller do
 
     describe "#create" do
       let(:work) { create(:work, user: user) }
+
       it "is successful" do
         expect do
           post :create, params: {
@@ -112,6 +87,7 @@ describe Hyrax::TransfersController, type: :controller do
             w.request_transfer_to(user)
           end
         end
+
         it "is successful when retaining access rights" do
           put :accept, params: { id: user.proxy_deposit_requests.first }
           expect(response).to redirect_to routes.url_helpers.transfers_path(locale: 'en')
@@ -143,6 +119,7 @@ describe Hyrax::TransfersController, type: :controller do
             w.request_transfer_to(another_user)
           end
         end
+
         it "does not allow me" do
           put :accept, params: { id: another_user.proxy_deposit_requests.first }
           expect(response).to redirect_to root_path
@@ -160,6 +137,7 @@ describe Hyrax::TransfersController, type: :controller do
             w.request_transfer_to(user)
           end
         end
+
         it "is successful" do
           put :reject, params: { id: user.proxy_deposit_requests.first }
           expect(response).to redirect_to routes.url_helpers.transfers_path(locale: 'en')
@@ -176,6 +154,7 @@ describe Hyrax::TransfersController, type: :controller do
             w.request_transfer_to(another_user)
           end
         end
+
         it "does not allow me" do
           put :reject, params: { id: another_user.proxy_deposit_requests.first }
           expect(response).to redirect_to root_path
@@ -193,6 +172,7 @@ describe Hyrax::TransfersController, type: :controller do
             w.request_transfer_to(another_user)
           end
         end
+
         it "is successful" do
           delete :destroy, params: { id: another_user.proxy_deposit_requests.first }
           expect(response).to redirect_to routes.url_helpers.transfers_path(locale: 'en')
@@ -208,6 +188,7 @@ describe Hyrax::TransfersController, type: :controller do
             w.request_transfer_to(user)
           end
         end
+
         it "does not allow me" do
           delete :destroy, params: { id: user.proxy_deposit_requests.first }
           expect(response).to redirect_to root_path

data/spec/controllers/hyrax/uploads_controller_spec.rb

@@ -1,5 +1,6 @@
-describe Hyrax::UploadsController do
+RSpec.describe Hyrax::UploadsController do
   let(:user) { create(:user) }
+
   describe "#create" do
     let(:file) { fixture_file_upload('/world.png', 'image/png') }
 
@@ -41,6 +42,7 @@ describe Hyrax::UploadsController do
 
       context "for a file that doesn't belong to me" do
         let(:uploaded_file) { create(:uploaded_file, file: file) }
+
         it "doesn't destroy" do
           delete :destroy, params: { id: uploaded_file }
           expect(response.status).to eq 401

data/spec/controllers/hyrax/users_controller_spec.rb

@@ -1,10 +1,7 @@
-describe Hyrax::UsersController, type: :controller do
-  let(:user) { FactoryBot.create(:user) }
-  before do
-    sign_in user
-    allow_any_instance_of(User).to receive(:groups).and_return([])
-    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
-  end
+RSpec.describe Hyrax::UsersController, type: :controller do
+  let(:user) { create(:user) }
+
+  before { sign_in user }
 
   describe "#show" do
     it "show the user profile if user exists" do
@@ -69,24 +66,22 @@ describe Hyrax::UsersController, type: :controller do
         expect(response).to be_successful
       end
 
-      it "finds the expected user via display name" do
-        u1.display_name = "Dr. Curator"
-        u1.save
-        u2.display_name = "Jr. Architect"
-        u2.save
-        allow_any_instance_of(User).to receive(:display_name).and_return("Dr. Curator", "Jr.Archivist")
-        get :index, params: { uq: u1.display_name }
-        expect(assigns[:users]).to include(u1)
-        expect(assigns[:users]).not_to include(u2)
-        expect(response).to be_successful
-        u1.display_name = nil
-        u1.save
-        u2.display_name = nil
-        u2.save
+      context "by display name" do
+        let!(:u1) { create(:user, display_name: "Dr. Curator") }
+        let!(:u2) { create(:user, display_name: "Jr. Architect") }
+
+        it "finds the expected user via display name" do
+          #
+          # allow_any_instance_of(User).to receive(:display_name).and_return("Dr. Curator", "Jr.Archivist")
+          get :index, params: { uq: u1.display_name }
+          expect(assigns[:users]).to include(u1)
+          expect(assigns[:users]).not_to include(u2)
+          expect(response).to be_successful
+        end
       end
 
       it "uses the base query" do
-        u3 = FactoryBot.create(:user)
+        u3 = FactoryGirl.create(:user)
         allow(controller).to receive(:base_query).and_return(["email == \"#{u3.email}\""])
         get :index
         expect(assigns[:users]).to include(u3)
@@ -95,148 +90,4 @@ describe Hyrax::UsersController, type: :controller do
       end
     end
   end
-
-  describe "#edit" do
-    it "show edit form when user edits own profile" do
-      get :edit, params: { id: user.user_key }
-      expect(response).to be_success
-      expect(response).to render_template('users/edit')
-      expect(flash[:alert]).to be_nil
-    end
-
-    context "when user attempts to edit another profile" do
-      let(:another_user) { FactoryBot.create(:user) }
-      context 'with default abilities' do
-        it "redirects to show profile" do
-          expect_any_instance_of(Ability).to receive(:can?).with(:edit, another_user).and_return(false)
-          get :edit, params: { id: another_user.to_param }
-          expect(response).to redirect_to(routes.url_helpers.profile_path(another_user.to_param, locale: 'en'))
-          expect(flash[:alert]).to include("Permission denied: cannot access this page.")
-        end
-      end
-      context 'with a custom ability' do
-        before do
-          allow_any_instance_of(Ability).to receive(:can?).with(:edit, another_user).and_return(true)
-        end
-        it "allows user to edit another user's profile" do
-          get :edit, params: { id: another_user.to_param }
-          expect(response).to be_success
-          expect(response).not_to redirect_to(routes.url_helpers.profile_path(another_user.to_param, locale: 'en'))
-          expect(flash[:alert]).to be_nil
-        end
-      end
-    end
-
-    context "when the user has trophies" do
-      let(:work1) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
-      let(:work2) { GenericWork.create(title: ["w2"]) { |w| w.apply_depositor_metadata(user) } }
-      let(:work3) { GenericWork.create(title: ["w3"]) { |w| w.apply_depositor_metadata(user) } }
-      let!(:trophy1) { user.trophies.create!(work_id: work1.id) }
-      let!(:trophy2) { user.trophies.create!(work_id: work2.id) }
-      let!(:trophy3) { user.trophies.create!(work_id: work3.id) }
-
-      it "show the user profile if user exists" do
-        get :edit, params: { id: user.user_key }
-        expect(response).to be_success
-        expect(assigns[:trophies]).to all(be_kind_of Hyrax::TrophyPresenter)
-        expect(assigns[:trophies].map(&:id)).to match_array [work1.id, work2.id, work3.id]
-      end
-    end
-  end
-
-  describe "#update" do
-    context "the profile of another user" do
-      let(:another_user) { FactoryBot.create(:user) }
-      it "does not allow other users to update" do
-        post :update, params: { id: another_user.user_key, user: { avatar: nil } }
-        expect(response).to redirect_to(routes.url_helpers.profile_path(another_user.to_param, locale: 'en'))
-        expect(flash[:alert]).to include("Permission denied: cannot access this page.")
-      end
-    end
-
-    it "sets an avatar and redirect to profile" do
-      expect(user.avatar?).to be false
-      expect(UserEditProfileEventJob).to receive(:perform_later).with(user)
-      f = fixture_file_upload('/1.5mb-avatar.jpg', 'image/jpg')
-      post :update, params: { id: user.user_key, user: { avatar: f } }
-      expect(response).to redirect_to(routes.url_helpers.profile_path(user.to_param, locale: 'en'))
-      expect(flash[:notice]).to include("Your profile has been updated")
-      expect(User.find_by_user_key(user.user_key).avatar?).to be true
-    end
-    it "validates the content type of an avatar" do
-      expect(UserEditProfileEventJob).to receive(:perform_later).never
-      f = fixture_file_upload('/image.jp2', 'image/jp2')
-      post :update, params: { id: user.user_key, user: { avatar: f } }
-      expect(response).to redirect_to(routes.url_helpers.edit_profile_path(user.to_param, locale: 'en'))
-      expect(flash[:alert]).to include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
-    end
-    it "validates the size of an avatar" do
-      f = fixture_file_upload('/4-20.png', 'image/png')
-      expect(UserEditProfileEventJob).to receive(:perform_later).never
-      post :update, params: { id: user.user_key, user: { avatar: f } }
-      expect(response).to redirect_to(routes.url_helpers.edit_profile_path(user.to_param, locale: 'en'))
-      expect(flash[:alert]).to include("Avatar file size must be less than 2MB")
-    end
-
-    context "user with existing avatar" do
-      before do
-        f = fixture_file_upload('/world.png', 'image/png')
-        user.update(avatar: f)
-      end
-
-      it "deletes an avatar" do
-        expect(UserEditProfileEventJob).to receive(:perform_later).with(user)
-        post :update, params: { id: user.user_key, user: { remove_avatar: 'true' } }
-        expect(response).to redirect_to(routes.url_helpers.profile_path(user.to_param, locale: 'en'))
-        expect(flash[:notice]).to include("Your profile has been updated")
-        expect(User.find_by_user_key(user.user_key).avatar?).to be false
-      end
-    end
-
-    it "refreshes directory attributes" do
-      expect(UserEditProfileEventJob).to receive(:perform_later).with(user)
-      expect_any_instance_of(User).to receive(:populate_attributes).once
-      post :update, params: { id: user.user_key, user: { update_directory: 'true' } }
-      expect(response).to redirect_to(routes.url_helpers.profile_path(user.to_param, locale: 'en'))
-      expect(flash[:notice]).to include("Your profile has been updated")
-    end
-
-    it "sets an social handles" do
-      expect(user.twitter_handle).to be_blank
-      expect(user.facebook_handle).to be_blank
-      expect(user.googleplus_handle).to be_blank
-      expect(user.linkedin_handle).to be_blank
-      expect(user.orcid).to be_blank
-      post :update, params: { id: user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle: "link", orcid: '0000-0000-1111-2222' } }
-      expect(response).to redirect_to(routes.url_helpers.profile_path(user.to_param, locale: 'en'))
-      expect(flash[:notice]).to include("Your profile has been updated")
-      u = User.find_by_user_key(user.user_key)
-      expect(u.twitter_handle).to eq 'twit'
-      expect(u.facebook_handle).to eq 'face'
-      expect(u.googleplus_handle).to eq 'goo'
-      expect(u.linkedin_handle).to eq 'link'
-      expect(u.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
-    end
-
-    it 'displays a flash when invalid ORCID is entered' do
-      expect(user.orcid).to be_blank
-      post :update, params: { id: user.user_key, user: { orcid: 'foobar' } }
-      expect(response).to redirect_to(routes.url_helpers.edit_profile_path(user.to_param, locale: 'en'))
-      expect(flash[:alert]).to include('Orcid must be a string of 19 characters, e.g., "0000-0000-0000-0000"')
-    end
-
-    context "when removing a trophy" do
-      let(:work) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
-      before do
-        user.trophies.create!(work_id: work.id)
-      end
-      it "removes a trophy" do
-        expect do
-          post :update, params: { id: user.user_key, 'remove_trophy_' + work.id => 'yes' }
-        end.to change { user.trophies.count }.by(-1)
-        expect(response).to redirect_to(routes.url_helpers.profile_path(user.to_param, locale: 'en'))
-        expect(flash[:notice]).to include("Your profile has been updated")
-      end
-    end
-  end
 end