hyrax 2.1.0.beta2 → 2.1.0.rc1

data/spec/factory_tests/adminsets_factory_spec.rb

@@ -0,0 +1,132 @@
+RSpec.describe 'AdminSets Factory' do # rubocop:disable RSpec/DescribeClass
+  let(:user) { build(:user, email: 'user@example.com') }
+  let(:user_mgr) { build(:user, email: 'user_mgr@example.com') }
+  let(:user_dep) { build(:user, email: 'user_dep@example.com') }
+  let(:user_vw) { build(:user, email: 'user_vw@example.com') }
+
+  describe 'build' do
+    context 'with_permission_template' do
+      it 'will not create a permission template or access when it is the default value of false' do
+        expect { build(:adminset_lw) }.not_to change { Hyrax::PermissionTemplate.count }
+        expect { build(:adminset_lw) }.not_to change { Hyrax::PermissionTemplateAccess.count }
+      end
+
+      it 'will create a permission template and one access for the creating user when set to true' do
+        expect { build(:adminset_lw, with_permission_template: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:adminset_lw, with_permission_template: true) }.to change { Hyrax::PermissionTemplateAccess.count }.by(1)
+      end
+
+      it 'will create a permission template and access for each user specified when it is set to attributes identifying access' do
+        expect { build(:adminset_lw, with_permission_template: { manage_users: [user_mgr] }) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:adminset_lw, with_permission_template: { manage_users: [user_mgr] }) }.to change { Hyrax::PermissionTemplateAccess.count }.by(2)
+        expect { build(:adminset_lw, with_permission_template: { manage_users: [user_mgr], deposit_users: [user_dep], view_users: [user_vw] }) }
+          .to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { build(:adminset_lw, with_permission_template: { manage_users: [user_mgr], deposit_users: [user_dep], view_users: [user_vw] }) }
+          .to change { Hyrax::PermissionTemplateAccess.count }.by(4)
+      end
+    end
+
+    context 'with_solr_document' do
+      it 'will not create a solr document by default' do
+        adminset = build(:adminset_lw)
+        expect(adminset.id).to eq nil # no real way to confirm a solr document wasn't created if the admin set doesn't have an id
+      end
+
+      context 'true' do
+        let(:adminset) { build(:adminset_lw, with_solr_document: true) }
+
+        subject { ActiveFedora::SolrService.get("id:#{adminset.id}")["response"]["docs"].first }
+
+        it 'will create a solr document' do
+          expect(subject["id"]).to eq adminset.id
+          expect(subject["has_model_ssim"].first).to eq "AdminSet"
+          expect(subject["edit_access_person_ssim"]).not_to be_blank
+        end
+      end
+
+      context 'true and with_permission_template defines additional access' do
+        let(:adminset) do
+          build(:adminset_lw, user: user,
+                              with_solr_document: true,
+                              with_permission_template: { manage_users: [user_mgr],
+                                                          deposit_users: [user_dep],
+                                                          view_users: [user_vw] })
+        end
+
+        subject { ActiveFedora::SolrService.get("id:#{adminset.id}")["response"]["docs"].first }
+
+        it 'will created a solr document' do
+          expect(subject["id"]).to eq adminset.id
+          expect(subject["has_model_ssim"].first).to eq "AdminSet"
+          expect(subject["edit_access_person_ssim"]).to include(user.user_key, user_mgr.user_key)
+          expect(subject["read_access_person_ssim"]).to include(user_dep.user_key, user_vw.user_key)
+        end
+      end
+    end
+  end
+
+  describe 'create' do
+    # with_solr_document is tested by build
+    # with_permission_template is tested by build except that the permission template is always created for `create`
+
+    context 'with_permission_template: false' do
+      it 'will create a permission template and access even when it is the default value of false' do
+        expect { create(:adminset_lw) }.to change { Hyrax::PermissionTemplate.count }.by(1)
+        expect { create(:adminset_lw) }.to change { Hyrax::PermissionTemplateAccess.count }.by(1)
+      end
+    end
+  end
+
+  describe 'default_adminset' do
+    let(:default_adminset) { build(:default_adminset) }
+    let(:solrdoc) { ActiveFedora::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
+      expect(default_adminset.id).to eq AdminSet::DEFAULT_ID
+      expect(default_adminset.title).to eq AdminSet::DEFAULT_TITLE
+    end
+
+    it 'will create solr doc with no access' do
+      expect(solrdoc["id"]).to eq default_adminset.id
+      expect(solrdoc["has_model_ssim"].first).to eq "AdminSet"
+      expect(solrdoc["edit_access_person_ssim"].count).to eq 1 # creator automatically assigned by factory
+      expect(solrdoc["read_access_person_ssim"]).to eq nil
+      expect(solrdoc["edit_access_group_ssim"]).to include(::Ability.admin_group_name)
+      expect(solrdoc["read_access_group_ssim"]).to eq nil
+    end
+
+    it 'will create permission template with registered users as depositors' do
+      expect(permission_template.agent_ids_for(access: 'deposit', agent_type: 'group'))
+        .to include(::Ability.registered_group_name)
+      expect(permission_template.agent_ids_for(access: 'manage', agent_type: 'group'))
+        .to include(::Ability.admin_group_name)
+    end
+  end
+
+  describe 'build no_solr_grants_adminset' do
+    let(:permissions) do
+      { manage_users: [user_mgr],
+        deposit_users: [user_dep],
+        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 }
+
+    it 'will create a permission template with all access' do
+      expect { build(:no_solr_grants_adminset, user: user, with_permission_template: permissions) }
+        .to change { Hyrax::PermissionTemplate.count }.by(1)
+      expect { build(:no_solr_grants_adminset, user: user, with_permission_template: permissions) }
+        .to change { Hyrax::PermissionTemplateAccess.count }.by(4)
+    end
+
+    it 'will create solr doc with creator access only' do
+      expect(solrdoc["id"]).to eq legacy_adminset.id
+      expect(solrdoc["has_model_ssim"].first).to eq "AdminSet"
+      expect(solrdoc["edit_access_person_ssim"]).to eq [user.user_key]
+      expect(solrdoc["read_access_person_ssim"]).to eq nil
+      expect(solrdoc["edit_access_group_ssim"]).to eq nil
+      expect(solrdoc["read_access_group_ssim"]).to eq nil
+    end
+  end
+end

data/spec/factory_tests/collections_factory_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
     end
 
     context 'with_solr_document' do
-      it 'will not created a solr document by default' do
+      it 'will not create a solr document by default' do
         col = build(:collection_lw)
         expect(col.id).to eq nil # no real way to confirm a solr document wasn't created if the collection doesn't have an id
       end
@@ -69,7 +69,7 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
 
         subject { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
 
-        it 'will created a solr document' do
+        it 'will create a solr document' do
           expect(subject["id"]).to eq col.id
           expect(subject["has_model_ssim"].first).to eq "Collection"
           expect(subject["edit_access_person_ssim"]).not_to be_blank
@@ -87,7 +87,7 @@ RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
 
         subject { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
 
-        it 'will created a solr document' do
+        it 'will create a solr document' do
           expect(subject["id"]).to eq col.id
           expect(subject["has_model_ssim"].first).to eq "Collection"
           expect(subject["edit_access_person_ssim"]).to include(user.user_key, user_mgr.user_key)

data/spec/features/batch_create_spec.rb

@@ -10,13 +10,7 @@ RSpec.describe 'Batch creation of works', type: :feature do
           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
+  before { sign_in user }
 
   it "renders the batch create form" do
     visit hyrax.new_batch_upload_path
@@ -27,10 +21,13 @@ RSpec.describe 'Batch creation of works', type: :feature do
     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
+  context 'when the user is a proxy', :js, :workflow, :perform_enqueued do
     let(:second_user) { create(:user) }
 
     before do
+      allow(CharacterizeJob).to receive(:perform_later).and_return(true)
+      allow(CreateDerivativesJob).to receive(:perform_later).and_return(true)
+
       ProxyDepositRights.create!(grantor: second_user, grantee: user)
       sign_in user
       click_link 'Works'

data/spec/features/batch_edit_spec.rb

@@ -2,10 +2,16 @@
 
 RSpec.describe 'batch', type: :feature, clean_repo: true, js: true do
   let(:current_user) { create(:user) }
-  let!(:work1)       { create(:public_work, user: current_user) }
-  let!(:work2)       { create(:public_work, user: current_user) }
+  let(:admin_set) { create(:admin_set) }
+  let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
+  let!(:workflow) { create(:workflow, allows_access_grant: true, active: true, permission_template_id: permission_template.id) }
+
+  let!(:work1)       { create(:public_work, admin_set_id: admin_set.id, user: current_user, members: [file_set]) }
+  let!(:work2)       { create(:public_work, admin_set_id: admin_set.id, user: current_user) }
+  let!(:file_set)    { create(:file_set) }
 
   before do
+    RoleMapper.byname[current_user.user_key] << 'donor'
     sign_in current_user
     visit '/dashboard/my/works'
     check 'check_all'
@@ -60,6 +66,47 @@ RSpec.describe 'batch', type: :feature, clean_repo: true, js: true do
         page.find("input#generic_work_related_url[value='NEW related_url']")
       end
     end
+
+    it 'updates permissions and roles' do
+      click_on 'batch-edit'
+      find('#edit_permissions_link').click
+      expect(page).to have_content('Batch Edit Descriptions')
+
+      # Set visibility to private
+      within "#form_permissions_visibility" do
+        batch_edit_expand('permissions_visibility')
+        find('#generic_work_visibility_authenticated').click
+        find('#permissions_visibility_save').click
+        # This was `expect(page).to have_content 'Changes Saved'`, however in debugging,
+        # the `have_content` check was ignoring the `within` scoping and finding
+        # "Changes Saved" for other field areas
+        find('.status', text: 'Changes Saved', wait: 5)
+      end
+
+      within "#form_permissions" do
+        batch_edit_expand('permissions_sharing')
+        page.select('donor', from: 'new_group_name_skel')
+        page.select('View/Download', from: 'new_group_permission_skel')
+        page.find('#add_new_group_skel').click
+        find('#collapse_permissions_sharing table', text: 'View/Download')
+        find('#collapse_permissions_sharing table', text: 'donor')
+        find('#permissions_sharing_save').click
+        # This was `expect(page).to have_content 'Changes Saved'`, however in debugging,
+        # the `have_content` check was ignoring the `within` scoping and finding
+        # "Changes Saved" for other field areas
+        find('.status', text: 'Changes Saved', wait: 5)
+      end
+
+      # Visit work permissions and verify
+      visit "/concern/generic_works/#{work1.id}/edit#share"
+      page.find('#generic_work_visibility_authenticated:checked')
+      page.find('#share table', text: 'donor')
+
+      # Visit file permissions and verify
+      visit "concern/file_sets/#{work1.file_sets.first.id}/edit#permissions_display"
+      page.find('#file_set_visibility_authenticated:checked')
+      page.find('#permissions_display table', text: 'donor')
+    end
   end
 
   describe 'deleting' do

data/spec/features/collection_multi_membership_spec.rb

@@ -1,4 +1,5 @@
 RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_repo: true, js: true do
+  include Selectors::Dashboard
   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') }
@@ -58,7 +59,14 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
 
   describe 'when both collections require single membership' do
     let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
-    let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
+    let!(:work) do
+      create(:generic_work,
+             user: admin_user,
+             member_of_collections: [old_collection],
+             title: ['The highly valued work that everyone wants in their collection'],
+             creator: ["Fred"],
+             keyword: ['test'], rights_statement: ['http://rightsstatements.org/vocab/InC/1.0/'])
+    end
 
     context 'and are of different types' do
       let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_2.gid) }
@@ -99,25 +107,31 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
             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})"
+          err_message = "Error: You have specified more than one of the same single-membership collection type " \
+                        "(type: Single-membership 1, collections: #{new_collection.title.first} and #{old_collection.title.first})"
           expect(page).to have_selector '.alert', text: err_message
         end
 
-        it "from the work's edit form Relationships tab" do
-          skip 'Needs additional work to find and select the second collection'
+        it "from the work's edit form Relationships tab", js: true do
           # Attempt to add to second single-membership collection of the same type
           visit edit_hyrax_generic_work_path(work)
           click_link "Relationships"
-          # TODO: not sure how to find and select the correct collection
 
-          # forwards to work index page and shows flash message
-          expect(page).to have_link 'All Works'
-          expect(page).to have_link 'Your Works'
+          select_collection(new_collection)
+          check('agreement')
+          sleep 3
+          choose('generic_work_visibility_open')
+          sleep 3
 
-          err_message = "Error: You have specified more than one of the same single-membership collection types: " \
-                        "Single-membership 1 (Collection 1 for SM1)"
-          expect(page).to have_selector '.alert', text: err_message
+          within('div#savewidget') do
+            element = nil
+            all('input').each { |i| element = i if i.value == 'Save changes' }
+            element.click
+          end
+
+          err_message = "Error: You have specified more than one of the same single-membership collection type " \
+                        "(type: Single-membership 1, collections: #{old_collection.title.first} and #{new_collection.title.first})"
+          expect(page).to have_selector '.help-block', text: err_message
         end
 
         it "from the collection's show page Add to collection" do
@@ -135,8 +149,9 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
             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})"
+
+          err_message = "Error: You have specified more than one of the same single-membership collection type " \
+                        "(type: Single-membership 1, collections: #{new_collection.title.first} and #{old_collection.title.first})"
           expect(page).to have_selector '.alert', text: err_message
         end
       end

data/spec/features/collection_type_spec.rb

@@ -323,13 +323,14 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
     context 'when there are no collections of this type' do
       let!(:empty_collection_type) { create(:collection_type, title: 'Empty Type', creator_user: admin_user) }
       let!(:delete_modal_text) { 'Deleting this collection type will permanently remove the type and its settings from the repository.  Are you sure you want to delete this collection type?' }
+      let!(:deleted_flash_text) { "The collection type #{empty_collection_type.title} has been deleted." }
 
       before do
         sign_in admin_user
         visit '/admin/collection_types'
       end
 
-      it 'shows warning and deletes collection type', :js do
+      it 'shows warning, deletes collection type, and shows flash message on success', :js do
         expect(page).to have_content(empty_collection_type.title)
 
         find(:xpath, "//tr[td[contains(.,'#{empty_collection_type.title}')]]/td/button", text: 'Delete').click
@@ -339,7 +340,13 @@ RSpec.describe 'collection_type', type: :feature, clean_repo: true do
           click_button('Delete')
         end
 
-        expect(page).not_to have_content(empty_collection_type.title)
+        within('.alert-success') do
+          expect(page).to have_content(deleted_flash_text)
+        end
+
+        within('.collection-types-table') do
+          expect(page).not_to have_content(empty_collection_type.title)
+        end
       end
     end
 

data/spec/features/create_work_admin_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Creating a new Work as admin', :js, :workflow do
+RSpec.describe 'Creating a new Work as admin', :js, :workflow, perform_enqueued: [AttachFilesToWorkJob, IngestJob] do
   let(:user) { create(:admin) }
   let(:admin_set_1) do
     create(:admin_set, id: AdminSet::DEFAULT_ID,

data/spec/features/create_work_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
     end
   end
 
-  context 'when the user is a proxy' do
+  context 'when the user is a proxy', perform_enqueued: [ContentDepositorChangeEventJob, AttachFilesToWorkJob, IngestJob] do
     let(:second_user) { create(:user) }
 
     before do

data/spec/features/dashboard/collection_spec.rb

@@ -424,7 +424,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       end
     end
 
-    context 'when user without permissions selects delete' do
+    context 'when user does not have permission to delete a collection' do
       let(:user2) { create(:user) }
 
       before do
@@ -437,18 +437,22 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         visit '/dashboard/collections' # Managed Collections tab
       end
 
-      it 'does not allow delete collection' do
-        expect(page).to have_content(collection.title.first)
-        check_tr_data_attributes(collection.id, 'collection')
-        within("#document_#{collection.id}") do
-          first('button.dropdown-toggle').click
-          first('.itemtrash').click
-        end
-        expect(page).to have_selector('div#collection-to-delete-deny-modal', visible: true)
-        within('div#collection-to-delete-deny-modal') do
-          click_button('Close')
+      context 'and selects Delete from drop down within table' do
+        it 'does not allow delete collection', js: true do
+          expect(page).to have_content(collection.title.first)
+          check_tr_data_attributes(collection.id, 'collection')
+          within("#document_#{collection.id}") do
+            first('button.dropdown-toggle').click
+            first('.itemtrash').click
+          end
+
+          # Exepct the modal to be shown that explains why the user can't delete the collection.
+          expect(page).to have_selector('div#collection-to-delete-deny-modal', visible: true)
+          within('div#collection-to-delete-deny-modal') do
+            click_button('Close')
+          end
+          expect(page).to have_content(collection.title.first)
         end
-        expect(page).to have_content(collection.title.first)
       end
     end
 

data/spec/features/edit_content_block_admin_spec.rb

@@ -11,35 +11,52 @@ RSpec.describe 'Editing content blocks as admin', :js do
       click_link 'Content Blocks'
     end
 
-    it "gives a confirmation message" do
+    it "does not display a confirmation message when form data has not changed" do
       expect(page).to have_content('Content Blocks')
       expect(page).to have_content('Announcement')
       click_link 'Marketing Text'
-      within('#change-tab-content-block') do
+      expect(page).not_to have_content(confirm_modal_text)
+    end
+
+    it "displays a confirmation message when form data has changed" do
+      expect(page).to have_content('Content Blocks')
+      expect(page).to have_content('Announcement')
+      expect(page).to have_selector('#content_block_announcement_ifr')
+      within_frame('content_block_announcement_ifr') do
+        find('body').set('Updated text.')
+      end
+      click_link 'Marketing Text'
+      within('#nav-safety-modal') do
         expect(page).to have_content(confirm_modal_text)
       end
     end
 
-    it "changes tab when user accept the changing tab confirmation" do
+    it "does not change tab when user dismisses the confirmation" do
       expect(page).to have_selector('#announcement_text', class: 'active')
       expect(page).not_to have_selector('#marketing', class: 'active')
+      within_frame('content_block_announcement_ifr') do
+        find('body').set('Updated text.')
+      end
       click_link 'Marketing Text'
-      within('#change-tab-content-block') do
-        click_link('OK')
+      within('#nav-safety-modal') do
+        click_button('OK')
       end
-      expect(page).to have_selector('#marketing', class: 'active')
-      expect(page).not_to have_selector('#announcement_text', class: 'active')
+      expect(page).not_to have_selector('#marketing', class: 'active')
+      expect(page).to have_selector('#announcement_text', class: 'active')
     end
 
-    it "does not change tab when user cancel the changing tab confirmation" do
+    it "does not redisplay the confirmation unless form data is changed" do
       expect(page).to have_selector('#announcement_text', class: 'active')
       expect(page).not_to have_selector('#marketing', class: 'active')
+      within_frame('content_block_announcement_ifr') do
+        find('body').set('Updated text.')
+      end
       click_link 'Marketing Text'
-      within('#change-tab-content-block') do
-        click_button('Cancel')
+      within('#nav-safety-modal') do
+        click_button('OK')
       end
-      expect(page).not_to have_selector('#marketing', class: 'active')
-      expect(page).to have_selector('#announcement_text', class: 'active')
+      click_link 'Marketing Text'
+      expect(page).not_to have_content(confirm_modal_text)
     end
   end
 end