blacklight 7.13.2 → 7.15.2

data/spec/spec_helper.rb

@@ -20,12 +20,17 @@ require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
-require 'selenium-webdriver'
+require 'capybara/apparition'
 require 'equivalent-xml'
-require 'webdrivers'
 
-Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.javascript_driver = :apparition
 Capybara.disable_animation = true
+# Capybara.enable_aria_label = true
+
+# Uncomment for a headed browser
+# Capybara.register_driver :apparition do |app|
+#   Capybara::Apparition::Driver.new(app, headless: false)
+# end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1,2 @@
 gem 'rails-controller-testing'
-gem 'thor', '~> 0.20'
+gem 'thor', '~> 0.20' if /^5.[12]/.match?(ENV['RAILS_VERSION'])

data/spec/views/catalog/_document.html.erb_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe "catalog/_document" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
+    allow(controller).to receive(:controller_name).and_return('test')
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     assign(:response, instance_double(Blacklight::Solr::Response, start: 20))

data/spec/views/catalog/_thumbnail.html.erb_spec.rb

@@ -16,6 +16,8 @@ RSpec.describe "catalog/_thumbnail" do
   end
 
   before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(controller).to receive(:view_context).and_return(view)
     allow(controller).to receive(:action_name).and_return('index')
     assign :response, instance_double(Blacklight::Solr::Response, start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.13.2
+  version: 7.15.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,20 +95,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.23.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -186,33 +214,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: apparition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -380,6 +394,8 @@ files:
 - app/assets/stylesheets/blacklight/blacklight.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.scss
 - app/builders/blacklight/action_builder.rb
+- app/components/blacklight/advanced_search_form_component.html.erb
+- app/components/blacklight/advanced_search_form_component.rb
 - app/components/blacklight/constraint_component.html.erb
 - app/components/blacklight/constraint_component.rb
 - app/components/blacklight/constraint_layout_component.html.erb
@@ -404,10 +420,14 @@ files:
 - app/components/blacklight/document_component.rb
 - app/components/blacklight/document_metadata_component.html.erb
 - app/components/blacklight/document_metadata_component.rb
+- app/components/blacklight/facet_field_checkboxes_component.html.erb
+- app/components/blacklight/facet_field_checkboxes_component.rb
 - app/components/blacklight/facet_field_component.html.erb
 - app/components/blacklight/facet_field_component.rb
 - app/components/blacklight/facet_field_filter_component.html.erb
 - app/components/blacklight/facet_field_filter_component.rb
+- app/components/blacklight/facet_field_inclusive_constraint_component.html.erb
+- app/components/blacklight/facet_field_inclusive_constraint_component.rb
 - app/components/blacklight/facet_field_list_component.html.erb
 - app/components/blacklight/facet_field_list_component.rb
 - app/components/blacklight/facet_field_no_layout_component.rb
@@ -415,6 +435,7 @@ files:
 - app/components/blacklight/facet_field_pagination_component.rb
 - app/components/blacklight/facet_item_component.rb
 - app/components/blacklight/facet_item_pivot_component.rb
+- app/components/blacklight/hidden_search_state_component.rb
 - app/components/blacklight/metadata_field_component.html.erb
 - app/components/blacklight/metadata_field_component.rb
 - app/components/blacklight/metadata_field_layout_component.html.erb
@@ -496,10 +517,13 @@ files:
 - app/models/record_mailer.rb
 - app/models/search.rb
 - app/models/solr_document.rb
+- app/presenters/blacklight/clause_presenter.rb
 - app/presenters/blacklight/document_presenter.rb
 - app/presenters/blacklight/facet_field_presenter.rb
+- app/presenters/blacklight/facet_grouped_item_presenter.rb
 - app/presenters/blacklight/facet_item_presenter.rb
 - app/presenters/blacklight/field_presenter.rb
+- app/presenters/blacklight/inclusive_facet_item_presenter.rb
 - app/presenters/blacklight/index_presenter.rb
 - app/presenters/blacklight/json_presenter.rb
 - app/presenters/blacklight/link_alternate_presenter.rb
@@ -522,6 +546,8 @@ files:
 - app/views/bookmarks/_clear_bookmarks_widget.html.erb
 - app/views/bookmarks/_tools.html.erb
 - app/views/bookmarks/index.html.erb
+- app/views/catalog/_advanced_search_form.html.erb
+- app/views/catalog/_advanced_search_help.html.erb
 - app/views/catalog/_bookmark_control.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_constraints.html.erb
@@ -568,6 +594,7 @@ files:
 - app/views/catalog/_thumbnail.html.erb
 - app/views/catalog/_view_type_group.html.erb
 - app/views/catalog/_zero_results.html.erb
+- app/views/catalog/advanced_search.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/citation.js.erb
 - app/views/catalog/email.html.erb
@@ -704,14 +731,17 @@ files:
 - lib/generators/blacklight/user_generator.rb
 - lib/railties/blacklight.rake
 - package.json
+- spec/components/blacklight/advanced_search_form_component_spec.rb
 - spec/components/blacklight/constraint_layout_component_spec.rb
 - spec/components/blacklight/document/action_component_spec.rb
 - spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
+- spec/components/blacklight/facet_field_checkboxes_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
+- spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
@@ -723,6 +753,7 @@ files:
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
+- spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
@@ -792,8 +823,10 @@ files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/clause_presenter_spec.rb
 - spec/presenters/blacklight/document_presenter_spec.rb
 - spec/presenters/blacklight/facet_field_presenter_spec.rb
+- spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb
 - spec/presenters/blacklight/facet_item_presenter_spec.rb
 - spec/presenters/blacklight/field_presenter_spec.rb
 - spec/presenters/blacklight/index_presenter_spec.rb
@@ -848,35 +881,38 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
 test_files:
+- spec/components/blacklight/advanced_search_form_component_spec.rb
 - spec/components/blacklight/constraint_layout_component_spec.rb
 - spec/components/blacklight/document/action_component_spec.rb
 - spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
+- spec/components/blacklight/facet_field_checkboxes_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
+- spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
@@ -888,6 +924,7 @@ test_files:
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
+- spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
@@ -957,8 +994,10 @@ test_files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/clause_presenter_spec.rb
 - spec/presenters/blacklight/document_presenter_spec.rb
 - spec/presenters/blacklight/facet_field_presenter_spec.rb
+- spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb
 - spec/presenters/blacklight/facet_item_presenter_spec.rb
 - spec/presenters/blacklight/field_presenter_spec.rb
 - spec/presenters/blacklight/index_presenter_spec.rb