hyrax 2.1.0.beta2 → 2.1.0.rc1

data/spec/features/embargo_spec.rb

@@ -32,4 +32,59 @@ RSpec.describe 'embargo' do
       expect(page).to have_content(later_future_date.to_date.to_formatted_s(:standard))
     end
   end
+
+  describe 'updating embargoed object' do
+    let(:my_admin_set) do
+      create(:admin_set,
+             title: ['admin set with embargo range'],
+             with_permission_template: { release_period: "6mos", with_active_workflow: true })
+    end
+    let(:default_admin_set) do
+      create(:admin_set, id: AdminSet::DEFAULT_ID,
+                         title: ["Default Admin Set"],
+                         description: ["A description"],
+                         with_permission_template: {})
+    end
+    let(:future_date) { 5.days.from_now }
+    let(:later_future_date) { 10.days.from_now }
+    let(:invalid_future_date) { 185.days.from_now } # More than 6 months
+    let(:admin) { create(:admin) }
+    let(:work) do
+      create(:work, title: ['embargoed work1'],
+                    embargo_release_date: future_date.to_datetime.iso8601,
+                    admin_set_id: my_admin_set.id,
+                    edit_users: [user])
+    end
+
+    it 'can be updated with a valid date' do
+      visit "/concern/generic_works/#{work.id}"
+
+      click_link 'Edit'
+      click_link 'Embargo Management Page'
+
+      expect(page).to have_content('This Generic Work is under embargo.')
+      expect(page).to have_xpath("//input[@name='generic_work[embargo_release_date]' and @value='#{future_date.to_datetime.iso8601}']") # current embargo date is pre-populated in edit field
+
+      fill_in 'until', with: later_future_date.to_s
+
+      click_button 'Update Embargo'
+      expect(page).to have_content(later_future_date.to_date.to_formatted_s(:standard))
+      expect(page).to have_content(my_admin_set.title.first)
+    end
+
+    it 'cannot be updated with an invalid date' do
+      visit "/concern/generic_works/#{work.id}"
+
+      click_link 'Edit'
+      click_link 'Embargo Management Page'
+
+      expect(page).to have_content('This Generic Work is under embargo.')
+      expect(page).to have_xpath("//input[@name='generic_work[embargo_release_date]' and @value='#{future_date.to_datetime.iso8601}']") # current embargo date is pre-populated in edit field
+
+      fill_in 'until', with: invalid_future_date.to_s
+
+      click_button 'Update Embargo'
+      expect(page).to have_content('Release date specified does not match permission template release requirements for selected AdminSet.')
+    end
+  end
 end

data/spec/features/proxy_spec.rb

@@ -6,7 +6,9 @@ RSpec.describe 'proxy', type: :feature do
     it "creates a proxy" do
       sign_in user
       click_link "Your activity"
-      click_link "Manage Proxies"
+      within 'div#proxy_management' do
+        click_link "Manage Proxies"
+      end
       expect(first("td.depositor-name")).to be_nil
 
       # BEGIN create_proxy_using_partial

data/spec/features/work_show_spec.rb

@@ -19,6 +19,8 @@ RSpec.describe "display a work as its owner" do
     let(:user) { create(:user) }
     let(:file_set) { create(:file_set, user: user, title: ['A Contained FileSet'], content: file) }
     let(:file) { File.open(fixture_path + '/world.png') }
+    let(:multi_membership_type_1) { create(:collection_type, :allow_multiple_membership, title: 'Multi-membership 1') }
+    let!(:collection) { create(:collection_lw, user: user, collection_type_gid: multi_membership_type_1.gid) }
 
     before do
       sign_in user
@@ -29,8 +31,8 @@ RSpec.describe "display a work as its owner" do
       expect(page).to have_selector 'h2', text: 'Magnificent splendor'
       expect(page).to have_selector 'h2', text: 'Happy little trees'
       expect(page).to have_selector 'li', text: 'The Internet'
-      expect(page).to have_selector 'th', text: 'Location'
-      expect(page).not_to have_selector 'th', text: 'Based near'
+      expect(page).to have_selector 'dt', text: 'Location'
+      expect(page).not_to have_selector 'dt', text: 'Based near'
       expect(page).to have_selector 'button', text: 'Attach Child', count: 1
 
       # Displays FileSets already attached to this work
@@ -41,6 +43,20 @@ RSpec.describe "display a work as its owner" do
       # IIIF manifest does not include locale query param
       expect(find('div.viewer:first')['data-uri']).to eq "/concern/generic_works/#{work.id}/manifest"
     end
+
+    it "add work to a collection", js: true do
+      click_button "Add to collection" # opens the modal
+      # since there is only one collection, it's not necessary to choose a radio button
+      within('div#collection-list-container') do
+        choose collection.title.first # selects the collection
+        click_button 'Save changes'
+      end
+
+      # forwards to collection show page
+      expect(page).to have_content collection.title.first
+      expect(page).to have_content work.title.first
+      expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
+    end
   end
 
   context "as a user who is not logged in" do
@@ -54,8 +70,8 @@ RSpec.describe "display a work as its owner" do
     it "shows a work" do
       expect(page).to have_selector 'h2', text: 'Magnificent splendor'
       expect(page).to have_selector 'li', text: 'The Internet'
-      expect(page).to have_selector 'th', text: 'Location'
-      expect(page).not_to have_selector 'th', text: 'Based near'
+      expect(page).to have_selector 'dt', text: 'Location'
+      expect(page).not_to have_selector 'dt', text: 'Based near'
 
       # Doesn't have the upload form for uploading more files
       expect(page).not_to have_selector "form#fileupload"

data/spec/forms/hyrax/forms/admin/collection_type_form_spec.rb

@@ -19,6 +19,7 @@ RSpec.describe Hyrax::Forms::Admin::CollectionTypeForm do
   it { is_expected.to delegate_method(:collections?).to(:collection_type) }
   it { is_expected.to delegate_method(:admin_set?).to(:collection_type) }
   it { is_expected.to delegate_method(:user_collection?).to(:collection_type) }
+  it { is_expected.to delegate_method(:badge_color).to(:collection_type) }
 
   describe '#all_settings_disabled?' do
     before do

data/spec/indexers/hyrax/repository_reindexer_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Hyrax::RepositoryReindexer do
   let(:subject) { Samvera::NestingIndexer }
 
   it 'overrides ActiveFedora#reindex_everything' do
-    expect(subject).to receive(:reindex_all!)
+    expect(subject).to receive(:reindex_all!).with(extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX)
     ActiveFedora::Base.reindex_everything
   end
 end

data/spec/jobs/attach_files_to_work_job_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe AttachFilesToWorkJob do
+RSpec.describe AttachFilesToWorkJob, perform_enqueued: [AttachFilesToWorkJob] do
   context "happy path" do
     let(:file1) { File.open(fixture_path + '/world.png') }
     let(:file2) { File.open(fixture_path + '/image.jp2') }
@@ -7,15 +7,15 @@ RSpec.describe AttachFilesToWorkJob do
     let(:generic_work) { create(:public_generic_work) }
     let(:user) { create(:user) }
 
-    shared_examples 'a file attacher' do
+    shared_examples 'a file attacher', perform_enqueued: [AttachFilesToWorkJob, IngestJob] do
       it 'attaches files, copies visibility and permissions and updates the uploaded files' do
-        expect(ImportUrlJob).not_to receive(:perform_later)
         expect(CharacterizeJob).to receive(:perform_later).twice
         described_class.perform_now(generic_work, [uploaded_file1, uploaded_file2])
         generic_work.reload
         expect(generic_work.file_sets.count).to eq 2
         expect(generic_work.file_sets.map(&:visibility)).to all(eq 'open')
         expect(uploaded_file1.reload.file_set_uri).not_to be_nil
+        expect(ImportUrlJob).not_to have_been_enqueued
       end
     end
 
@@ -56,5 +56,17 @@ RSpec.describe AttachFilesToWorkJob do
         end
       end
     end
+
+    context "deposited as 'Yourself' selected in on behalf of list" do
+      before do
+        generic_work.on_behalf_of = ''
+        generic_work.save
+      end
+      it_behaves_like 'a file attacher' do
+        it 'records the depositor(s) in edit_users' do
+          expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([generic_work.depositor]))
+        end
+      end
+    end
   end
 end

data/spec/jobs/batch_create_job_spec.rb

@@ -14,12 +14,12 @@ RSpec.describe BatchCreateJob do
     let(:uploaded_files) { [upload1.id.to_s, upload2.id.to_s] }
 
     subject do
-      described_class.perform_later(user,
-                                    title,
-                                    resource_types,
-                                    uploaded_files,
-                                    metadata,
-                                    operation)
+      described_class.perform_now(user,
+                                  title,
+                                  resource_types,
+                                  uploaded_files,
+                                  metadata,
+                                  operation)
     end
 
     before do

data/spec/jobs/create_work_job_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe CreateWorkJob do
                              operation_type: "Create Work")
   end
 
-  describe "#perform" do
+  describe "#perform", perform_enqueued: [described_class] do
     let(:file1) { File.open(fixture_path + '/world.png') }
     let(:upload1) { Hyrax::UploadedFile.create(user: user, file: file1) }
     let(:metadata) do

data/spec/models/admin_set_spec.rb

@@ -198,15 +198,17 @@ RSpec.describe AdminSet, type: :model do
 
     before do
       allow(admin_set).to receive(:permission_template).and_return(permission_template)
-      allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'user').and_return(['mgr1.ex.com', 'mgr2.ex.com', user.user_key])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'user').and_return(['mgr1@ex.com', 'mgr2@ex.com', user.user_key])
       allow(permission_template).to receive(:agent_ids_for).with(access: 'manage', agent_type: 'group').and_return(['managers', ::Ability.admin_group_name])
-      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'user').and_return(['vw1.ex.com', 'vw2.ex.com'])
-      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'group').and_return(['viewers'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'deposit', agent_type: 'user').and_return(['dep1@ex.com', 'dep2@ex.com'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'deposit', agent_type: 'group').and_return(['depositors', 'registered'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'user').and_return(['vw1@ex.com', 'vw2@ex.com'])
+      allow(permission_template).to receive(:agent_ids_for).with(access: 'view', agent_type: 'group').and_return(['viewers', 'public'])
     end
 
     it 'resets user edit access' do
       admin_set.reset_access_controls!
-      expect(admin_set.edit_users).to match_array([user.user_key, 'mgr1.ex.com', 'mgr2.ex.com'])
+      expect(admin_set.edit_users).to match_array([user.user_key, 'mgr1@ex.com', 'mgr2@ex.com'])
     end
 
     it 'resets group edit access' do
@@ -214,14 +216,14 @@ RSpec.describe AdminSet, type: :model do
       expect(admin_set.edit_groups).to match_array(['managers', ::Ability.admin_group_name])
     end
 
-    it "doesn't reset user read access" do
+    it 'resets user read access' do
       admin_set.reset_access_controls!
-      expect(admin_set.read_users).to match_array([]) # different behavior from Collections which grants participant Viewers to have read_access in the solr doc
+      expect(admin_set.read_users).to match_array(['dep1@ex.com', 'dep2@ex.com', 'vw1@ex.com', 'vw2@ex.com'])
     end
 
-    it "doesn't reset group read access" do
+    it 'resets group read access' do
       admin_set.reset_access_controls!
-      expect(admin_set.read_groups).to match_array(['public']) # different behavior from Collections which grants participant Viewers to have read_access in the solr doc
+      expect(admin_set.read_groups).to match_array(['depositors', 'viewers'])
     end
   end
 end

data/spec/models/collection_spec.rb

@@ -319,7 +319,7 @@ RSpec.describe Collection, type: :model do
 
   describe '#update_nested_collection_relationship_indices', :with_nested_reindexing do
     it 'will be called after save' do
-      expect(Samvera::NestingIndexer).to receive(:reindex_relationships).with(id: kind_of(String))
+      expect(Samvera::NestingIndexer).to receive(:reindex_relationships).with(id: kind_of(String), extent: kind_of(String))
       collection.save!
     end
   end

data/spec/models/concerns/hyrax/collection_nesting_spec.rb

@@ -33,6 +33,7 @@ RSpec.describe Hyrax::CollectionNesting do
     let(:user) { create(:user) }
     let!(:collection) { create(:collection, collection_type_settings: [:nestable]) }
     let!(:child_collection) { create(:collection, collection_type_settings: [:nestable]) }
+    let(:extent) { Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX }
 
     before do
       Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: collection, child: child_collection)
@@ -47,11 +48,13 @@ RSpec.describe Hyrax::CollectionNesting do
     it { is_expected.to respond_to(:update_nested_collection_relationship_indices) }
     it { is_expected.to respond_to(:update_child_nested_collection_relationship_indices) }
     it { is_expected.to respond_to(:use_nested_reindexing?) }
+    it { is_expected.to respond_to(:reindex_extent) }
+    it { is_expected.to respond_to(:reindex_extent=) }
 
     context 'after_update_index callback' do
       describe '#update_nested_collection_relationship_indices' do
         it 'will call Hyrax.config.nested_relationship_reindexer' do
-          expect(Hyrax.config.nested_relationship_reindexer).to receive(:call).with(id: subject.id).and_call_original
+          expect(Hyrax.config.nested_relationship_reindexer).to receive(:call).with(id: subject.id, extent: extent).and_call_original
           subject.update_nested_collection_relationship_indices
         end
 
@@ -62,10 +65,10 @@ RSpec.describe Hyrax::CollectionNesting do
       end
     end
 
-    context 'after_destroy callback' do
+    context 'after_destroy callback', with_nested_reindexing: true do
       describe '#update_child_nested_collection_relationship_indices' do
         it 'will call Hyrax.config.nested_relationship_reindexer' do
-          expect(Hyrax.config.nested_relationship_reindexer).to receive(:call).with(id: child_collection.id).and_call_original
+          expect(Hyrax.config.nested_relationship_reindexer).to receive(:call).with(id: child_collection.id, extent: extent).and_call_original
           subject.update_child_nested_collection_relationship_indices
         end
       end

data/spec/models/flipflop_spec.rb

@@ -30,4 +30,12 @@ RSpec.describe Flipflop do
       is_expected.to be true
     end
   end
+
+  describe "hide_private_files?" do
+    subject { described_class.hide_private_files? }
+
+    it "defaults to false" do
+      is_expected.to be false
+    end
+  end
 end

data/spec/models/hyrax/work_behavior_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe Hyrax::WorkBehavior do
 
   describe '#update_nested_collection_relationship_indices', :with_nested_reindexing do
     it 'will be called after save' do
-      expect(Samvera::NestingIndexer).to receive(:reindex_relationships).with(id: kind_of(String))
+      expect(Samvera::NestingIndexer).to receive(:reindex_relationships).with(id: kind_of(String), extent: kind_of(String))
       subject.save!
     end
   end

data/spec/presenters/hyrax/admin_set_presenter_spec.rb

@@ -70,4 +70,74 @@ RSpec.describe Hyrax::AdminSetPresenter do
 
     it { is_expected.to eq "/admin/admin_sets/#{admin_set.id}" }
   end
+
+  describe '#managed_access' do
+    let(:admin_set) { create(:admin_set, members: [work]) }
+
+    context 'when manager' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_document).and_return(true)
+      end
+      it 'returns Manage label' do
+        expect(presenter.managed_access).to eq 'Manage'
+      end
+    end
+
+    context 'when depositor' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_document).and_return(false)
+        allow(ability).to receive(:can?).with(:deposit, solr_document).and_return(true)
+      end
+      it 'returns Deposit label' do
+        expect(presenter.managed_access).to eq 'Deposit'
+      end
+    end
+
+    context 'when viewer' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_document).and_return(false)
+        allow(ability).to receive(:can?).with(:deposit, solr_document).and_return(false)
+        allow(ability).to receive(:can?).with(:read, solr_document).and_return(true)
+      end
+      it 'returns View label' do
+        expect(presenter.managed_access).to eq 'View'
+      end
+    end
+  end
+
+  describe '#allow_batch?' do
+    let(:admin_set) { create(:admin_set, members: [work]) }
+
+    context 'when user cannot edit' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_document).and_return(false)
+      end
+
+      it 'returns false' do
+        expect(presenter.allow_batch?).to be false
+      end
+    end
+
+    context 'when user can edit' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_document).and_return(true)
+      end
+
+      context 'and there are works in the admin set' do
+        it 'returns false' do
+          expect(presenter.allow_batch?).to be false
+        end
+      end
+
+      context 'and there are no works in the admin set' do
+        before do
+          allow(presenter).to receive(:total_items).and_return(0)
+        end
+
+        it 'returns true' do
+          expect(presenter.allow_batch?).to be true
+        end
+      end
+    end
+  end
 end

data/spec/presenters/hyrax/collection_presenter_spec.rb

@@ -322,6 +322,18 @@ RSpec.describe Hyrax::CollectionPresenter do
     end
   end
 
+  describe "#collection_type_badge" do
+    let(:collection_type) { create(:collection_type) }
+    before do
+      allow(collection_type).to receive(:badge_color).and_return("#ffa510")
+      allow(presenter).to receive(:collection_type).and_return(collection_type)
+    end
+
+    subject { presenter.collection_type_badge }
+
+    it { is_expected.to eq "<span class=\"label\" style=\"background-color: #ffa510;\">" + collection_type.title + "</span>" }
+  end
+
   describe "#user_can_nest_collection?" do
     before do
       allow(ability).to receive(:can?).with(:deposit, solr_doc).and_return(true)
@@ -392,4 +404,58 @@ RSpec.describe Hyrax::CollectionPresenter do
   it { is_expected.to delegate_method(:related_url).to(:solr_document) }
   it { is_expected.to delegate_method(:identifier).to(:solr_document) }
   it { is_expected.to delegate_method(:date_created).to(:solr_document) }
+
+  describe '#managed_access' do
+    context 'when manager' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_doc).and_return(true)
+      end
+      it 'returns Manage label' do
+        expect(presenter.managed_access).to eq 'Manage'
+      end
+    end
+
+    context 'when depositor' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_doc).and_return(false)
+        allow(ability).to receive(:can?).with(:deposit, solr_doc).and_return(true)
+      end
+      it 'returns Deposit label' do
+        expect(presenter.managed_access).to eq 'Deposit'
+      end
+    end
+
+    context 'when manager' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_doc).and_return(false)
+        allow(ability).to receive(:can?).with(:deposit, solr_doc).and_return(false)
+        allow(ability).to receive(:can?).with(:read, solr_doc).and_return(true)
+      end
+      it 'returns View label' do
+        expect(presenter.managed_access).to eq 'View'
+      end
+    end
+  end
+
+  describe '#allow_batch?' do
+    context 'when user cannot edit' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_doc).and_return(false)
+      end
+
+      it 'returns false' do
+        expect(presenter.allow_batch?).to be false
+      end
+    end
+
+    context 'when user can edit' do
+      before do
+        allow(ability).to receive(:can?).with(:edit, solr_doc).and_return(true)
+      end
+
+      it 'returns false' do
+        expect(presenter.allow_batch?).to be true
+      end
+    end
+  end
 end