hyrax 2.1.0.beta1 → 2.1.0.beta2

data/spec/factories/file_sets.rb

@@ -9,9 +9,7 @@ FactoryBot.define do
     end
 
     after(:create) do |file, evaluator|
-      if evaluator.content
-        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
-      end
+      Hydra::Works::UploadFileToFileSet.call(file, evaluator.content) if evaluator.content
     end
 
     trait :public do
@@ -27,9 +25,7 @@ FactoryBot.define do
         file.title = ['testfile']
       end
       after(:create) do |file, evaluator|
-        if evaluator.content
-          Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
-        end
+        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content) if evaluator.content
         create(:work, user: evaluator.user).members << file
       end
     end

data/spec/factories/generic_works.rb

@@ -88,31 +88,95 @@ FactoryBot.define do
     end
 
     factory :with_embargo_date do
+      # build with defaults:
+      # let(:work) { create(:embargoed_work) }
+
+      # build with specific values:
+      # let(:embargo_attributes) do
+      #   { embargo_date: Date.tomorrow.to_s,
+      #     current_state: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,
+      #     future_state: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      # end
+      # let(:work) { create(:embargoed_work, with_embargo_attributes: embargo_attributes) }
+
       transient do
+        with_embargo_attributes false
         embargo_date { Date.tomorrow.to_s }
         current_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
         future_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
       end
       factory :embargoed_work do
-        after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, evaluator.current_state, evaluator.future_state) }
+        after(:build) do |work, evaluator|
+          if evaluator.with_embargo_attributes
+            work.apply_embargo(evaluator.with_embargo_attributes[:embargo_date],
+                               evaluator.with_embargo_attributes[:current_state],
+                               evaluator.with_embargo_attributes[:future_state])
+          else
+            work.apply_embargo(evaluator.embargo_date,
+                               evaluator.current_state,
+                               evaluator.future_state)
+          end
+        end
       end
       factory :embargoed_work_with_files do
-        after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, evaluator.current_state, evaluator.future_state) }
+        after(:build) do |work, evaluator|
+          if evaluator.with_embargo_attributes
+            work.apply_embargo(evaluator.with_embargo_attributes[:embargo_date],
+                               evaluator.with_embargo_attributes[:current_state],
+                               evaluator.with_embargo_attributes[:future_state])
+          else
+            work.apply_embargo(evaluator.embargo_date,
+                               evaluator.current_state,
+                               evaluator.future_state)
+          end
+        end
         after(:create) { |work, evaluator| 2.times { work.ordered_members << create(:file_set, user: evaluator.user) } }
       end
     end
 
     factory :with_lease_date do
+      # build with defaults:
+      # let(:work) { create(:leased_work) }
+
+      # build with specific values:
+      # let(:lease_attributes) do
+      #   { lease_date: Date.tomorrow.to_s,
+      #     current_state: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
+      #     future_state: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+      # end
+      # let(:work) { create(:leased_work, with_lease_attributes: lease_attributes) }
+
       transient do
+        with_lease_attributes false
         lease_date { Date.tomorrow.to_s }
         current_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
         future_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
       end
       factory :leased_work do
-        after(:build) { |work, evaluator| work.apply_lease(evaluator.lease_date, evaluator.current_state, evaluator.future_state) }
+        after(:build) do |work, evaluator|
+          if evaluator.with_lease_attributes
+            work.apply_lease(evaluator.with_lease_attributes[:lease_date],
+                             evaluator.with_lease_attributes[:current_state],
+                             evaluator.with_lease_attributes[:future_state])
+          else
+            work.apply_lease(evaluator.lease_date,
+                             evaluator.current_state,
+                             evaluator.future_state)
+          end
+        end
       end
       factory :leased_work_with_files do
-        after(:build) { |work, evaluator| work.apply_lease(evaluator.lease_date, evaluator.current_state, evaluator.future_state) }
+        after(:build) do |work, evaluator|
+          if evaluator.with_lease_attributes
+            work.apply_lease(evaluator.with_lease_attributes[:lease_date],
+                             evaluator.with_lease_attributes[:current_state],
+                             evaluator.with_lease_attributes[:future_state])
+          else
+            work.apply_lease(evaluator.lease_date,
+                             evaluator.current_state,
+                             evaluator.future_state)
+          end
+        end
         after(:create) { |work, evaluator| 2.times { work.ordered_members << create(:file_set, user: evaluator.user) } }
       end
     end

data/spec/factory_tests/collections_factory_spec.rb

@@ -29,9 +29,10 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
       end
 
       it 'will create a collection type with specified settings when collection_type_settings is set to attributes identifying settings' do
-        col = build(:collection_lw, collection_type_settings: [:not_discoverable, :not_sharable, :nestable])
+        col = build(:collection_lw, collection_type_settings: [:not_discoverable, :not_sharable, :not_brandable, :nestable])
         expect(col.collection_type.discoverable?).to be false
         expect(col.collection_type.sharable?).to be false
+        expect(col.collection_type.brandable?).to be false
         expect(col.collection_type.nestable?).to be true
       end
     end

data/spec/features/batch_create_spec.rb

@@ -2,8 +2,19 @@
 
 RSpec.describe 'Batch creation of works', type: :feature do
   let(:user) { create(:user) }
+  let!(:default_admin_set) do
+    build(:admin_set,
+          id: AdminSet::DEFAULT_ID,
+          title: ["Default Admin Set"],
+          description: ["A description"],
+          with_permission_template: { deposit_groups: [::Ability.registered_group_name] })
+  end
 
   before do
+    # stub out characterization and derivatives. Travis doesn't have fits installed, and it's not relevant to the test.
+    allow(CharacterizeJob).to receive(:perform_later)
+    allow(CreateDerivativesJob).to receive(:perform_later)
+
     sign_in user
   end
 
@@ -15,4 +26,53 @@ RSpec.describe 'Batch creation of works', type: :feature do
     end
     expect(page).to have_content("Each file will be uploaded to a separate new work resulting in one work per uploaded file.")
   end
+
+  context 'when the user is a proxy', :js, :workflow do
+    let(:second_user) { create(:user) }
+
+    before do
+      ProxyDepositRights.create!(grantor: second_user, grantee: user)
+      sign_in user
+      click_link 'Works'
+      click_link "Create batch of works"
+      choose "payload_concern", option: "GenericWork"
+      click_button 'Create work'
+    end
+
+    it "allows on-behalf-of batch deposit", :js do
+      click_link "Files" # switch tab
+      expect(page).to have_content "Add files"
+      within('span#addfiles') do
+        # two arbitrary files that aren't actually related, but should be
+        # small enough to require minimal processessing.
+        attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/small_file.txt", visible: false)
+        attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/png_fits.xml", visible: false)
+      end
+      click_link "Descriptions" # switch tab
+      fill_in('Creator', with: 'Doe, Jane')
+      fill_in('Keyword', with: 'testing')
+      select('In Copyright', from: 'Rights statement')
+      # With selenium and the chrome driver, focus remains on the
+      # select box. Click outside the box so the next line can't find
+      # its element
+      find('body').click
+
+      choose('batch_upload_item_visibility_open')
+      expect(page).to have_content('Please note, making something visible to the world (i.e. marking this as Public) may be viewed as publishing which could impact your ability to')
+      select(second_user.user_key, from: 'On behalf of')
+      check('agreement')
+      click_on('Save')
+
+      # Expect the proxy depositor (grantor) to be able to see both uploaded files.
+      expect(page).to have_content 'small_file.txt'
+      expect(page).to have_content 'png_fits.xml'
+
+      # Sign in with the grantee user, and expect to see the works deposited
+      # on their behalf.
+      sign_in second_user
+      click_link 'Works'
+      expect(page).to have_content 'small_file.txt'
+      expect(page).to have_content 'png_fits.xml'
+    end
+  end
 end

data/spec/features/batch_edit_spec.rb

@@ -65,6 +65,7 @@ RSpec.describe 'batch', type: :feature, clean_repo: true, js: true do
   describe 'deleting' do
     it 'destroys the selected works' do
       accept_confirm { click_button 'Delete Selected' }
+      expect(page).to have_content('Batch delete complete')
       expect(GenericWork.count).to be_zero
     end
   end

data/spec/features/browse_dashboard_works_spec.rb

@@ -50,6 +50,7 @@ RSpec.describe "Browse Dashboard", type: :feature do
     first('input#check_all').click
     expect do
       accept_confirm { click_button('Delete Selected') }
+      expect(page).to have_content('Batch delete complete')
     end.to change { GenericWork.count }.by(-3)
   end
 end

data/spec/features/collection_multi_membership_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_repo: true, js: true, with_nested_reindexing: true do
+RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_repo: true, js: true do
   let(:admin_user) { create(:admin, email: 'admin@example.com') }
   let(:single_membership_type_1) { create(:collection_type, :not_allow_multiple_membership, title: 'Single-membership 1') }
   let(:single_membership_type_2) { create(:collection_type, :not_allow_multiple_membership, title: 'Single-membership 2') }
@@ -94,8 +94,10 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
             click_button 'Save changes'
           end
           # forwards to collections index page and shows flash message
-          expect(page).to have_link 'All Collections'
-          expect(page).to have_link 'Your Collections'
+          within('section.tabs-row') do
+            expect(page).to have_link 'All Collections'
+            expect(page).to have_link 'Your Collections'
+          end
 
           err_message = "Error: You have specified more than one of the same single-membership collection types: " \
                         "Single-membership 1 (#{new_collection.title.first} and #{old_collection.title.first})"
@@ -129,9 +131,10 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
             click_button 'Save changes'
           end
           # forwards to collections index page and shows flash message
-          expect(page).to have_link 'All Collections'
-          expect(page).to have_link 'Your Collections'
-
+          within('section.tabs-row') do
+            expect(page).to have_link 'All Collections'
+            expect(page).to have_link 'Your Collections'
+          end
           err_message = "Error: You have specified more than one of the same single-membership collection types: " \
                         "Single-membership 1 (#{new_collection.title.first} and #{old_collection.title.first})"
           expect(page).to have_selector '.alert', text: err_message

data/spec/features/collection_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'collection', type: :feature, with_nested_reindexing: true do
+RSpec.describe 'collection', type: :feature, clean_repo: true do
   let(:user) { create(:user) }
 
   let(:collection1) { create(:public_collection, user: user) }

data/spec/features/collection_type_spec.rb

@@ -69,6 +69,50 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
       expect(page).to have_link('Settings', href: '#settings')
       expect(page).to have_link('Participants', href: '#participants')
     end
+
+    it 'tries to make a collection type with existing title, and receives error message', :js do
+      click_link 'Create new collection type'
+
+      expect(page).to have_content 'Create New Collection Type'
+
+      # confirm only Description tab is visible
+      expect(page).to have_link('Description', href: '#metadata')
+      expect(page).not_to have_link('Settings', href: '#settings')
+      expect(page).not_to have_link('Participants', href: '#participants')
+
+      # confirm metadata fields exist
+      expect(page).to have_selector 'input#collection_type_title'
+      expect(page).to have_selector 'textarea#collection_type_description'
+
+      # set values and save
+      fill_in('Type name', with: title)
+      fill_in('Type description', with: description)
+
+      click_button('Save')
+
+      visit '/admin/collection_types'
+      click_link 'Create new collection type'
+
+      expect(page).to have_content 'Create New Collection Type'
+
+      # confirm only Description tab is visible
+      expect(page).to have_link('Description', href: '#metadata')
+      expect(page).not_to have_link('Settings', href: '#settings')
+      expect(page).not_to have_link('Participants', href: '#participants')
+
+      # confirm metadata fields exist
+      expect(page).to have_selector 'input#collection_type_title'
+      expect(page).to have_selector 'textarea#collection_type_description'
+
+      # set values and save
+      fill_in('Type name', with: title)
+      fill_in('Type description', with: description)
+
+      click_button('Save')
+
+      # Confirm error message is displayed.
+      expect(page).to have_content 'Save was not successful because title has already been taken, and machine_id has already been taken.'
+    end
   end
 
   describe 'edit collection type' do
@@ -112,6 +156,7 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
 
         # confirm all non-admin_set checkboxes are on
         expect(page).to have_checked_field('collection_type_nestable')
+        expect(page).to have_checked_field('collection_type_brandable')
         expect(page).to have_checked_field('collection_type_discoverable')
         expect(page).to have_checked_field('collection_type_sharable')
         expect(page).to have_checked_field('collection_type_share_applies_to_new_works')
@@ -123,13 +168,14 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
         expect(page).to have_unchecked_field('collection_type_assigns_visibility', disabled: true)
 
         # change settings
-        page.uncheck('NESTABLE')
+        page.uncheck('NESTING')
         page.uncheck('DISCOVERY')
         page.check('APPLY TO NEW WORKS')
         page.uncheck('MULTIPLE MEMBERSHIP')
 
         # confirm all non-admin_set checkboxes are now off
         expect(page).to have_unchecked_field('collection_type_nestable')
+        expect(page).to have_checked_field('collection_type_brandable')
         expect(page).to have_unchecked_field('collection_type_discoverable')
         expect(page).to have_checked_field('collection_type_sharable')
         expect(page).to have_checked_field('collection_type_share_applies_to_new_works')
@@ -187,6 +233,7 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
 
           # confirm default user collection checkboxes are set to appropriate values
           expect(page).to have_checked_field('collection_type_nestable', disabled: true)
+          expect(page).to have_checked_field('collection_type_brandable', disabled: true)
           expect(page).to have_checked_field('collection_type_discoverable', disabled: true)
           expect(page).to have_checked_field('collection_type_sharable', disabled: true)
           expect(page).to have_unchecked_field('collection_type_share_applies_to_new_works', disabled: true)
@@ -260,6 +307,7 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
 
         # confirm all checkboxes are disabled
         expect(page).to have_field('collection_type_nestable', disabled: true)
+        expect(page).to have_field('collection_type_brandable', disabled: true)
         expect(page).to have_field('collection_type_discoverable', disabled: true)
         expect(page).to have_field('collection_type_sharable', disabled: true)
         expect(page).to have_field('collection_type_share_applies_to_new_works', disabled: true)

data/spec/features/create_work_admin_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'Creating a new Work as admin', :js, :workflow do
                        edit_users: [user.user_key])
   end
   let(:admin_set_2) do
-    create(:admin_set, title: ["Second Admin Set"],
+    create(:admin_set, title: ["Another Admin Set"],
                        description: ["A description"],
                        edit_users: [user.user_key])
   end
@@ -35,7 +35,7 @@ RSpec.describe 'Creating a new Work as admin', :js, :workflow do
       click_button 'Create work'
       click_link "Relationship" # switch tab
       expect(page).to have_content('Administrative Set')
-      expect(page).to have_content('Second Admin Set')
+      expect(page).to have_content('Another Admin Set')
       expect(page).to have_content('Default Admin Set')
       expect(page).to have_selector('select#generic_work_admin_set_id')
       expect(page).to have_select('generic_work_admin_set_id', selected: 'Default Admin Set')

data/spec/features/create_work_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe 'Creating a new Work', :js, :workflow do
   let(:user) { create(:user) }
+  let!(:ability) { ::Ability.new(user) }
   let(:file1) { File.open(fixture_path + '/world.png') }
   let(:file2) { File.open(fixture_path + '/image.jp2') }
   let!(:uploaded_file1) { Hyrax::UploadedFile.create(file: file1, user: user) }

data/spec/features/dashboard/all_works.rb

@@ -1,6 +1,8 @@
 RSpec.describe "As an admin user I should be able to see all works" do
-  let!(:work1) { create(:work, title: ['Testing #1']) }
-  let!(:work2) { create(:work, title: ['Testing #2']) }
+  let!(:work1) { create(:work, title: ['Testing #1'], admin_set: adminset, member_of_collections: [collection]) }
+  let!(:work2) { create(:work, title: ['Testing #2'], admin_set: adminset, member_of_collections: [collection]) }
+  let(:collection) { build(:collection_lw, with_solr_document: true) }
+  let(:adminset) { create(:admin_set) }
 
   before do
     sign_in create(:admin)
@@ -10,5 +12,11 @@ RSpec.describe "As an admin user I should be able to see all works" do
     expect(page).to have_content 'Works'
     expect(page).to have_content 'Testing #1'
     expect(page).to have_content 'Testing #2'
+
+    # check for filters
+    expect(page).to have_button('Collection')
+    expect(page).to have_link(collection.title.first, class: 'facet_select')
+    expect(page).to have_button('Admin Set')
+    expect(page).to have_link(adminset.title.first, class: 'facet_select')
   end
 end

data/spec/features/dashboard/collection_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe 'collection', type: :feature, clean_repo: true do
+  include Selectors::Dashboard
+
   let(:user) { create(:user) }
   let(:admin_user) { create(:admin) }
   let(:collection_type) { create(:collection_type, creator_user: user) }
@@ -37,7 +39,9 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       it "has page title, does not have tabs, and lists only user's collections" do
         expect(page).to have_content 'Collections'
         expect(page).not_to have_link 'All Collections'
-        expect(page).not_to have_link 'Your Collections'
+        within('section.tabs-row') do
+          expect(page).not_to have_link 'Your Collections'
+        end
         expect(page).to have_link(collection1.title.first)
         expect(page).to have_link(collection2.title.first)
         expect(page).to have_link(admin_set_b.title.first)
@@ -85,7 +89,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         visit '/dashboard/my/collections'
       end
 
-      it "has page title, has tabs for All and Your Collections, and lists collections with edit access" do
+      it "has page title, has tabs for All Collections and Your Collections, and lists collections with edit access" do
         expect(page).to have_content 'Collections'
         expect(page).to have_link 'All Collections'
         expect(page).to have_link 'Your Collections'
@@ -128,7 +132,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       visit '/dashboard/my/collections'
     end
 
-    it 'lists all collections for all users', with_nested_reindexing: true do
+    it 'lists all collections for all users' do
       expect(page).to have_link 'All Collection'
       click_link 'All Collections'
       expect(page).to have_link(collection1.title.first)
@@ -293,6 +297,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
     end
   end
 
+  # TODO: this section is still deactivated
   describe "adding works to a collection", skip: "we need to define a dashboard/works path" do
     let!(:collection) { create!(:collection, title: ["Barrel of monkeys"], user: user, with_permission_template: true) }
     let!(:work1) { create(:work, title: ["King Louie"], user: user) }
@@ -531,7 +536,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
     end
   end
 
-  describe 'collection show page', with_nested_reindexing: true do
+  describe 'collection show page' do
     let(:collection) do
       create(:public_collection, user: user, description: ['collection description'], create_access: true)
     end
@@ -662,7 +667,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
   end
 
   # TODO: this is just like the block above. Merge them.
-  describe 'show pages of a collection', with_nested_reindexing: true do
+  describe 'show pages of a collection' do
     before do
       docs = (0..12).map do |n|
         { "has_model_ssim" => ["GenericWork"], :id => "zs25x871q#{n}",
@@ -690,7 +695,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
   end
 
   describe 'remove works from collection' do
-    context 'user that can edit', :with_nested_reindexing do
+    context 'user that can edit' do
       let!(:work2) { create(:work, title: ["King Louie"], member_of_collections: [collection1], user: user) }
       let!(:work1) { create(:work, title: ["King Kong"], member_of_collections: [collection1], user: user) }
 
@@ -779,14 +784,6 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           expect(page).to have_field('collection_title', with: collection.title.first)
           expect(page).to have_field('collection_description', with: collection.description.first)
 
-          # TODO: These two expectations require the spec to include with_nested_reindexing: true.
-          # However, adding nested indexing causes this spec to fail to go through the update method
-          # in the controller unless js: true is also included. Including javascript greatly increases
-          # the time required for the spec to complete, so for now, I am simply commenting out these
-          # two expectations, as these are not integral to the function being tested.
-          # expect(page).to have_content(work1.title.first)
-          # expect(page).to have_content(work2.title.first)
-
           new_title = "Altered Title"
           new_description = "Completely new Description text."
           creators = ["Dorje Trollo", "Vajrayogini"]
@@ -832,9 +829,19 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         sign_in user
       end
 
-      it 'always includes branding' do
-        visit "/dashboard/collections/#{collection.id}/edit"
-        expect(page).to have_link('Branding', href: '#branding')
+      context 'with brandable set' do
+        let(:brandable_collection_id) { create(:collection, user: user, collection_type_settings: [:brandable], create_access: true).id }
+        let(:not_brandable_collection_id) { create(:collection, user: user, collection_type_settings: [:not_brandable], create_access: true).id }
+
+        it 'to true, it shows Branding tab' do
+          visit "/dashboard/collections/#{brandable_collection_id}/edit"
+          expect(page).to have_link('Branding', href: '#branding')
+        end
+
+        it 'to false, it hides Branding tab' do
+          visit "/dashboard/collections/#{not_brandable_collection_id}/edit"
+          expect(page).not_to have_link('Branding', href: '#branding')
+        end
       end
 
       context 'with discoverable set' do
@@ -861,6 +868,20 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           expect(page).to have_link('Sharing', href: '#sharing')
         end
 
+        context "to true, limits available users", js: true do
+          let(:user2) { create(:user) }
+          it "to system users filted by select2" do
+            visit "/dashboard/collections/#{sharable_collection_id}/edit"
+            expect(page).to have_link('Sharing', href: '#sharing')
+            click_link('Sharing')
+            expect(page).to have_selector(".form-inline.add-users .select2-container")
+            select_user(user2, 'Depositor')
+            click_button('Save')
+            click_link('Sharing')
+            expect(page).to have_selector('td', text: user2.user_key)
+          end
+        end
+
         it 'to false, it hides Sharable tab' do
           visit "/dashboard/collections/#{not_sharable_collection_id}/edit"
           expect(page).not_to have_link('Sharing', href: '#sharing')