hyrax 2.0.0.beta4 → 2.0.0.beta5

data/spec/actors/hyrax/actors/file_set_actor_spec.rb

@@ -136,10 +136,14 @@ RSpec.describe Hyrax::Actors::FileSetActor do
   describe '#create_content when from_url is true' do
     before do
       expect(JobIoWrapper).to receive(:create_with_varied_file_handling!).with(any_args).once.and_call_original
+      allow(VisibilityCopyJob).to receive(:perform_later).with(file_set.parent).and_return(true)
+      allow(InheritPermissionsJob).to receive(:perform_later).with(file_set.parent).and_return(true)
     end
 
-    it 'calls ingest_file' do
+    it 'calls ingest_file and kicks off jobs' do
       actor.create_content(file, from_url: true)
+      expect(VisibilityCopyJob).to have_received(:perform_later)
+      expect(InheritPermissionsJob).to have_received(:perform_later)
     end
 
     context 'when an alternative relationship is specified' do

data/spec/actors/hyrax/actors/transfer_request_actor_spec.rb

@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+RSpec.describe Hyrax::Actors::TransferRequestActor do
+  let(:ability) { ::Ability.new(depositor) }
+  let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
+  let(:terminator) { Hyrax::Actors::Terminator.new }
+  let(:depositor) { create(:user) }
+  let(:work) do
+    build(:generic_work, on_behalf_of: proxied_to)
+  end
+  let(:attributes) { {} }
+
+  subject(:middleware) do
+    stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
+      middleware.use described_class
+    end
+    stack.build(terminator)
+  end
+
+  describe "create" do
+    context "when on_behalf_of is blank" do
+      let(:proxied_to) { '' }
+
+      it "returns true" do
+        expect(middleware.create(env)).to be true
+      end
+    end
+
+    context "when proxied_to is provided" do
+      let(:proxied_to) { 'james@example.com' }
+
+      before do
+        create(:user, email: proxied_to)
+        allow(terminator).to receive(:create).and_return(true)
+      end
+
+      it "adds the template users to the work" do
+        expect(ContentDepositorChangeEventJob).to receive(:perform_later).with(work, User)
+        expect(middleware.create(env)).to be true
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ RSpec.describe Hyrax::Admin::AdminSetsController do
       context "a public admin set" do
         # Even though the user can view this admin set, the should not be able to view
         # it on the admin page.
-        let(:admin_set) { create(:admin_set, :public) }
+        let(:admin_set) { create(:admin_set, read_groups: ['public']) }
 
         it 'is unauthorized' do
           get :show, params: { id: admin_set }

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

@@ -2,10 +2,10 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
   let(:arkivo_actor) { double Hyrax::Arkivo::Actor }
   let!(:user) { create(:user) }
   let!(:default_work) do
-    GenericWork.create(title: ['Foo Bar']) do |gf|
-      gf.apply_depositor_metadata(user)
-      gf.arkivo_checksum = '6872d21557992f6ad1d07375f19fbfaf'
-    end
+    create(:work,
+           title: ['Foo Bar'],
+           user: user,
+           arkivo_checksum: '6872d21557992f6ad1d07375f19fbfaf')
   end
 
   before do

data/spec/controllers/hyrax/batch_edits_controller_spec.rb

@@ -27,16 +27,13 @@ RSpec.describe Hyrax::BatchEditsController, type: :controller do
   end
 
   describe "update" do
+    let(:user) { build(:user) }
     let!(:one) do
-      GenericWork.create(creator: ["Fred"], title: ["abc"], language: ['en']) do |gw|
-        gw.apply_depositor_metadata('mjg36')
-      end
+      create(:generic_work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
     end
 
     let!(:two) do
-      GenericWork.create(creator: ["Fred"], title: ["abc"], language: ['en']) do |gw|
-        gw.apply_depositor_metadata('mjg36')
-      end
+      create(:generic_work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
     end
     let(:mycontroller) { "hyrax/my/works" }
 

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

@@ -205,74 +205,93 @@ RSpec.describe Hyrax::Dashboard::CollectionsController do
     end
   end
 
-  # TODO: Add back in when admin dashboard version of show page is created
-  # describe "#show" do
-  #   context "when signed in" do
-  #     before do
-  #       sign_in user
-  #       [asset1, asset2, asset3].each do |asset|
-  #         asset.member_of_collections = [collection]
-  #         asset.save
-  #       end
-  #     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_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)
-  #     end
-  #
-  #     context "and searching" do
-  #       it "returns some works" do
-  #         # "/collections/4m90dv529?utf8=%E2%9C%93&cq=King+Louie&sort="
-  #         get :show, params: { id: collection, cq: "Third" }
-  #         expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
-  #         expect(assigns[:member_docs].map(&:id)).to match_array [asset3].map(&:id)
-  #       end
-  #     end
-  #
-  #     context 'when the page parameter is passed' do
-  #       it 'loads the collection (paying no attention to the page param)' do
-  #         get :show, params: { id: collection, page: '2' }
-  #         expect(response).to be_successful
-  #         expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
-  #         expect(assigns[:presenter].to_s).to eq 'My collection'
-  #       end
-  #     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_path(locale: 'en'))
-  #         get :show, 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_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
-  #       end
-  #     end
-  #   end
-  #
-  #   context "not signed in" do
-  #     it "does not show me files in the collection" do
-  #       get :show, params: { id: collection }
-  #       expect(assigns[:member_docs].count).to eq 0
-  #     end
-  #   end
-  # end
+  describe "#show" do
+    context "when signed in" do
+      before do
+        sign_in user
+        [asset1, asset2, asset3].each do |asset|
+          asset.member_of_collections = [collection]
+          asset.save
+        end
+      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_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)
+      end
+
+      context "and searching" do
+        it "returns some works" do
+          # "/dashboard/collections/4m90dv529?utf8=%E2%9C%93&cq=King+Louie&sort="
+          get :show, params: { id: collection, cq: "Third" }
+          expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset3].map(&:id)
+        end
+      end
+
+      context 'when the page parameter is passed' do
+        it 'loads the collection (paying no attention to the page param)' do
+          get :show, params: { id: collection, page: '2' }
+          expect(response).to be_successful
+          expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
+          expect(assigns[:presenter].to_s).to eq 'My collection'
+        end
+      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_path(locale: 'en'))
+          get :show, 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_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
+        end
+      end
+    end
+
+    context 'with admin user and private collection' do
+      let(:collection) do
+        create(:private_collection,
+               title: ["My collection"],
+               description: ["My incredibly detailed description of the collection"],
+               user: user)
+      end
+      let(:admin) { create(:admin) }
+
+      before do
+        sign_in admin
+        allow(controller.current_ability).to receive(:can?).with(:show, collection).and_return(true)
+      end
+
+      it "returns successfully" do
+        get :show, params: { id: collection }
+        expect(response).to be_successful
+      end
+    end
+
+    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)
+      end
+    end
+  end
 
   describe "#delete" do
     before { sign_in user }

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

@@ -53,9 +53,9 @@ RSpec.describe Hyrax::Dashboard::ProfilesController do
     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(:work1) { create(:work, title: ["w1"], user: user) }
+      let(:work2) { create(:work, title: ["w2"], user: user) }
+      let(:work3) { create(:work, title: ["w3"], user: 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) }
@@ -127,7 +127,7 @@ RSpec.describe Hyrax::Dashboard::ProfilesController do
       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'
+      expect(u.orcid).to eq 'https://orcid.org/0000-0000-1111-2222'
     end
 
     it 'displays a flash when invalid ORCID is entered' do
@@ -138,7 +138,7 @@ RSpec.describe Hyrax::Dashboard::ProfilesController do
     end
 
     context "when removing a trophy" do
-      let(:work) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
+      let(:work) { create(:generic_work, title: ["w1"], user: user) }
 
       before do
         user.trophies.create!(work_id: work.id)

data/spec/controllers/hyrax/file_sets_controller_spec.rb

@@ -114,14 +114,10 @@ RSpec.describe Hyrax::FileSetsController do
     describe "#destroy" do
       context "file_set with a parent" do
         let(:file_set) do
-          FileSet.create do |fs|
-            fs.apply_depositor_metadata(user)
-          end
+          create(:file_set, user: user)
         end
         let(:work) do
-          GenericWork.create!(title: ['test title']) do |w|
-            w.apply_depositor_metadata(user)
-          end
+          create(:work, title: ['test title'], user: user)
         end
 
         let(:delete_message) { double('delete message') }
@@ -143,9 +139,7 @@ RSpec.describe Hyrax::FileSetsController do
 
     describe "#edit" do
       let(:file_set) do
-        FileSet.create do |fs|
-          fs.apply_depositor_metadata(user)
-        end
+        create(:file_set, user: user)
       end
 
       before do
@@ -169,7 +163,7 @@ RSpec.describe Hyrax::FileSetsController do
 
     describe "#update" do
       let(:file_set) do
-        FileSet.create! { |fs| fs.apply_depositor_metadata(user) }
+        create(:file_set, user: user)
       end
 
       context "when updating metadata" do
@@ -283,9 +277,7 @@ RSpec.describe Hyrax::FileSetsController do
 
       context "when there's an error saving" do
         let(:file_set) do
-          FileSet.create do |fs|
-            fs.apply_depositor_metadata(user)
-          end
+          create(:file_set, user: user)
         end
 
         before do
@@ -303,9 +295,7 @@ RSpec.describe Hyrax::FileSetsController do
 
     describe "#edit" do
       let(:file_set) do
-        FileSet.create(read_groups: ['public']) do |f|
-          f.apply_depositor_metadata('archivist1@example.com')
-        end
+        create(:file_set, read_groups: ['public'])
       end
 
       let(:file) do
@@ -434,9 +424,7 @@ RSpec.describe Hyrax::FileSetsController do
     end
 
     let(:file_set) do
-      file_set = FileSet.create! do |gf|
-        gf.apply_depositor_metadata(user)
-      end
+      file_set = create(:file_set, user: user)
       parent.ordered_members << file_set
       parent.save
       file_set

data/spec/controllers/hyrax/fixity_checks_controller_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Hyrax::FixityChecksController do
   routes { Hyrax::Engine.routes }
   let(:user) { create(:user) }
-  let(:file_set) { FileSet.create { |fs| fs.apply_depositor_metadata(user) } }
+  let(:file_set) { create(:file_set, user: user) }
   let(:binary) { File.open(fixture_path + '/world.png') }
   let(:file) { Hydra::Derivatives::IoDecorator.new(binary, 'image/png', 'world.png') }
 

data/spec/controllers/hyrax/generic_works_controller_spec.rb

@@ -289,9 +289,7 @@ RSpec.describe Hyrax::GenericWorksController do
 
         context "when a work id is passed" do
           let(:work) do
-            GenericWork.create!(title: ['test title']) do |w|
-              w.apply_depositor_metadata(user)
-            end
+            create(:work, user: user, title: ['test title'])
           end
 
           it "records the work" do

data/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb

@@ -1,10 +1,8 @@
 RSpec.describe Hyrax::SingleUseLinksViewerController do
   routes { Hyrax::Engine.routes }
+  let(:user) { build(:user) }
   let(:file) do
-    FileSet.create! do |lfile|
-      lfile.label = 'world.png'
-      lfile.apply_depositor_metadata('mjg')
-    end
+    create(:file_set, label: 'world.png', user: user)
   end
 
   describe "retrieval links" do

data/spec/factories/admin_sets.rb

@@ -22,8 +22,4 @@ FactoryGirl.define do
       with_permission_template false
     end
   end
-
-  trait :public do
-    read_groups ['public']
-  end
 end

data/spec/forms/hyrax/forms/work_form_spec.rb

@@ -42,6 +42,15 @@ RSpec.describe Hyrax::Forms::WorkForm do
 
       it { is_expected.to match_array([args]) }
     end
+    context 'when member of other collections' do
+      let(:args) { 'bar' }
+
+      before do
+        allow(work).to receive(:member_of_collection_ids).and_return(['foo'])
+      end
+
+      it { is_expected.to match_array(['foo', args]) }
+    end
   end
 
   describe "#[]" do
@@ -227,6 +236,22 @@ RSpec.describe Hyrax::Forms::WorkForm do
     it { is_expected.to eq work.embargo_release_date }
   end
 
+  describe "#visibility_during_embargo" do
+    let(:work) { create(:work, visibility_during_embargo: 'authenticated') }
+
+    subject { form.visibility_during_embargo }
+
+    it { is_expected.to eq work.visibility_during_embargo }
+  end
+
+  describe "#visibility_after_embargo" do
+    let(:work) { create(:work, visibility_after_embargo: 'public') }
+
+    subject { form.visibility_after_embargo }
+
+    it { is_expected.to eq work.visibility_after_embargo }
+  end
+
   describe "#lease_expiration_date" do
     let(:work) { create(:work, lease_expiration_date: 2.days.from_now) }
 
@@ -235,6 +260,22 @@ RSpec.describe Hyrax::Forms::WorkForm do
     it { is_expected.to eq work.lease_expiration_date }
   end
 
+  describe "#visibility_during_lease" do
+    let(:work) { create(:work, visibility_during_lease: 'authenticated') }
+
+    subject { form.visibility_during_lease }
+
+    it { is_expected.to eq work.visibility_during_lease }
+  end
+
+  describe "#visibility_after_lease" do
+    let(:work) { create(:work, visibility_after_lease: 'private') }
+
+    subject { form.visibility_after_lease }
+
+    it { is_expected.to eq work.visibility_after_lease }
+  end
+
   describe ".workflow_for" do
     subject { described_class.send(:workflow_for, admin_set_id: admin_set.id) }