hyrax 3.0.0.pre.beta1 → 3.0.0.pre.beta2

data/spec/services/hyrax/collections/collection_member_service_spec.rb

@@ -2,9 +2,9 @@ RSpec.describe Hyrax::Collections::CollectionMemberService, clean_repo: true do
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
   let(:current_ability) { instance_double(Ability, admin?: true) }
-  let!(:nestable_collection) { create(:public_collection, collection_type_settings: [:nestable]) }
+  let!(:nestable_collection) { create(:public_collection_lw, collection_type_settings: [:nestable]) }
   let(:scope) { double('Scope', current_ability: current_ability, repository: repository, blacklight_config: blacklight_config, collection: nestable_collection) }
-  let!(:subcollection) { create(:public_collection, member_of_collections: [nestable_collection], collection_type_settings: [:nestable]) }
+  let!(:subcollection) { create(:public_collection_lw, member_of_collections: [nestable_collection], collection_type_settings: [:nestable]) }
   let(:builder) { described_class.new(scope: scope, collection: nestable_collection, params: { "id" => nestable_collection.id.to_s }) }
 
   let!(:work1) { create(:generic_work, member_of_collections: [nestable_collection]) }

data/spec/services/hyrax/collections/migration_service_spec.rb

@@ -14,11 +14,11 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
 
   describe ".migrate_all_collections" do
     context 'when legacy collections are found (e.g. collections created before Hyrax 2.1.0)' do
-      let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
-      let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-      let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
-      let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-      let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
+      let!(:col_none) { build(:typeless_collection, user: user, edit_users: [user.user_key], do_save: true) }
+      let!(:col_vu) { build(:typeless_collection, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
+      let!(:col_vg) { build(:typeless_collection, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
+      let!(:col_mu) { build(:typeless_collection, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
+      let!(:col_mg) { build(:typeless_collection, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
       it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
         Collection.all.each do |col|
@@ -158,11 +158,11 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
       context "and collection wasn't migrated at all" do
-        let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
-        let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-        let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
-        let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-        let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
+        let!(:col_none) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], read_users: [], do_save: true) }
+        let!(:col_vu) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
+        let!(:col_vg) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
+        let!(:col_mu) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
+        let!(:col_mg) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
         it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
           Collection.all.each do |col|
@@ -185,11 +185,11 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       end
 
       context "and collection type gid is set but permission template doesn't exist" do
-        let!(:col_none) { create(:user_collection, id: 'col_none', user: user, edit_users: [user.user_key], collection_type_gid: default_gid) }
-        let!(:col_vu) { create(:user_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], collection_type_gid: default_gid) }
-        let!(:col_vg) { create(:user_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], collection_type_gid: default_gid) }
-        let!(:col_mu) { create(:user_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], collection_type_gid: default_gid) }
-        let!(:col_mg) { create(:user_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], collection_type_gid: default_gid) }
+        let!(:col_none) { build(:user_collection_lw, id: 'col_none', user: user, edit_users: [user.user_key], collection_type_gid: default_gid) }
+        let!(:col_vu) { build(:user_collection_lw, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], collection_type_gid: default_gid) }
+        let!(:col_vg) { build(:user_collection_lw, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], collection_type_gid: default_gid) }
+        let!(:col_mu) { build(:user_collection_lw, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], collection_type_gid: default_gid) }
+        let!(:col_mg) { build(:user_collection_lw, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], collection_type_gid: default_gid) }
 
         it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
           Collection.all.each do |col|
@@ -212,21 +212,21 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       end
 
       context "and collection type gid isn't set but permission template exists with access set" do
-        let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
+        let!(:col_none) { build(:typeless_collection, user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
         let!(:col_vu) do
-          build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_vg) do
-          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mu) do
-          build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mg) do
-          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
                                       do_save: true, with_permission_template: true)
         end
 
@@ -276,21 +276,21 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       end
 
       context "and collection type gid isn't set and permission template exists with access not set" do
-        let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
+        let!(:col_none) { build(:typeless_collection, user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
         let!(:col_vu) do
-          build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_vg) do
-          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mu) do
-          build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mg) do
-          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
                                       do_save: true, with_permission_template: true)
         end
 
@@ -322,8 +322,8 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
 
     context 'when newer collections are found (e.g. collections created at or after Hyrax 2.1.0)' do
       let!(:collection) do
-        create(:collection, id: 'col_newer', user: user, with_permission_template: true, collection_type_settings: [:discoverable],
-                            edit_users: [user.user_key], create_access: true)
+        build(:collection_lw, id: 'col_newer', user: user, with_permission_template: true, collection_type_settings: [:discoverable],
+                              edit_users: [user.user_key])
       end
       let!(:permission_template) { collection.permission_template }
       let!(:collection_type_gid) { collection.collection_type_gid }

data/spec/services/hyrax/collections/nested_collection_persistence_service_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::Collections::NestedCollectionPersistenceService, with_nested_reindexing: true do
-  let(:parent) { create(:collection) }
+  let(:parent) { build(:collection_lw) }
   let(:child) { create(:collection) }
 
   describe '.persist_nested_collection_for' do

data/spec/services/hyrax/collections/nested_collection_query_service_spec.rb

@@ -153,57 +153,57 @@ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: tru
 
         # using create option here because permission template is required for testing :deposit access
         let(:coll_a) do
-          create(:public_collection,
-                 id: 'Collection_A',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true)
+          build(:public_collection_lw,
+                id: 'Collection_A',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true)
         end
         let(:coll_b) do
-          create(:public_collection,
-                 id: 'Collection_B',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true,
-                 member_of_collections: [coll_a])
+          build(:public_collection_lw,
+                id: 'Collection_B',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true,
+                member_of_collections: [coll_a])
         end
         let(:coll_c) do
-          create(:public_collection,
-                 id: 'Collection_C',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true,
-                 member_of_collections: [coll_b])
+          build(:public_collection_lw,
+                id: 'Collection_C',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true,
+                member_of_collections: [coll_b])
         end
         let(:coll_d) do
-          create(:public_collection,
-                 id: 'Collection_D',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true,
-                 member_of_collections: [coll_c])
+          build(:public_collection_lw,
+                id: 'Collection_D',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true,
+                member_of_collections: [coll_c])
         end
         let(:coll_e) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Collection_E',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true,
+                 with_permission_template: true,
                  member_of_collections: [coll_d])
         end
         let(:another) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Another_One',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true)
+                 with_permission_template: true)
         end
         let(:wrong) do
-          create(:public_collection,
-                 id: 'Wrong_Type',
-                 collection_type_gid: another_collection_type.gid,
-                 user: user,
-                 create_access: true)
+          build(:public_collection_lw,
+                id: 'Wrong_Type',
+                collection_type_gid: another_collection_type.gid,
+                user: user,
+                with_permission_template: true)
         end
 
         before do
@@ -245,18 +245,18 @@ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: tru
       describe 'and are of the same collection type', with_nested_reindexing: true do
         # using create option here because permission template is required for testing :deposit access
         let!(:parent) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Parent_Collecton',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true)
+                 with_permission_template: true)
         end
         let!(:child) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Child_Collection',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true)
+                 with_permission_template: true)
         end
 
         it { is_expected.to eq(true) }
@@ -325,8 +325,8 @@ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: tru
 
   describe 'nesting attributes object', with_nested_reindexing: true do
     let(:user) { create(:user) }
-    let!(:parent) { create(:collection, id: 'Parent_Coll', collection_type_gid: collection_type.gid, user: user) }
-    let!(:child) { create(:user_collection, id: 'Child_Coll', collection_type_gid: collection_type.gid, user: user) }
+    let!(:parent) { build(:collection_lw, id: 'Parent_Coll', collection_type_gid: collection_type.gid, user: user) }
+    let!(:child) { create(:user_collection_lw, id: 'Child_Coll', collection_type_gid: collection_type.gid, user: user) }
     let(:nesting_attributes) { Hyrax::Collections::NestedCollectionQueryService::NestingAttributes.new(id: child.id, scope: scope) }
 
     before do

data/spec/services/hyrax/curation_concern_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Hyrax::CurationConcern do
   describe ".actor" do
     subject { described_class.actor }
 
-    it { is_expected.to be_kind_of Hyrax::Actors::TransactionalRequest }
+    it { is_expected.to be_kind_of Hyrax::Actors::AbstractActor }
   end
 
   describe ".actor_factory" do

data/spec/services/hyrax/default_middleware_stack_spec.rb

@@ -7,7 +7,6 @@ RSpec.describe Hyrax::DefaultMiddlewareStack do
 
     it "has the correct stack frames" do
       expect(subject.middlewares).to eq [
-        Hyrax::Actors::TransactionalRequest,
         Hyrax::Actors::OptimisticLockValidator,
         Hyrax::Actors::CreateWithRemoteFilesActor,
         Hyrax::Actors::CreateWithFilesActor,
@@ -30,7 +29,7 @@ RSpec.describe Hyrax::DefaultMiddlewareStack do
 
   describe 'Hyrax::CurationConcern.actor' do
     it "calls the Hyrax::ActorFactory" do
-      expect(Hyrax::CurationConcern.actor).to be_instance_of Hyrax::Actors::TransactionalRequest
+      expect(Hyrax::CurationConcern.actor).to be_instance_of Hyrax::Actors::OptimisticLockValidator
     end
   end
 end

data/spec/services/hyrax/statistics/depositors/summary_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Hyrax::Statistics::Depositors::Summary, :clean_repo do
   let(:end_date) { nil }
   let!(:work1) { create(:work, user: user1) }
   let!(:work2) { create(:work, user: user2) }
-  let!(:collection1) { create(:public_collection, user: user1) }
+  let!(:collection1) { create(:public_collection_lw, user: user1) }
   let(:service) { described_class.new(start_date, end_date) }
 
   before do

data/spec/services/hyrax/statistics/works/by_resource_type_spec.rb

@@ -1,12 +1,19 @@
 RSpec.describe Hyrax::Statistics::Works::ByResourceType do
   let(:service) { described_class.new }
+  let(:user) { create(:user) }
 
   describe "#query", :clean_repo do
     before do
-      create(:generic_work, resource_type: ['Conference Proceeding'])
-      create(:generic_work, resource_type: ['Conference Proceeding'])
-      create(:generic_work, resource_type: ['Image'])
-      create(:generic_work, resource_type: ['Journal'])
+      # Creating factories here led to failures found within
+      # https://travis-ci.org/samvera/hyrax/jobs/454752377
+      # One should be able to invoke create(:generic_work)...
+      # ...however, there are difficulties here which relate to the "terms"
+      # requestHandler
+      # @see https://github.com/samvera/hyrax/issues/3491
+      GenericWork.create(title: ['test'], resource_type: ['Conference Proceeding']).save!
+      GenericWork.create(title: ['test'], resource_type: ['Conference Proceeding']).save!
+      GenericWork.create(title: ['test'], resource_type: ['Image']).save!
+      GenericWork.create(title: ['test'], resource_type: ['Journal']).save!
     end
 
     subject { service.query }

data/spec/services/hyrax/visibility_intention_spec.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+RSpec.describe Hyrax::VisibilityIntention do
+  subject(:intention) { described_class.new(attributes) }
+  let(:attributes)    { {} }
+
+  describe '#embargo_params' do
+    it 'is empty when no embargo is requested' do
+      expect(intention.embargo_params).to be_empty
+    end
+
+    context 'when an embargo is requested with no release date' do
+      let(:attributes) { { visibility: described_class::EMBARGO_REQUEST } }
+
+      it 'raises an error' do
+        expect { intention.embargo_params }.to raise_error ArgumentError
+      end
+    end
+
+    context 'when an embargo is requested with valid release date' do
+      let(:attributes) do
+        { visibility: described_class::EMBARGO_REQUEST, release_date: date }
+      end
+
+      let(:date) { Time.zone.today }
+
+      it 'builds private -> public embargo' do
+        expect(intention.embargo_params).to eq [date, described_class::PRIVATE, described_class::PUBLIC]
+      end
+    end
+
+    context 'when an embargo is requested with specific visibilities' do
+      let(:attributes) do
+        { visibility:   described_class::EMBARGO_REQUEST,
+          release_date: date,
+          after:       after,
+          during:      during }
+      end
+
+      let(:after)  { 'custom_after_embargo_visibility' }
+      let(:date)   { Time.zone.today }
+      let(:during) { 'custom_during_embargo_visibility' }
+
+      it 'builds private -> public embargo' do
+        expect(intention.embargo_params).to eq [date, during, after]
+      end
+    end
+  end
+
+  describe '#lease_params' do
+    it 'is empty when no lease is requested' do
+      expect(intention.lease_params).to be_empty
+    end
+
+    context 'when an lease is requested with no release date' do
+      let(:attributes) { { visibility: described_class::LEASE_REQUEST } }
+
+      it 'raises an error' do
+        expect { intention.lease_params }.to raise_error ArgumentError
+      end
+    end
+
+    context 'when lease embargo is requested with valid release date' do
+      let(:attributes) do
+        { visibility: described_class::LEASE_REQUEST, release_date: date }
+      end
+
+      let(:date) { Time.zone.today }
+
+      it 'builds public -> private lease' do
+        expect(intention.lease_params).to eq [date, described_class::PUBLIC, described_class::PRIVATE]
+      end
+    end
+
+    context 'when an lease is requested with specific visibilities' do
+      let(:attributes) do
+        { visibility: described_class::LEASE_REQUEST,
+          release_date: date,
+          after:       after,
+          during:      during }
+      end
+
+      let(:after)  { 'custom_after_lease_visibility' }
+      let(:date)   { Time.zone.today }
+      let(:during) { 'custom_during_lease_visibility' }
+
+      it 'builds private -> public embargo' do
+        expect(intention.lease_params).to eq [date, during, after]
+      end
+    end
+  end
+
+  describe '#valid_embargo?' do
+    it 'is false by default' do
+      expect(intention.valid_embargo?).to be_falsey
+    end
+
+    context 'when an embargo is requested with no release date' do
+      let(:attributes) { { visibility: described_class::EMBARGO_REQUEST } }
+
+      it 'is false' do
+        expect(intention.valid_embargo?).to be_falsey
+      end
+    end
+
+    context 'when an embargo is requested with valid release date' do
+      let(:attributes) do
+        { visibility: described_class::EMBARGO_REQUEST, release_date: Time.zone.now.to_s }
+      end
+
+      it 'is true' do
+        expect(intention.valid_embargo?).to be_truthy
+      end
+    end
+  end
+
+  describe '#wants_embargo?' do
+    it 'is false by default' do
+      expect(intention.wants_embargo?).to be_falsey
+    end
+
+    context 'when an embargo is requested' do
+      let(:attributes) { { visibility: described_class::EMBARGO_REQUEST } }
+
+      it 'is true' do
+        expect(intention.wants_embargo?).to be_truthy
+      end
+    end
+  end
+
+  describe '#wants_lease?' do
+    it 'is false by default' do
+      expect(intention.wants_lease?).to be_falsey
+    end
+
+    context 'when a lease is requested' do
+      let(:attributes) { { visibility: described_class::LEASE_REQUEST } }
+
+      it 'is true' do
+        expect(intention.wants_lease?).to be_truthy
+      end
+    end
+  end
+end