hyrax 2.0.3 → 2.1.0.beta1

data/spec/services/hyrax/multiple_membership_checker_spec.rb

@@ -0,0 +1,155 @@
+RSpec.describe Hyrax::MultipleMembershipChecker, :clean_repo do
+  let(:item) { double }
+
+  describe '#initialize' do
+    subject { described_class.new(item: item) }
+
+    it 'exposes an attr_reader' do
+      expect(subject.item).to eq item
+    end
+  end
+
+  describe '#check' do
+    let(:checker) { described_class.new(item: item) }
+    let(:collection_ids) { ['foobar'] }
+    let(:included) { false }
+    let!(:collection_type) { create(:collection_type, title: 'Greedy', allow_multiple_membership: false) }
+
+    subject { checker.check(collection_ids: collection_ids, include_current_members: included) }
+
+    context 'when there are no single-membership collection types' do
+      before do
+        allow(Hyrax::CollectionType).to receive(:where).with(id: collection_ids, collection_type_gid_ssim: []).and_return([])
+      end
+
+      it 'returns nil' do
+        expect(checker).to receive(:single_membership_types).and_return([])
+        expect(subject).to be nil
+      end
+    end
+
+    context 'when collection_ids is empty' do
+      let(:collection_ids) { [] }
+
+      it 'returns nil' do
+        expect(checker).to receive(:single_membership_collections).with(collection_ids).once.and_call_original
+        expect(Collection).not_to receive(:where)
+        expect(subject).to be nil
+      end
+    end
+
+    context 'when there are no single-membership collection instances' do
+      it 'returns nil' do
+        expect(checker).to receive(:single_membership_collections).with(collection_ids).once.and_return([])
+        expect(Collection).not_to receive(:where)
+        expect(subject).to be nil
+      end
+    end
+
+    context 'when multiple single-membership collection instances are not in the list' do
+      let(:collection) { build(:collection_lw, id: 'collection0', collection_type: collection_type, with_solr_document: true) }
+      let(:collections) { [collection] }
+      let(:collection_ids) { collections.map(&:id) }
+
+      it 'returns nil' do
+        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 be nil
+      end
+    end
+
+    context 'when multiple single-membership collection instances are in the list, not including current members' do
+      let(:collection1) { build(:collection_lw, id: 'collection1', title: ['Foo'], collection_type: collection_type, with_solr_document: true) }
+      let(:collection2) { build(:collection_lw, id: 'collection2', title: ['Bar'], collection_type: collection_type, with_solr_document: true) }
+      let(:collections) { [collection1, collection2] }
+      let(:collection_ids) { collections.map(&:id) }
+
+      before do
+        allow(Collection).to receive(:find).with(collection1.id).and_return(collection1)
+        allow(Collection).to receive(:find).with(collection2.id).and_return(collection2)
+      end
+
+      it 'returns an error' 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)'
+      end
+
+      context 'with multiple single membership collection types' do
+        let!(:collection_type_2) { create(:collection_type, title: 'Doc', allow_multiple_membership: false) }
+        let(:collection_types) { [collection_type.gid, collection_type_2.gid] }
+
+        it 'returns an error' 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)'
+        end
+      end
+    end
+
+    context 'when multiple single-membership collection instances are in the list, including current members' do
+      let(:collection1) { build(:collection_lw, id: 'collection1', title: ['Foo'], collection_type: collection_type, with_solr_document: true) }
+      let(:collection2) { build(:collection_lw, id: 'collection2', title: ['Bar'], collection_type: collection_type, with_solr_document: true) }
+      let(:collections) { [collection1] }
+      let(:collection_ids) { collections.map(&:id) }
+      let(:included) { true }
+
+      before do
+        allow(item).to receive(:member_of_collection_ids).once.and_return([collection2.id])
+      end
+
+      it 'returns an error' 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)'
+      end
+
+      context 'with multiple single membership collection types' do
+        let!(:collection_type_2) { create(:collection_type, title: 'Doc', allow_multiple_membership: false) }
+        let(:collection_types) { [collection_type.gid, collection_type_2.gid] }
+
+        it 'returns an error' 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)'
+        end
+      end
+    end
+
+    context 'when multiple single-membership collection instances are in the list, but are different collection types' do
+      let(:collection1) { build(:collection_lw, title: ['Foo'], collection_type: collection_type, with_solr_document: true) }
+      let(:collection2) { build(:collection_lw, title: ['Bar'], collection_type: collection_type_2, with_solr_document: true) }
+      let(:collections) { [collection1, collection2] }
+      let(:collection_ids) { collections.map(&:id) }
+      let(:collection_type_2) { create(:collection_type, title: 'Doc', allow_multiple_membership: false) }
+      let(:collection_types) { [collection_type.gid, collection_type_2.gid] }
+
+      it 'returns nil' 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 be nil
+      end
+
+      context 'when including current members' do
+        let(:collections) { [collection1] }
+        let(:included) { true }
+
+        before do
+          allow(item).to receive(:member_of_collection_ids).once.and_return([collection2.id])
+        end
+
+        it 'returns nil' 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 be nil
+        end
+      end
+    end
+  end
+end

data/spec/services/hyrax/qa_select_service_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::QaSelectService, no_clean: true do
+RSpec.describe Hyrax::QaSelectService do
   let(:authority) do
     # Implementing an ActiveRecord interface as required for this spec
     # rubocop:disable RSpec/InstanceVariable
@@ -55,7 +55,13 @@ RSpec.describe Hyrax::QaSelectService, no_clean: true do
     end
     context 'for item without a "term" property' do
       it 'will raise KeyError' do
-        expect { qa_select_service.label('active-no-term-id') }.to raise_error(KeyError)
+        expect { qa_select_service.label('active-no-term-id') }
+          .to raise_error(KeyError)
+      end
+
+      it 'accepts a block for a backup value' do
+        expect(qa_select_service.label('active-no-term-id') { :backup })
+          .to eq :backup
       end
     end
   end

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

@@ -1,6 +1,6 @@
 module Hyrax
   module Workflow
-    RSpec.describe NotificationConfigurationParameter, no_clean: true do
+    RSpec.describe NotificationConfigurationParameter do
       describe '#build_from_workflow_action_configuration' do
         let(:config) do
           {

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

@@ -1,6 +1,6 @@
 module Hyrax
   module Workflow
-    RSpec.describe NotificationGenerator, no_clean: true do
+    RSpec.describe NotificationGenerator do
       let(:workflow) { create(:workflow) }
       let(:recipients) { { to: 'creating_user', cc: 'advising', bcc: "data_observing" } }
 

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

@@ -1,7 +1,7 @@
 module Hyrax
   module Workflow
     RSpec.describe PermissionGenerator do
-      let(:user) { FactoryBot.create(:user) }
+      let(:user) { create(:user) }
       let(:role) { Sipity::Role.create!(name: 'creating_user') }
       let(:workflow) { create(:workflow, name: 'workflow') }
       let(:workflow_state) { workflow.initial_workflow_state }

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

@@ -1,6 +1,6 @@
 module Hyrax
   module Workflow
-    RSpec.describe PermissionQuery, slow_test: true, no_clean: true do
+    RSpec.describe PermissionQuery, slow_test: true do
       let(:reviewing_user) { create(:user) }
       let(:completing_user) { create(:user) }
       let(:workflow_config) do
@@ -174,7 +174,7 @@ module Hyrax
         end
       end
 
-      describe '.scope_processing_agents_for', no_clean: true do
+      describe '.scope_processing_agents_for' do
         context 'when user is not persisted' do
           subject { described_class.scope_processing_agents_for(user: ::User.new) }
 

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

@@ -25,7 +25,7 @@ RSpec.describe Hyrax::Workflow::StatusListService do
     end
 
     context "when user has roles" do
-      let(:template) { double('template', admin_set_id: 'foobar') }
+      let(:template) { double('template', source_id: 'foobar') }
       let(:workflow) do
         instance_double(Sipity::Workflow, name: 'generic_work', permission_template: template)
       end

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

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Hyrax::Workflow::WorkflowFactory do
   describe '.create' do
     let(:work) { create(:work, with_admin_set: { with_permission_template: true }) }
-    let(:permission_template) { Hyrax::PermissionTemplate.find_by!(admin_set_id: work.admin_set_id) }
+    let(:permission_template) { Hyrax::PermissionTemplate.find_by!(source_id: work.admin_set_id) }
     let(:workflow) { create(:workflow, active: true, permission_template: permission_template) }
     let(:attributes) { {} }
     let(:user) { create(:user) }

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

@@ -1,6 +1,6 @@
 module Hyrax
   module Workflow
-    RSpec.describe 'WorkflowSchema', no_clean: true do
+    RSpec.describe 'WorkflowSchema' do
       let(:valid_data) do
         {
           workflows: [

data/spec/services/hyrax/works/managed_works_service_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe Hyrax::Works::ManagedWorksService, clean_repo: true do
+  let(:blacklight_config) { CatalogController.blacklight_config }
+  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) }
+
+  describe '.managed_works_count' do
+    subject { described_class.managed_works_count(scope: scope) }
+
+    let!(:work) { create(:public_work) }
+
+    it 'returns number of works that can be managed' do
+      expect(subject).to eq(1)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -62,10 +62,23 @@ WebMock.disable_net_connect!(allow_localhost: true)
 require 'i18n/debug' if ENV['I18N_DEBUG']
 require 'byebug' unless ENV['TRAVIS']
 
+# @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
+#       container build environments to mitigate Meltdown/Spectre
+#       vulnerabilities, at which point Hyrax could no longer use the
+#       Capybara-provided :selenium_chrome_headless driver (which does not
+#       include the `--no-sandbox` argument).
+Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new
+  browser_options.args << '--headless'
+  browser_options.args << '--disable-gpu'
+  browser_options.args << '--no-sandbox'
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end
+
 Capybara.default_driver = :rack_test # This is a faster driver
-Capybara.javascript_driver = :selenium_chrome_headless # This is slower
+Capybara.javascript_driver = :selenium_chrome_headless_sandboxless # This is slower
 
-ActiveJob::Base.queue_adapter = :inline
+ApplicationJob.queue_adapter = :inline
 
 # require 'http_logger'
 # HttpLogger.logger = Logger.new(STDOUT)
@@ -114,9 +127,11 @@ module EngineRoutes
 end
 
 require 'shoulda/matchers'
+require 'shoulda/callback/matchers'
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|
     with.test_framework :rspec
+    with.library :rails
   end
 end
 
@@ -124,7 +139,9 @@ require 'active_fedora/cleaner'
 RSpec.configure do |config|
   config.disable_monkey_patching!
   config.include Shoulda::Matchers::ActiveRecord, type: :model
-
+  config.include Shoulda::Matchers::ActiveModel, type: :form
+  config.include Shoulda::Callback::Matchers::ActiveModel
+  config.full_backtrace = true if ENV['TRAVIS']
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
@@ -151,7 +168,19 @@ RSpec.configure do |config|
     # using :workflow is preferable to :clean_repo, use the former if possible
     # It's important that this comes after DatabaseCleaner.start
     ensure_deposit_available_for(user) if example.metadata[:workflow]
-    ActiveFedora::Cleaner.clean! if example.metadata[:clean_repo]
+    if example.metadata[:clean_repo]
+      ActiveFedora::Cleaner.clean!
+      # The JS is executed in a different thread, so that other thread
+      # may think the root path has already been created:
+      ActiveFedora.fedora.connection.send(:init_base_path) if example.metadata[:js]
+    end
+    Hyrax.config.nested_relationship_reindexer = if example.metadata[:with_nested_reindexing]
+                                                   # Use the default relationship reindexer (and the cascading reindexing of child documents)
+                                                   Hyrax.config.default_nested_relationship_reindexer
+                                                 else
+                                                   # Don't use the nested relationship reindexer. This slows everything down quite a bit.
+                                                   ->(id:) {}
+                                                 end
   end
 
   config.include(ControllerLevelHelpers, type: :view)
@@ -186,6 +215,7 @@ RSpec.configure do |config|
   end
 
   config.include EngineRoutes, type: :controller
+  config.include Warden::Test::Helpers, type: :request
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) do
     Warden.test_reset!

data/spec/support/features/session_helpers.rb

@@ -3,7 +3,7 @@ module Features
   module SessionHelpers
     def sign_in(who = :user)
       logout
-      user = who.is_a?(User) ? who : FactoryBot.build(:user).tap(&:save!)
+      user = who.is_a?(User) ? who : build(:user).tap(&:save!)
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password

data/spec/support/matchers/collection_type_property_matchers.rb

@@ -0,0 +1,29 @@
+RSpec::Matchers.define :require_membership do
+  match do |actual|
+    actual && actual.require_membership?
+  end
+end
+
+RSpec::Matchers.define :allow_multiple_membership do
+  match do |actual|
+    actual && actual.allow_multiple_membership?
+  end
+end
+
+RSpec::Matchers.define :assign_visibility do
+  match do |actual|
+    actual && actual.assigns_visibility?
+  end
+end
+
+RSpec::Matchers.define :assign_workflow do
+  match do |actual|
+    actual && actual.assigns_workflow?
+  end
+end
+
+RSpec::Matchers.define :have_collections do
+  match do |actual|
+    actual && actual.collections?
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -9,50 +9,90 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'hyrax:install', '-f'
   end
 
+  def browse_everything_install
+    generate "browse_everything:install --skip-assets"
+  end
+
   def create_generic_work
     generate 'hyrax:work GenericWork'
   end
 
-  def create_atlas_work
-    # ActiveSupport interprets "atlas" as plural which causes
-    # counter-intuitive route paths. Add an inflection to correct
-    # these paths
-    append_file 'config/initializers/inflections.rb' do
-      "ActiveSupport::Inflector.inflections(:en) do |inflect|\n" \
-      "  inflect.irregular 'atlas', 'atlases'\n" \
-      "end\n"
-    end
-    generate 'hyrax:work RareBooks/Atlas'
-  end
+  def create_nested_work
+    generate 'hyrax:work NamespacedWorks::NestedWork'
+    gsub_file 'app/models/namespaced_works/nested_work.rb',
+              'include ::Hyrax::WorkBehavior',
+              <<-EOS.strip_heredoc
+                property :created, predicate: ::RDF::Vocab::DC.created, class_name: TimeSpan
+                  include ::Hyrax::WorkBehavior
+              EOS
 
-  def comment_out_web_console
-    gsub_file "Gemfile",
-              "gem 'web-console'", "# gem 'web-console'"
+    gsub_file 'app/models/namespaced_works/nested_work.rb',
+              'include ::Hyrax::BasicMetadata',
+              <<-EOS.strip_heredoc
+                include ::Hyrax::BasicMetadata
+                  accepts_nested_attributes_for :created
+              EOS
   end
 
-  def browse_everything_install
-    generate "browse_everything:install --skip-assets"
+  def create_time_span
+    create_file 'app/models/time_span.rb' do
+      <<-EOS.strip_heredoc
+      class TimeSpan < ActiveTriples::Resource
+        def initialize(uri = RDF::Node.new, _parent = ActiveTriples::Resource.new)
+          uri = if uri.try(:node?)
+                  RDF::URI(\"#timespan_\#{uri.to_s.gsub('_:', '')}\")
+                elsif uri.to_s.include?('#')
+                  RDF::URI(uri)
+                end
+          super
+        end
+
+        def persisted?
+          !new_record?
+        end
+
+        def new_record?
+          id.start_with?('#')
+        end
+
+        configure type: ::RDF::Vocab::EDM.TimeSpan
+        property :start, predicate: ::RDF::Vocab::EDM.begin
+        property :finish, predicate: ::RDF::Vocab::EDM.end
+      end
+      EOS
+    end
   end
 
   def banner
     say_status("info", "ADDING OVERRIDES FOR TEST ENVIRONMENT", :blue)
   end
 
+  def comment_out_web_console
+    gsub_file "Gemfile",
+              "gem 'web-console'", "# gem 'web-console'"
+  end
+
   def add_analytics_config
     append_file 'config/analytics.yml' do
-      "\n" +
-        "analytics:\n" +
-        "  app_name: My App Name\n" +
-        "  app_version: 0.0.1\n" +
-        "  privkey_path: /tmp/privkey.p12\n" +
-        "  privkey_secret: s00pers3kr1t\n" +
-        "  client_email: oauth@example.org\n"
+      <<-EOS.strip_heredoc
+        analytics:
+          app_name: My App Name
+          app_version: 0.0.1
+          privkey_path: /tmp/privkey.p12
+          privkey_secret: s00pers3kr1t
+          client_email: oauth@example.org
+      EOS
     end
   end
 
   def enable_analytics
     gsub_file "config/initializers/hyrax.rb",
-              "config.analytics = false", "config.analytics = true"
+              "# config.analytics = false", "config.analytics = true"
+  end
+
+  def enable_riiif_image_server
+    gsub_file "config/initializers/hyrax.rb",
+              "# config.iiif_image_server = false", "config.iiif_image_server = true"
   end
 
   def enable_i18n_translation_errors