hyrax 2.0.3 → 2.1.0.beta1

data/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb

@@ -86,19 +86,19 @@ RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor do
     end
 
     it "accepts file: urls in whitelisted directories" do
-      expect(actor.send(:validate_remote_url, "file:///local/file/test.txt")).to be true
-      expect(actor.send(:validate_remote_url, "file:///local/file/subdirectory/test.txt")).to be true
-      expect(actor.send(:validate_remote_url, "file:///test/test.txt")).to be true
+      expect(actor.send(:validate_remote_url, URI('file:///local/file/test.txt'))).to be true
+      expect(actor.send(:validate_remote_url, URI('file:///local/file/subdirectory/test.txt'))).to be true
+      expect(actor.send(:validate_remote_url, URI('file:///test/test.txt'))).to be true
     end
 
     it "rejects file: urls outside whitelisted directories" do
-      expect(actor.send(:validate_remote_url, "file:///tmp/test.txt")).to be false
-      expect(actor.send(:validate_remote_url, "file:///test/../tmp/test.txt")).to be false
-      expect(actor.send(:validate_remote_url, "file:///test/")).to be false
+      expect(actor.send(:validate_remote_url, URI('file:///tmp/test.txt'))).to be false
+      expect(actor.send(:validate_remote_url, URI('file:///test/../tmp/test.txt'))).to be false
+      expect(actor.send(:validate_remote_url, URI('file:///test/'))).to be false
     end
 
     it "accepts other types of urls" do
-      expect(actor.send(:validate_remote_url, "https://example.com/test.txt")).to be true
+      expect(actor.send(:validate_remote_url, URI('https://example.com/test.txt'))).to be true
     end
   end
 end

data/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb

@@ -3,7 +3,7 @@ RSpec.describe Hyrax::Actors::DefaultAdminSetActor do
   let(:depositor_ability) { ::Ability.new(depositor) }
   let(:work) { build(:generic_work) }
   let(:admin_set) { create(:admin_set) }
-  let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+  let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
   let(:env) { Hyrax::Actors::Environment.new(work, depositor_ability, attributes) }
 
   describe "create" do

data/spec/actors/hyrax/actors/file_actor_spec.rb

@@ -77,7 +77,6 @@ RSpec.describe Hyrax::Actors::FileActor do
   describe '#ingest_file' do
     before do
       expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(file_set, io, relation, versioning: false)
-      expect(Hyrax::WorkingDirectory).not_to receive(:copy_file_to_working_directory)
     end
     it 'when the file is available' do
       allow(file_set).to receive(:save).and_return(true)

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

@@ -237,7 +237,7 @@ RSpec.describe Hyrax::Actors::FileSetActor do
       expect { file_set.reload }.to raise_error ActiveFedora::ObjectNotFoundError
     end
 
-    context "representative and thumbnail of a work" do
+    context "representative, renderings and thumbnail of a work" do
       let!(:work) do
         work = create(:generic_work)
         # this is not part of a block on the create, since the work must be saved
@@ -245,11 +245,12 @@ RSpec.describe Hyrax::Actors::FileSetActor do
         work.ordered_members << file_set
         work.representative = file_set
         work.thumbnail = file_set
+        work.renderings = [file_set]
         work.save
         work
       end
 
-      it "removes representative, thumbnail, and the proxy association" do
+      it "removes representative, renderings, thumbnail, and the proxy association" do
         gw = GenericWork.find(work.id)
         expect(gw.representative_id).to eq(file_set.id)
         expect(gw.thumbnail_id).to eq(file_set.id)
@@ -257,6 +258,7 @@ RSpec.describe Hyrax::Actors::FileSetActor do
         gw.reload
         expect(gw.representative_id).to be_nil
         expect(gw.thumbnail_id).to be_nil
+        expect(gw.rendering_ids).to eq([])
       end
     end
   end
@@ -278,7 +280,7 @@ RSpec.describe Hyrax::Actors::FileSetActor do
         actor.attach_to_work(work)
         expect(work.representative).to eq(file_set)
         expect(work.thumbnail).to eq(file_set)
-        expect { work.reload }.not_to change { [work.representative.id, work.thumbnail.id] }
+        expect { work.reload }.not_to change { [work.representative, work.thumbnail] }
       end
     end
 
@@ -337,11 +339,11 @@ RSpec.describe Hyrax::Actors::FileSetActor do
     let(:restored_content) { file_set.reload.original_file }
 
     before do
-      original_adapter = ActiveJob::Base.queue_adapter
-      ActiveJob::Base.queue_adapter = :inline
+      original_adapter = ApplicationJob.queue_adapter
+      ApplicationJob.queue_adapter = :inline
       actor.create_content(fixture_file_upload(file1))
       actor.create_content(fixture_file_upload('hyrax_generic_stub.txt'))
-      ActiveJob::Base.queue_adapter = original_adapter
+      ApplicationJob.queue_adapter = original_adapter
       actor.file_set.reload
     end
 

data/spec/actors/hyrax/actors/generic_work_actor_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       context 'with in_work_ids' do
         let(:parent) { create(:generic_work, user: user) }
         let(:attributes) do
-          FactoryBot.attributes_for(:generic_work, visibility: visibility, admin_set_id: admin_set.id).merge(
+          attributes_for(:generic_work, visibility: visibility, admin_set_id: admin_set.id).merge(
             in_works_ids: [parent.id]
           )
         end
@@ -120,7 +120,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
 
       context 'with a file' do
         let(:attributes) do
-          FactoryBot.attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
+          attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
             a[:uploaded_files] = [uploaded_file.id]
           end
         end
@@ -158,7 +158,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
         let(:file_actor) { double }
         let(:uploaded_file2) { Hyrax::UploadedFile.create(file: file, user: user) }
         let(:attributes) do
-          FactoryBot.attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
+          attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
             a[:uploaded_files] = [uploaded_file.id, uploaded_file2.id]
           end
         end
@@ -189,7 +189,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
 
       context 'with a present and a blank title' do
         let(:attributes) do
-          FactoryBot.attributes_for(:generic_work, admin_set_id: admin_set.id, title: ['this is present', ''])
+          attributes_for(:generic_work, admin_set_id: admin_set.id, title: ['this is present', ''])
         end
 
         it 'stamps each link with the access rights' do
@@ -227,7 +227,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       let(:parent) { create(:generic_work, user: user) }
       let(:old_parent) { create(:generic_work, user: user) }
       let(:attributes) do
-        FactoryBot.attributes_for(:generic_work).merge(
+        attributes_for(:generic_work).merge(
           in_works_ids: [parent.id]
         )
       end
@@ -244,9 +244,9 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
     end
 
     context 'without in_works_ids' do
-      let(:old_parent) { FactoryBot.create(:generic_work) }
+      let(:old_parent) { create(:generic_work) }
       let(:attributes) do
-        FactoryBot.attributes_for(:generic_work).merge(
+        attributes_for(:generic_work).merge(
           in_works_ids: []
         )
       end
@@ -266,9 +266,9 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
     end
 
     context 'with nil in_works_ids' do
-      let(:parent) { FactoryBot.create(:generic_work) }
+      let(:parent) { create(:generic_work) }
       let(:attributes) do
-        FactoryBot.attributes_for(:generic_work).merge(
+        attributes_for(:generic_work).merge(
           in_works_ids: nil
         )
       end
@@ -285,40 +285,12 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       end
     end
 
-    context 'adding to collections' do
-      let!(:collection1) { create(:collection, user: user) }
-      let!(:collection2) { create(:collection, user: user) }
-      let(:attributes) do
-        FactoryBot.attributes_for(:generic_work, member_of_collection_ids: [collection2.id])
-      end
-
-      before do
-        curation_concern.apply_depositor_metadata(user.user_key)
-        curation_concern.member_of_collections = [collection1]
-        curation_concern.save!
-      end
-
-      it 'remove from the old collection and adds to the new collection' do
-        curation_concern.reload
-        expect(curation_concern.member_of_collection_ids).to eq [collection1.id]
-        # before running actor.update, the work is in collection1
-
-        expect(subject.update(env)).to be true
-
-        curation_concern.reload
-        expect(curation_concern.identifier).to be_blank
-        expect(curation_concern).to be_persisted
-        # after running actor.update, the work is in collection2 and no longer in collection1
-        expect(curation_concern.member_of_collections).to eq [collection2]
-      end
-    end
-
     context 'with multiple file sets' do
       let(:file_set1) { create(:file_set) }
       let(:file_set2) { create(:file_set) }
       let(:curation_concern) { create(:generic_work, user: user, ordered_members: [file_set1, file_set2], admin_set_id: admin_set.id) }
       let(:attributes) do
-        FactoryBot.attributes_for(:generic_work, ordered_member_ids: [file_set2.id, file_set1.id])
+        attributes_for(:generic_work, ordered_member_ids: [file_set2.id, file_set1.id])
       end
 
       it 'updates the order of file sets' do
@@ -331,7 +303,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       ## Is this something we want to support?
       context "when told to stop ordering a file set" do
         let(:attributes) do
-          FactoryBot.attributes_for(:generic_work, ordered_member_ids: [file_set2.id])
+          attributes_for(:generic_work, ordered_member_ids: [file_set2.id])
         end
 
         it "works" do

data/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
   let(:curation_concern) { GenericWork.new }
   let(:attributes) { { admin_set_id: admin_set.id } }
   let(:admin_set) { create(:admin_set) }
-  let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+  let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
   let(:one_year_from_today) { Time.zone.today + 1.year }
   let(:two_years_from_today) { Time.zone.today + 2.years }
@@ -152,7 +152,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       end
 
       context "embargo with date = one year from today, and required embargo of 6 months or less" do
-        let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS) }
+        let(:permission_template) { create(:permission_template, source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS) }
         let(:attributes) do
           { title: ['New embargo'],
             admin_set_id: admin_set.id,
@@ -170,7 +170,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with date = one year from today, and required embargo of 1 year or less" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR)
         end
         let(:attributes) do
@@ -189,7 +189,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with date that doesn't match a required, fixed date" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED,
                  release_date: one_year_from_today.to_s)
         end
@@ -210,7 +210,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with date matching the required, fixed date" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED,
                  release_date: two_years_from_today.to_s)
         end
@@ -230,7 +230,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with valid embargo date and invalid post-embargo visibility" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
         end
@@ -252,7 +252,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with valid embargo date and valid post-embargo visibility" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
         end
@@ -273,7 +273,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with public visibility and public visibility required (no specified release_period in template)" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
         end
         let(:attributes) do
@@ -293,7 +293,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo with public visibility and authenticated visibility required (no specified release_period in template)" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED)
         end
         let(:attributes) do
@@ -314,7 +314,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "embargo when no release delays are allowed" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY)
         end
         let(:attributes) do
@@ -332,7 +332,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       end
 
       context "no embargo/lease when no release delays are allowed" do
-        let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY) }
+        let(:permission_template) { create(:permission_template, source_id: admin_set.id, release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY) }
         let(:attributes) { { title: ['New embargo'], admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
 
         it "returns true" do
@@ -344,7 +344,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "visibility public (no embargo) when visibility required to be authenticated" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED)
         end
@@ -360,7 +360,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "visibility public (no embargo) and visibility required to be public" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
         end
@@ -375,7 +375,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       context "lease specified with any release/visibility requirements" do
         let(:permission_template) do
           create(:permission_template,
-                 admin_set_id: admin_set.id,
+                 source_id: admin_set.id,
                  release_period: Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR,
                  visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
         end
@@ -395,7 +395,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
       end
 
       context "lease specified with NO release/visibility requirements" do
-        let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+        let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
         let(:attributes) do
           { title: ['New embargo'],
             admin_set_id: admin_set.id,

data/spec/actors/hyrax/actors/model_actor_spec.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module MusicalWork
   class Cover < ActiveFedora::Base
   end

data/spec/authorities/qa/authorities/collections_spec.rb

@@ -0,0 +1,68 @@
+RSpec.describe Qa::Authorities::Collections, :clean_repo do
+  let(:controller) { Qa::TermsController.new }
+  let(:user1) { build(:user) }
+  let(:user2) { build(:user) }
+  let(:q) { "foo" }
+  let(:service) { described_class.new }
+  let!(:collection1) { build(:private_collection_lw, id: 'col-1-own', title: ['foo foo'], user: user1, with_permission_template: true, with_solr_document: true) }
+  let!(:collection2) { build(:private_collection_lw, id: 'col-2-own', title: ['bar'], user: user1, with_permission_template: true, with_solr_document: true) }
+  let!(:collection3) { build(:private_collection_lw, id: 'col-3-own', title: ['another foo'], user: user1, with_permission_template: true, with_solr_document: true) }
+  let!(:collection4) { build(:private_collection_lw, id: 'col-4-none', title: ['foo foo foo'], user: user2, with_permission_template: true, with_solr_document: true) }
+  let!(:collection5) do
+    build(:private_collection_lw, id: 'col-5-mgr', title: ['foo for you'], user: user2,
+                                  with_permission_template: { manage_users: [user1] }, with_solr_document: true)
+  end
+  let!(:collection6) do
+    build(:private_collection_lw, id: 'col-6-dep', title: ['foo too'], user: user2,
+                                  with_permission_template: { deposit_users: [user1] }, with_solr_document: true)
+  end
+  let!(:collection7) do
+    build(:private_collection_lw, id: 'col-7-view', title: ['foo bar baz'], user: user2,
+                                  with_permission_template: { view_users: [user1] }, with_solr_document: true)
+  end
+  let!(:collection8) do
+    build(:private_collection_lw, id: 'col-8-mgr', title: ['bar for you'], user: user2,
+                                  with_permission_template: { manage_users: [user1] }, with_solr_document: true)
+  end
+  let!(:collection9) do
+    build(:private_collection_lw, id: 'col-9-dep', title: ['bar too'], user: user2,
+                                  with_permission_template: { deposit_users: [user1] }, with_solr_document: true)
+  end
+  let!(:collection10) do
+    build(:private_collection_lw, id: 'col-10-view', title: ['bar bar baz'], user: user2,
+                                  with_permission_template: { view_users: [user1] }, with_solr_document: true)
+  end
+
+  before do
+    allow(controller).to receive(:params).and_return(params)
+    allow(controller).to receive(:current_user).and_return(user1)
+  end
+
+  subject { service.search(q, controller) }
+
+  describe '#search' do
+    context 'when access is read' do
+      let(:params) { ActionController::Parameters.new(q: q, access: 'read') }
+
+      it 'displays a list of read collections for the current user' do
+        expect(subject.map { |result| result[:id] }).to match_array [collection1.id, collection3.id, collection5.id, collection6.id, collection7.id]
+      end
+    end
+
+    context 'when access is edit' do
+      let(:params) { ActionController::Parameters.new(q: q, access: 'edit') }
+
+      it 'displays a list of edit collections for the current user' do
+        expect(subject.map { |result| result[:id] }).to match_array [collection1.id, collection3.id, collection5.id]
+      end
+    end
+
+    context 'when access is deposit' do
+      let(:params) { ActionController::Parameters.new(q: q, access: 'deposit') }
+
+      it 'displays a list of edit and deposit collections for the current user' do
+        expect(subject.map { |result| result[:id] }).to match_array [collection1.id, collection3.id, collection5.id, collection6.id]
+      end
+    end
+  end
+end

data/spec/channels/hyrax/application_cable/channel_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::ApplicationCable::Channel, no_clean: true do
+RSpec.describe Hyrax::ApplicationCable::Channel do
   subject { described_class.new(connection, identifier) }
 
   let(:connection) { double('connection', identifiers: []) }

data/spec/channels/hyrax/application_cable/connection_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::ApplicationCable::Connection, no_clean: true do
+RSpec.describe Hyrax::ApplicationCable::Connection do
   subject { described_class.new(server, env) }
 
   let(:server) { ActionCable::Server::Base.new }

data/spec/channels/hyrax/notifications_channel_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::NotificationsChannel, no_clean: true do
+RSpec.describe Hyrax::NotificationsChannel do
   subject { described_class.new(connection, nil) }
 
   let(:connection) { Hyrax::ApplicationCable::Connection.new(server, {}) }

data/spec/controllers/catalog_controller_spec.rb

@@ -131,5 +131,5 @@ RSpec.describe CatalogController, type: :controller do
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id])
       end
     end
-  end # describe "#index"
+  end
 end