hyrax 2.1.0.beta2 → 2.1.0.rc1

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

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

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

@@ -24,7 +24,7 @@ RSpec.describe Hyrax::Collections::PermissionsCreateService do
     end
     let!(:collection_type_participant) { create(:collection_type_participant, user_manage_attributes) }
     let!(:collection_type_participant2) { create(:collection_type_participant, group_manage_attributes) }
-    let(:collection) { create(:collection, collection_type_gid: collection_type.gid) }
+    let(:collection) { build(:collection_lw, id: 'collection1', collection_type_gid: collection_type.gid) }
 
     before do
       subject

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

@@ -187,6 +187,10 @@ RSpec.describe Hyrax::Collections::PermissionsService do
       it 'returns admin set ids where user has deposit access' do
         expect(described_class.source_ids_for_deposit(ability: ability, source_type: 'admin_set')).to match_array [as_du.id, as_dg.id, as_mu.id, as_mg.id]
       end
+      it 'returns admin set ids where user has deposit access except excluded groups' do
+        expect(described_class.source_ids_for_deposit(ability: ability, source_type: 'admin_set', exclude_groups: ['deposit_group']))
+          .to match_array [as_du.id, as_mu.id, as_mg.id]
+      end
 
       context 'when user has no access' do
         let(:ability) { Ability.new(user2) }

data/spec/services/hyrax/default_middleware_stack_spec.rb

@@ -15,9 +15,9 @@ RSpec.describe Hyrax::DefaultMiddlewareStack do
         Hyrax::Actors::AddToWorkActor,
         Hyrax::Actors::AttachMembersActor,
         Hyrax::Actors::ApplyOrderActor,
+        Hyrax::Actors::DefaultAdminSetActor,
         Hyrax::Actors::InterpretVisibilityActor,
         Hyrax::Actors::TransferRequestActor,
-        Hyrax::Actors::DefaultAdminSetActor,
         Hyrax::Actors::ApplyPermissionTemplateActor,
         Hyrax::Actors::CleanupFileSetsActor,
         Hyrax::Actors::CleanupTrophiesActor,

data/spec/services/hyrax/multiple_membership_checker_spec.rb

@@ -73,7 +73,7 @@ RSpec.describe Hyrax::MultipleMembershipChecker, :clean_repo do
         expect(item).not_to receive(:member_of_collection_ids)
         expect(checker).to receive(:single_membership_collections).with(collection_ids).once.and_call_original
         expect(Collection).to receive(:where).with(id: collection_ids, collection_type_gid_ssim: [collection_type.gid]).once.and_return(collections)
-        expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection types: Greedy (Foo and Bar)'
+        expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection type (type: Greedy, collections: Foo and Bar)'
       end
 
       context 'with multiple single membership collection types' do
@@ -84,7 +84,7 @@ RSpec.describe Hyrax::MultipleMembershipChecker, :clean_repo do
           expect(item).not_to receive(:member_of_collection_ids)
           expect(checker).to receive(:single_membership_collections).with(collection_ids).once.and_call_original
           expect(Collection).to receive(:where).with(id: collection_ids, collection_type_gid_ssim: collection_types).once.and_return(collections)
-          expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection types: Greedy (Foo and Bar)'
+          expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection type (type: Greedy, collections: Foo and Bar)'
         end
       end
     end
@@ -104,7 +104,7 @@ RSpec.describe Hyrax::MultipleMembershipChecker, :clean_repo do
         expect(item).to receive(:member_of_collection_ids)
         expect(Collection).to receive(:where).with(id: collection_ids, collection_type_gid_ssim: [collection_type.gid]).once.and_return(collections)
         expect(Collection).to receive(:where).with(id: [collection2.id], collection_type_gid_ssim: [collection_type.gid]).once.and_return([collection2])
-        expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection types: Greedy (Foo and Bar)'
+        expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection type (type: Greedy, collections: Foo and Bar)'
       end
 
       context 'with multiple single membership collection types' do
@@ -115,7 +115,7 @@ RSpec.describe Hyrax::MultipleMembershipChecker, :clean_repo do
           expect(item).to receive(:member_of_collection_ids)
           expect(Collection).to receive(:where).with(id: collection_ids, collection_type_gid_ssim: collection_types).once.and_return(collections)
           expect(Collection).to receive(:where).with(id: [collection2.id], collection_type_gid_ssim: collection_types).once.and_return([collection2])
-          expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection types: Greedy (Foo and Bar)'
+          expect(subject).to eq 'Error: You have specified more than one of the same single-membership collection type (type: Greedy, collections: Foo and Bar)'
         end
       end
     end

data/spec/services/hyrax/workflow/grant_edit_to_depositor_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Hyrax::Workflow::GrantEditToDepositor do
       end
     end
 
-    context "with attached FileSets" do
+    context "with attached FileSets", :perform_enqueued do
       let(:work) { create(:work_with_one_file, user: depositor) }
       let(:file_set) do
         work.members.first.tap do |file_set|

data/spec/services/hyrax/workflow/grant_read_to_depositor_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Hyrax::Workflow::GrantReadToDepositor do
       end
     end
 
-    context "with attached FileSets" do
+    context "with attached FileSets", perform_enqueued: [Hyrax::GrantReadToMembersJob] do
       let(:work) { create(:work_with_one_file, user: depositor) }
       let(:file_set) { work.members.first }
 

data/spec/services/hyrax/workflow/revoke_edit_from_depositor_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Hyrax::Workflow::RevokeEditFromDepositor do
       end
     end
 
-    context "with attached FileSets" do
+    context "with attached FileSets", perform_enqueued: [Hyrax::RevokeEditFromMembersJob] do
       let(:work) { create(:work_with_one_file, user: depositor) }
       let(:file_set) { work.members.first }
 

data/spec/spec_helper.rb

@@ -78,7 +78,7 @@ end
 Capybara.default_driver = :rack_test # This is a faster driver
 Capybara.javascript_driver = :selenium_chrome_headless_sandboxless # This is slower
 
-ApplicationJob.queue_adapter = :inline
+ActiveJob::Base.queue_adapter = :test
 
 # require 'http_logger'
 # HttpLogger.logger = Logger.new(STDOUT)
@@ -179,7 +179,7 @@ RSpec.configure do |config|
                                                    Hyrax.config.default_nested_relationship_reindexer
                                                  else
                                                    # Don't use the nested relationship reindexer. This slows everything down quite a bit.
-                                                   ->(id:) {}
+                                                   ->(id:, extent:) {}
                                                  end
   end
 
@@ -246,4 +246,37 @@ RSpec.configure do |config|
   config.example_status_persistence_file_path = 'spec/examples.txt'
 
   config.profile_examples = 10
+
+  # Use this example metadata when you want to perform jobs inline during testing.
+  #
+  #   describe '#my_method`, :perform_enqueued do
+  #     ...
+  #   end
+  #
+  # If you pass an `Array` of job classes, they will be treated as the filter list.
+  #
+  #   describe '#my_method`, perform_enqueued: [MyJobClass] do
+  #     ...
+  #   end
+  #
+  # Limit to specific job classes with:
+  #
+  #   ActiveJob::Base.queue_adapter.filter = [JobClass]
+  #
+  config.before(:example, :perform_enqueued) do |example|
+    ActiveJob::Base.queue_adapter.filter =
+      example.metadata[:perform_enqueued].try(:to_a)
+
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs    = true
+    ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = true
+  end
+
+  config.after(:example, :perform_enqueued) do
+    ActiveJob::Base.queue_adapter.filter         = nil
+    ActiveJob::Base.queue_adapter.enqueued_jobs  = []
+    ActiveJob::Base.queue_adapter.performed_jobs = []
+
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs    = false
+    ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = false
+  end
 end

data/spec/support/features/batch_edit_actions.rb

@@ -17,7 +17,7 @@ def fill_in_batch_edit_fields_and_verify!
       # 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')
+      find('.status', text: 'Changes Saved', wait: 5)
     end
   end
 end

data/spec/support/selectors.rb

@@ -20,6 +20,21 @@ module Selectors
         find('input.edit-collection-add-sharing-button').click
       end
     end
+
+    # For use with javascript collection selector that allows for searching for an existing collection.
+    # @param [Collection] collection to select
+    def select_collection(collection)
+      first('a.select2-choice').click
+      find('.select2-input').set(collection.title.first)
+      expect(page).to have_css('div.select2-result-label')
+      first('div.select2-result-label').click
+      first('[data-behavior~=add-relationship]').click
+      within('[data-behavior~=collection-relationships]') do
+        within('table.table.table-striped') do
+          expect(page).to have_content(collection.title.first)
+        end
+      end
+    end
   end
 
   module NewTransfers

data/spec/views/hyrax/admin/admin_sets/_show_actions.html.erb_spec.rb

@@ -0,0 +1,66 @@
+RSpec.describe 'hyrax/admin/admin_sets/_show_actions.html.erb', type: :view do
+  let(:solr_document) { SolrDocument.new }
+  let(:ability) { instance_double("Ability") }
+  let(:presenter) { Hyrax::AdminSetPresenter.new(solr_document, ability) }
+
+  before do
+    allow(controller).to receive(:current_ability).and_return(ability)
+    allow(view).to receive(:presenter).and_return(presenter)
+
+    # Stub route because view specs don't handle engine routes
+    allow(view).to receive(:edit_admin_admin_set_path).with(presenter).and_return("/admin/admin_sets/123/edit")
+    allow(view).to receive(:admin_admin_set_path).with(presenter).and_return("/admin/admin_sets/123")
+  end
+
+  context 'when editor of the admin_set' do
+    before do
+      allow(ability).to receive(:can?).with(:edit, solr_document).and_return(true)
+    end
+
+    context "when presenter has delete disabled" do
+      before do
+        allow(presenter).to receive(:disable_delete?).and_return(true)
+        render
+      end
+      it "displays a disabled delete button" do
+        expect(rendered).to have_selector(:css, "a.btn-danger.disabled")
+        expect(rendered).to have_selector(:css, "a.btn-primary")
+      end
+    end
+
+    context "with empty admin set" do
+      before do
+        allow(presenter).to receive(:disable_delete?).and_return(false)
+        render
+      end
+      it "displays an enabled delete button" do
+        expect(rendered).to have_selector(:css, "a.btn-danger")
+        expect(rendered).not_to have_selector(:css, "a.btn-danger.disabled")
+        expect(rendered).to have_selector(:css, "a.btn-primary")
+      end
+    end
+
+    context "with default admin set" do
+      before do
+        allow(presenter).to receive(:disable_delete?).and_return(true)
+        render
+      end
+      it "displays a disabled delete button" do
+        expect(rendered).to have_selector(:css, "a.btn-danger.disabled")
+        expect(rendered).to have_selector(:css, "a.btn-primary")
+      end
+    end
+  end
+
+  context 'when reader of the admin_set' do
+    before do
+      allow(ability).to receive(:can?).with(:edit, solr_document).and_return(false)
+      render
+    end
+
+    it "doesn't display any action buttons" do
+      expect(rendered).not_to have_selector(:css, "a.btn-danger")
+      expect(rendered).not_to have_selector(:css, "a.btn-primary")
+    end
+  end
+end

data/spec/views/hyrax/admin/admin_sets/show.html.erb_spec.rb

@@ -1,50 +1,21 @@
 RSpec.describe "hyrax/admin/admin_sets/show.html.erb", type: :view do
   let(:solr_document) { SolrDocument.new }
-  let(:ability) { double }
+  let(:ability) { instance_double("Ability") }
   let(:presenter) { Hyrax::AdminSetPresenter.new(solr_document, ability) }
 
   before do
-    allow(presenter).to receive(:total_items).and_return(0)
-    # Stub route because view specs don't handle engine routes
-    allow(view).to receive(:edit_admin_admin_set_path).and_return("/admin/admin_sets/123/edit")
-    allow(view).to receive(:admin_admin_set_path).and_return("/admin/admin_sets/123")
-
     stub_template '_collection_description.html.erb' => ''
+    stub_template '_show_actions.erb' => ''
     stub_template '_show_descriptions.erb' => ''
     stub_template '_sort_and_per_page.html.erb' => 'sort and per page'
     stub_template '_document_list.html.erb' => 'document list'
     stub_template '_paginate.html.erb' => 'paginate'
 
     assign(:presenter, presenter)
+    render
   end
 
-  context "when presenter has delete disabled" do
-    before do
-      allow(presenter).to receive(:disable_delete?).and_return(true)
-      render
-    end
-    it "displays a disabled delete button" do
-      expect(rendered).to have_selector(:css, "a.btn-danger.disabled")
-    end
-  end
-
-  context "with empty admin set" do
-    before do
-      render
-    end
-    it "displays an enabled delete button" do
-      expect(rendered).to have_selector(:css, "a.btn-danger")
-      expect(rendered).not_to have_selector(:css, "a.btn-danger.disabled")
-    end
-  end
-
-  context "with default admin set" do
-    before do
-      allow(presenter).to receive(:disable_delete?).and_return(true)
-      render
-    end
-    it "displays a disabled delete button" do
-      expect(rendered).to have_selector(:css, "a.btn-danger.disabled")
-    end
+  it "displays a disabled delete button" do
+    expect(rendered).to have_selector('div.admin-set')
   end
 end

data/spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb

@@ -1,6 +1,5 @@
 RSpec.describe 'hyrax/admin/collection_types/_form.html.erb', type: :view do
   let(:collection_type) { build(:collection_type) }
-  # let(:collection_type) { build(:collection_type, machine_id: "type_does_not_matter") }
   let(:form) { Hyrax::Forms::Admin::CollectionTypeForm.new(collection_type: collection_type) }
 
   before do
@@ -13,6 +12,7 @@ RSpec.describe 'hyrax/admin/collection_types/_form.html.erb', type: :view do
     expect(rendered).to have_selector('#metadata')
     expect(rendered).to have_selector('#settings')
     expect(rendered).to have_selector('#participants')
+    expect(rendered).to have_selector('#appearance')
   end
 
   context "when creating a new collection type" do
@@ -25,6 +25,7 @@ RSpec.describe 'hyrax/admin/collection_types/_form.html.erb', type: :view do
       expect(rendered).to have_link(I18n.t('hyrax.admin.collection_types.form.tab.metadata'))
       expect(rendered).not_to have_link(I18n.t('hyrax.admin.collection_types.form.tab.settings'))
       expect(rendered).not_to have_link(I18n.t('hyrax.admin.collection_types.form.tab.participants'))
+      expect(rendered).not_to have_link(I18n.t('hyrax.admin.collection_types.form.tab.appearance'))
     end
   end
 
@@ -38,6 +39,7 @@ RSpec.describe 'hyrax/admin/collection_types/_form.html.erb', type: :view do
       expect(rendered).to have_link(I18n.t('hyrax.admin.collection_types.form.tab.metadata'))
       expect(rendered).to have_link(I18n.t('hyrax.admin.collection_types.form.tab.settings'))
       expect(rendered).to have_link(I18n.t('hyrax.admin.collection_types.form.tab.participants'))
+      expect(rendered).to have_link(I18n.t('hyrax.admin.collection_types.form.tab.appearance'))
     end
   end
 end

data/spec/views/hyrax/admin/collection_types/_form_appearance.html.erb_spec.rb

@@ -0,0 +1,22 @@
+RSpec.describe 'hyrax/admin/collection_types/_form_appearance.html.erb', type: :view do
+  let(:collection_type) { create(:collection_type) }
+  let(:collection_type_form) { Hyrax::Forms::Admin::CollectionTypeForm.new }
+
+  let(:form) do
+    view.simple_form_for(collection_type, url: '/update') do |fs_form|
+      return fs_form
+    end
+  end
+
+  before do
+    assign(:form, collection_type_form)
+    allow(view).to receive(:f).and_return(form)
+    render
+  end
+
+  # This needs a little more work.
+  it "renders the badge color options" do
+    expect(rendered).to have_content(I18n.t("simple_form.labels.collection_type.badge_color"))
+    expect(rendered).to have_selector("input#collection_type_badge_color")
+  end
+end

data/spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb

@@ -9,8 +9,16 @@ RSpec.describe 'hyrax/admin/collection_types/_form_participants.html.erb', type:
     assign(:form, form)
     render
   end
-  it 'has the required selectors' do
-    expect(rendered).to have_selector('#user-participants-form')
-    expect(rendered).to have_selector('#group-participants-form')
+
+  context 'Collection Types edit participants tab' do
+    it 'has the required form selectors' do
+      expect(rendered).to have_selector('#user-participants-form')
+      expect(rendered).to have_selector('#group-participants-form')
+    end
+
+    it 'has the required javascript selectors to process AJAX add user and add group requests' do
+      expect(rendered).to have_selector('.form-add-participants-wrapper')
+      expect(rendered).to have_selector('.add-participants-form')
+    end
   end
 end

data/spec/views/hyrax/base/_items.html.erb_spec.rb

@@ -32,4 +32,50 @@ RSpec.describe 'hyrax/base/_items.html.erb', type: :view do
       expect(rendered).to have_css('tbody', text: member_presenters.join)
     end
   end
+
+  context "when file set members are present" do
+    let(:user) { create(:user) }
+    let(:ability) { Ability.new(user) }
+    let(:file1) { create(:file_set, :public) }
+    let(:file2) { create(:file_set) }
+
+    let(:solr_document) { SolrDocument.new(attributes) }
+    let(:presenter) { Hyrax::WorkShowPresenter.new(solr_document, ability, request) }
+
+    before do
+      stub_template 'hyrax/base/_member.html.erb' => '<%= member %>'
+    end
+
+    context "and a public file set" do
+      let(:attributes) { create(:public_work, ordered_members: [file1]).to_solr }
+
+      it "show the link for the file set" do
+        expect(Flipflop).to receive(:hide_private_files?).and_return(true)
+        render 'hyrax/base/items', presenter: presenter
+        expect(rendered).to have_content presenter.member_presenters.first.link_name
+      end
+    end
+
+    context "and a private file set" do
+      let(:attributes) { create(:public_work, ordered_members: [file2]).to_solr }
+
+      it "won't show the link to the file set" do
+        expect(Flipflop).to receive(:hide_private_files?).and_return(true)
+        expect(view).to receive(:can?).with(:edit, presenter.id).and_return(false)
+        render 'hyrax/base/items', presenter: presenter
+        expect(rendered).not_to have_content presenter.member_presenters.first.link_name
+      end
+    end
+
+    context "with public and private file sets" do
+      let(:attributes) { create(:public_work, ordered_members: [file1, file2]).to_solr }
+
+      it "only show the link to the file set that users have permission to see" do
+        expect(Flipflop).to receive(:hide_private_files?).and_return(true)
+        render 'hyrax/base/items', presenter: presenter
+        expect(rendered).to have_content presenter.member_presenters.first.link_name
+        expect(rendered).not_to have_content presenter.member_presenters[1].link_name
+      end
+    end
+  end
 end