hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/spec/controllers/hyrax/homepage_controller_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe Hyrax::HomepageController, type: :controller do
     it "includes only GenericWork objects in recent documents" do
       get :index
       assigns(:recent_documents).each do |doc|
-        expect(doc[ActiveFedora.index_field_mapper.solr_name("has_model", :symbol)]).to eql ["GenericWork"]
+        expect(doc["has_model_ssim"]).to eql ["GenericWork"]
       end
     end
 
@@ -60,8 +60,8 @@ RSpec.describe Hyrax::HomepageController, type: :controller do
         old_to_solr = gw3.method(:to_solr)
         allow(gw3).to receive(:to_solr) do
           old_to_solr.call.merge(
-            ActiveFedora.index_field_mapper.solr_name('system_create', :stored_sortable, type: :date) => 1.day.ago.iso8601,
-            ActiveFedora.index_field_mapper.solr_name('date_uploaded', :stored_sortable, type: :date) => 1.day.ago.iso8601
+            "system_create_dtsi" => 1.day.ago.iso8601,
+            "date_uploaded_dtsi" => 1.day.ago.iso8601
           )
         end
         gw3.save

data/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb

@@ -19,8 +19,7 @@ RSpec.describe Hyrax::SingleUseLinksViewerController do
     let(:download_link_hash) { download_link.download_key }
 
     describe "GET 'download'" do
-      let(:expected_content) { ActiveFedora::Base.find(file.id).original_file.content }
-
+      let(:expected_content) { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: file.id, use_valkyrie: false).original_file.content }
       it "downloads the file and deletes the link from the database" do
         expect(controller).to receive(:send_file_headers!).with(filename: 'world.png', disposition: 'attachment', type: 'image/png')
         get :download, params: { id: download_link_hash }

data/spec/factories/admin_sets_lw.rb

@@ -187,7 +187,7 @@ FactoryBot.define do
     # @param [Class] evaluator holding the transient properties for the current build/creation process
     def self.process_with_solr_document(adminset, evaluator, creator_only = false)
       return unless creator_only || evaluator.with_solr_document
-      ActiveFedora::SolrService.add(solr_document_with_permissions(adminset, evaluator, creator_only), commit: true)
+      Hyrax::SolrService.add(solr_document_with_permissions(adminset, evaluator, creator_only), commit: true)
     end
 
     # Return the admin set's solr document with permissions added, such that...

data/spec/factories/collections.rb

@@ -302,7 +302,7 @@ FactoryBot.define do
     def self.process_with_solr_document(collection, evaluator)
       return unless evaluator.with_solr_document
       return if evaluator.with_nesting_attributes.present? && collection.nestable? # will create the solr document there instead
-      ActiveFedora::SolrService.add(solr_document_with_permissions(collection, evaluator), commit: true)
+      Hyrax::SolrService.add(solr_document_with_permissions(collection, evaluator), commit: true)
     end
 
     # Return the collection's solr document with permissions added, such that...

data/spec/factories/hyrax_embargo.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :hyrax_embargo, class: "Hyrax::Embargo" do
+    embargo_release_date      { Time.zone.today + 10 }
+    visibility_after_embargo  { 'open' }
+    visibility_during_embargo { 'authenticated' }
+
+    to_create do |instance|
+      Valkyrie.config.metadata_adapter.persister.save(resource: instance)
+    end
+
+    trait :expired do
+      embargo_release_date { Time.zone.today - 1 }
+    end
+  end
+end

data/spec/factories/hyrax_lease.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :hyrax_lease, class: "Hyrax::Lease" do
+    lease_expiration_date   { Time.zone.today + 10 }
+    visibility_after_lease  { 'authenticated' }
+    visibility_during_lease { 'open' }
+
+    to_create do |instance|
+      Valkyrie.config.metadata_adapter.persister.save(resource: instance)
+    end
+
+    trait :expired do
+      lease_expiration_date { Time.zone.today - 1 }
+    end
+  end
+end

data/spec/factories/hyrax_resource.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :hyrax_resource, class: "Hyrax::Resource" do
+    to_create do |instance|
+      Valkyrie.config.metadata_adapter.persister.save(resource: instance)
+    end
+
+    trait :under_embargo do
+      association :embargo, factory: :hyrax_embargo
+    end
+
+    trait :under_lease do
+      association :lease, factory: :hyrax_lease
+    end
+  end
+end

data/spec/factory_tests/adminsets_factory_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe 'AdminSets Factory' do # rubocop:disable RSpec/DescribeClass
       context 'true' do
         let(:adminset) { build(:adminset_lw, with_solr_document: true) }
 
-        subject { ActiveFedora::SolrService.get("id:#{adminset.id}")["response"]["docs"].first }
+        subject { Hyrax::SolrService.get("id:#{adminset.id}")["response"]["docs"].first }
 
         it 'will create a solr document' do
           expect(subject["id"]).to eq adminset.id
@@ -53,7 +53,7 @@ RSpec.describe 'AdminSets Factory' do # rubocop:disable RSpec/DescribeClass
                                                           view_users: [user_vw] })
         end
 
-        subject { ActiveFedora::SolrService.get("id:#{adminset.id}")["response"]["docs"].first }
+        subject { Hyrax::SolrService.get("id:#{adminset.id}")["response"]["docs"].first }
 
         it 'will created a solr document' do
           expect(subject["id"]).to eq adminset.id
@@ -79,7 +79,7 @@ RSpec.describe 'AdminSets Factory' do # rubocop:disable RSpec/DescribeClass
 
   describe 'default_adminset' do
     let(:default_adminset) { build(:default_adminset) }
-    let(:solrdoc) { ActiveFedora::SolrService.get("id:#{default_adminset.id}")["response"]["docs"].first }
+    let(:solrdoc) { Hyrax::SolrService.get("id:#{default_adminset.id}")["response"]["docs"].first }
     let(:permission_template) { default_adminset.permission_template }
 
     it 'will create the default adminset with expected metadata' do
@@ -111,7 +111,7 @@ RSpec.describe 'AdminSets Factory' do # rubocop:disable RSpec/DescribeClass
         view_users: [user_vw] }
     end
     let(:legacy_adminset) { build(:no_solr_grants_adminset, user: user, with_permission_template: permissions) }
-    let(:solrdoc) { ActiveFedora::SolrService.get("id:#{legacy_adminset.id}")["response"]["docs"].first }
+    let(:solrdoc) { Hyrax::SolrService.get("id:#{legacy_adminset.id}")["response"]["docs"].first }
 
     it 'will create a permission template with all access' do
       expect { build(:no_solr_grants_adminset, user: user, with_permission_template: permissions) }

data/spec/factory_tests/collections_factory_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
       context 'true' do
         let(:col) { build(:collection_lw, with_solr_document: true) }
 
-        subject { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
+        subject { Hyrax::SolrService.get("id:#{col.id}")["response"]["docs"].first }
 
         it 'will create a solr document' do
           expect(subject["id"]).to eq col.id
@@ -85,7 +85,7 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
                                                             view_users: [user_vw] })
         end
 
-        subject { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
+        subject { Hyrax::SolrService.get("id:#{col.id}")["response"]["docs"].first }
 
         it 'will create a solr document' do
           expect(subject["id"]).to eq col.id
@@ -102,7 +102,7 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
       let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
       let(:current_ability) { instance_double(Ability, admin?: true) }
       let(:scope) { double('Scope', can?: true, current_ability: current_ability, repository: repository, blacklight_config: blacklight_config) }
-      let(:solr_doc) { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
+      let(:solr_doc) { Hyrax::SolrService.get("id:#{col.id}")["response"]["docs"].first }
       let(:nesting_attributes) do
         Hyrax::Collections::NestedCollectionQueryService::NestingAttributes.new(id: col.id, scope: scope)
       end

data/spec/features/actor_stack_spec.rb

@@ -26,6 +26,70 @@ RSpec.describe Hyrax::DefaultMiddlewareStack, :clean_repo do
         .to true
     end
 
+    context 'when adding to a work' do
+      let(:other_work) { FactoryBot.create(:work, user: user) }
+      let(:attributes) { { 'in_works_ids' => [other_work.id] } }
+
+      context 'when the user cannot edit the parent work' do
+        let(:other_work) { FactoryBot.create(:work, user: other_user) }
+        let(:other_user) { FactoryBot.create(:user) }
+
+        it 'fails' do
+          expect { actor.create(env) }
+            .not_to change { other_work.reload.members.to_a }
+            .from be_empty
+        end
+
+        it 'does not create the work' do
+          expect { actor.create(env) }
+            .not_to change { work.persisted? }
+            .from false
+        end
+      end
+
+      it 'adds the work to the parent' do
+        expect { actor.create(env) }
+          .to change { other_work.reload.members.to_a }
+          .from(be_empty)
+          .to contain_exactly(work)
+      end
+    end
+
+    context 'when adding permissions' do
+      before do
+        work.permissions.build(name: 'discover_user', type: 'person', access: 'discover')
+      end
+
+      it 'persists arbitrary ACL permissions' do
+        expect { actor.create(env) }
+          .to change { env.curation_concern.permissions }
+          .to include(grant_permission(:discover).to_user('discover_user'))
+      end
+    end
+
+    context 'when noids are disabled' do
+      let(:uuid_regex) { /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ }
+
+      it 'uses the fedora assigned uuids' do
+        expect { actor.create(env) }
+          .to change { env.curation_concern.id }
+          .to uuid_regex
+      end
+    end
+
+    context 'when noids are enabled' do
+      before(:context) { Hyrax.config.enable_noids = true }
+      after(:context)  { Hyrax.config.enable_noids = false }
+
+      let(:noid_regex) { /^[0-9a-z]+$/ }
+
+      it 'assigns noids' do
+        expect { actor.create(env) }
+          .to change { env.curation_concern.id }
+          .to noid_regex
+      end
+    end
+
     context 'when failing on the way back up the actor stack' do
       before { stack.insert_before(Hyrax::Actors::ModelActor, delayed_failure_actor) }
 

data/spec/features/batch_create_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'Batch creation of works', type: :feature do
     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
+      within('div#add-files') 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)
@@ -47,7 +47,6 @@ RSpec.describe 'Batch creation of works', type: :feature do
       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

data/spec/features/collection_multi_membership_spec.rb

@@ -23,6 +23,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
         visit '/dashboard/my/works'
         check 'check_all'
         click_button 'Add to collection' # opens the modal
+        sleep 5
         select_member_of_collection(new_collection)
         click_button 'Save changes'
 

data/spec/features/collection_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           "nesting_collection__parent_ids_ssim" => [collection.id],
           "edit_access_person_ssim" => [user.user_key] }
       end
-      ActiveFedora::SolrService.add(docs, commit: true)
+      Hyrax::SolrService.add(docs, commit: true)
 
       sign_in user
     end
@@ -108,7 +108,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           "nesting_collection__parent_ids_ssim" => [collection.id],
           "edit_access_person_ssim" => [user.user_key] }
       end
-      ActiveFedora::SolrService.add(docs, commit: true)
+      Hyrax::SolrService.add(docs, commit: true)
 
       sign_in user
     end

data/spec/features/collection_type_spec.rb

@@ -372,6 +372,7 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
           expect(page).to have_content(deny_delete_modal_text)
           click_link('View collections of this type')
         end
+        sleep 3
 
         # forwards to Dashboard -> Collections -> All Collections
         within('li.active') do

data/spec/features/create_work_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Creating a new Work', :js, :workflow do
+RSpec.describe 'Creating a new Work', :js, :workflow, :clean_repo do
   let(:user) { create(:user) }
   let!(:ability) { ::Ability.new(user) }
   let(:file1) { File.open(fixture_path + '/world.png') }
@@ -30,14 +30,13 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
       expect(page).to have_content "Add folder"
-      within('span#addfiles') do
+      within('div#add-files') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
       click_link "Descriptions" # switch tab
       fill_in('Title', with: 'My Test Work')
       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
@@ -71,14 +70,13 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
     it "allows on-behalf-of deposit" do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('span#addfiles') do
+      within('div#add-files') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
       click_link "Descriptions" # switch tab
       fill_in('Title', with: 'My Test Work')
       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
@@ -99,6 +97,17 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
       sign_in second_user
       click_link 'Works'
       expect(page).to have_content "My Test Work"
+
+      # check that user can get to the files
+      click_link "My Test Work"
+      click_link "image.jp2"
+      expect(page).to have_content "image.jp2"
+
+      visit '/dashboard'
+      click_link 'Works'
+      click_link "My Test Work"
+      click_link "jp2_fits.xml"
+      expect(page).to have_content "jp2_fits.xml"
     end
   end
 
@@ -113,7 +122,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
 
     it 'updates the required file check status' do
       click_link "Files" # switch to the Files tab
-      within('span#addfiles') do
+      within('div#add-files') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
       end
       expect(page).to have_css('ul li#required-files.complete', text: 'Add files')

data/spec/features/dashboard/collection_spec.rb

@@ -244,7 +244,6 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         click_on('Create collection')
 
         expect(page).to have_selector('h1', text: 'New User Collection')
-        expect(page).to have_selector "input.collection_title.multi_value"
 
         click_link('Additional fields')
         expect(page).to have_selector "input.collection_creator.multi_value"
@@ -275,7 +274,6 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       it 'makes a new collection' do
         click_link "New Collection"
         expect(page).to have_selector('h1', text: 'New User Collection')
-        expect(page).to have_selector "input.collection_title.multi_value"
 
         click_link('Additional fields')
         expect(page).to have_selector "input.collection_creator.multi_value"
@@ -335,7 +333,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
     let!(:adminset) { create(:admin_set, title: ['Admin Set with Work'], creator: [admin_user.user_key], with_permission_template: true) }
     let!(:work) { create(:work, title: ["King Louie"], admin_set: adminset, member_of_collections: [collection], user: user) }
 
-    # check table row has appropriate data attributes added
+    # Check table row has appropriate data attributes added
     def check_tr_data_attributes(id, type)
       url_fragment = get_url_fragment(type)
       expect(page).to have_selector("tr[data-id='#{id}'][data-colls-hash]")
@@ -343,7 +341,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       expect(page).to have_selector("tr[data-post-delete-url='/#{url_fragment}/#{id}?locale=en']")
     end
 
-    # check data attributes have been transferred from table row to the modal
+    # Check data attributes have been transferred from table row to the modal
     def check_modal_data_attributes(id, type)
       url_fragment = get_url_fragment(type)
       expect(page).to have_selector("div[data-id='#{id}']")
@@ -671,14 +669,14 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
         # add required file
         click_link "Files" # switch tab
-        within('span#addfiles') do
+        within('div#add-files') do
           attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         end
         # set required metadata
         click_link "Descriptions" # switch tab
         fill_in('Title', with: 'New Work for Collection')
         fill_in('Creator', with: 'Doe, Jane')
-        fill_in('Keyword', with: 'testing')
+
         select('In Copyright', from: 'Rights statement')
         # check required acceptance
         check('agreement')
@@ -703,7 +701,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           "nesting_collection__parent_ids_ssim" => [collection.id],
           "edit_access_person_ssim" => [user.user_key] }
       end
-      ActiveFedora::SolrService.add(docs, commit: true)
+      Hyrax::SolrService.add(docs, commit: true)
 
       sign_in user
     end
@@ -829,23 +827,63 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         end
       end
 
-      context 'for an admin set' do
+      context 'edits an admin set' do
+        let!(:confirm_modal_text) { 'Are you sure you want to leave this tab?  Any unsaved data will be lost.' }
+        let!(:new_description) { 'New Description' }
+
         before do
           admin_user
           admin_set_a
           sign_in admin_user
           visit '/dashboard/my/collections'
-        end
-
-        it 'edits admin set', :js do
-          # URL: /dashboard/my/collections
-          expect(page).to have_content(admin_set_a.title.first)
           within("#document_#{admin_set_a.id}") do
             find('button.dropdown-toggle').click
             click_link('Edit collection')
           end
-          # URL: /dashboard/collections/collection-id/edit
+        end
+
+        it "shows edit form" do
           expect(page).to have_selector('h1', text: "Edit Administrative Set: #{admin_set_a.title.first}")
+          expect(page).to have_field('admin_set_description', with: admin_set_a.description.first)
+        end
+
+        it "does not display a confirmation message when form data has not changed" do
+          expect(page).to have_content('Description')
+          click_link 'Participants'
+          expect(page).to have_selector('#nav-safety-modal', visible: false)
+        end
+
+        it "displays a confirmation when form data has changed" do
+          page.fill_in('Description', with: new_description)
+          click_link('Workflow')
+          within('#nav-safety-modal') do
+            expect(page).to have_content(confirm_modal_text)
+          end
+        end
+
+        it "changes tab when user dismisses the confirmation by clicking OK" do
+          page.fill_in('Description', with: new_description)
+          click_link('Workflow')
+          within('#nav-safety-modal') do
+            expect(page).to have_content(confirm_modal_text)
+          end
+          within("#nav-safety-modal") do
+            click_button('OK')
+          end
+          expect(page).to have_selector('#nav-safety-modal', visible: false)
+          expect(page).to have_selector('#form_workflows')
+        end
+
+        it "does not redisplay the confirmation unless form data is changed" do
+          expect(page).to have_selector('#description', class: 'active')
+          expect(page).not_to have_selector('#workflow', class: 'active')
+          fill_in('Description', with: new_description)
+          click_link 'Workflow'
+          within('#nav-safety-modal') do
+            click_button('OK')
+          end
+          click_link 'Description'
+          expect(page).to have_selector('#nav-safety-modal', visible: false)
         end
       end
     end
@@ -914,5 +952,56 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         end
       end
     end
+
+    context "navigate through tabs", js: true do
+      let!(:empty_collection) { create(:public_collection_lw, title: ['Empty Collection'], user: user, with_permission_template: true) }
+      let(:collection_id) { create(:collection_lw, user: user, collection_type_settings: [:brandable, :discoverable, :sharable], with_permission_template: true).id }
+      let!(:confirm_modal_text) { 'Are you sure you want to leave this tab?  Any unsaved data will be lost.' }
+      let!(:new_description) { 'New Description' }
+
+      before do
+        sign_in user
+        visit "/dashboard/collections/#{collection_id}/edit"
+      end
+
+      it "does not display a confirmation message when form data has not changed" do
+        expect(page).to have_selector('#description', class: 'active')
+        expect(page).to have_content('Description')
+        click_link 'Branding'
+        expect(page).not_to have_content(confirm_modal_text)
+      end
+
+      it "displays a confirmation when form data has changed" do
+        fill_in('Description', with: new_description)
+        click_link('Sharing')
+        within('#nav-safety-modal') do
+          expect(page).to have_content(confirm_modal_text)
+        end
+      end
+
+      it "changes tab when user dismisses the confirmation by clicking OK" do
+        fill_in('Description', with: new_description)
+        click_link('Sharing')
+        within('#nav-safety-modal') do
+          expect(page).to have_content(confirm_modal_text)
+        end
+        within("#nav-safety-modal") do
+          click_button('OK')
+        end
+        expect(page).to have_selector('#sharing', class: 'active')
+      end
+
+      it "does not redisplay the confirmation unless form data is changed" do
+        expect(page).to have_selector('#description', class: 'active')
+        expect(page).not_to have_selector('#discovery', class: 'active')
+        fill_in('Description', with: new_description)
+        click_link 'Discovery'
+        within('#nav-safety-modal') do
+          click_button('OK')
+        end
+        click_link 'Description'
+        expect(page).not_to have_content(confirm_modal_text)
+      end
+    end
   end
 end