blacklight 7.1.0.alpha → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe756dbe6e6b38431044bba1b30657153080d460efc11c93b834292a90997dc
-  data.tar.gz: 458c1152d21f9a2efde59f4ac97f6ceb569ccd7eeb1916d33563c95492f76ebd
+  metadata.gz: 1781363312295e0871899850efea8278e255485d84991ad9e5ce1c798eba9680
+  data.tar.gz: 2be4ffe011dc4a8c96d58097db27c768422fb24b2528cd9cbc8d91cf80728072
 SHA512:
-  metadata.gz: 163e004de0439fc7d94c0beea0bf32f946987730c683e737f5dd4ee99914eaf9493f4b7d7af966101ddadb08dd2b5f905973f2e959677da566261024d50fe391
-  data.tar.gz: 9e49bb0e02d04074076f24c05be20d03c58803f12aea81faa80fa69cfe9ab9d7a1d2f82d44ab3fb6928cfd56284747a3449de53b299113f4cf540c78e0ab24fa
+  metadata.gz: 737b9592762ed056e36f6d41a5560387764bf01643bcfee555c0bc8e17ddf7d6d663161a6bc777c41d0cdbf8e157ae42ab2ed92f4d596dbeac0409b76a4d8a17
+  data.tar.gz: 62e3b74deba357f21e09145d6fcd25a241d05b1fbcd6ca3e40c3794fca3fe202074e8bab9ecbb2dac21b1980db54a9cee6af62144fe6545760b9d135ba4cfed7

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-01-18 23:13:39 -0600 using RuboCop version 0.63.0.
+# on 2019-08-05 11:45:43 -0500 using RuboCop version 0.63.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -36,7 +36,7 @@ Layout/ClosingParenthesisIndentation:
   Exclude:
     - 'app/views/catalog/index.atom.builder'
 
-# Offense count: 108
+# Offense count: 109
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
@@ -69,11 +69,10 @@ Layout/LeadingCommentSpace:
     - 'app/models/concerns/blacklight/document/export.rb'
     - 'app/views/catalog/_document.atom.builder'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Layout/MultilineBlockLayout:
   Exclude:
-    - 'lib/generators/blacklight/install_generator.rb'
     - 'lib/generators/blacklight/test_support_generator.rb'
 
 # Offense count: 2
@@ -127,13 +126,12 @@ Layout/SpaceInsideParens:
     - 'app/views/catalog/_document.rss.builder'
     - 'app/views/catalog/index.atom.builder'
 
-# Offense count: 13
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
     - 'app/views/catalog/_document.rss.builder'
-    - 'app/views/catalog/index.atom.builder'
 
 # Offense count: 1
 Lint/AmbiguousBlockAssociation:
@@ -211,7 +209,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 47
+# Offense count: 48
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 35
@@ -219,7 +217,7 @@ Metrics/MethodLength:
 # Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 215
+  Max: 210
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
@@ -255,7 +253,7 @@ Naming/UncommunicativeMethodParamName:
     - 'spec/features/search_context_spec.rb'
     - 'spec/features/search_results_spec.rb'
 
-# Offense count: 15
+# Offense count: 16
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, normalcase, non_integer
 Naming/VariableNumber:
@@ -332,7 +330,7 @@ RSpec/FilePath:
     - 'spec/presenters/pipeline_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 194
+# Offense count: 197
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
@@ -344,6 +342,18 @@ RSpec/IteratedExpectation:
     - 'spec/models/blacklight/solr/response/group_spec.rb'
     - 'spec/models/blacklight/solr/response_spec.rb'
 
+# Offense count: 17
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/controllers/blacklight/search_fields_spec.rb'
+    - 'spec/controllers/bookmarks_controller_spec.rb'
+    - 'spec/controllers/catalog_controller_spec.rb'
+    - 'spec/models/blacklight/configurable_spec.rb'
+    - 'spec/models/blacklight/document/active_model_shim_spec.rb'
+    - 'spec/models/blacklight/document_spec.rb'
+    - 'spec/models/blacklight/solr/document_spec.rb'
+    - 'spec/presenters/blacklight/show_presenter_spec.rb'
+
 # Offense count: 8
 RSpec/MessageChain:
   Exclude:
@@ -371,12 +381,12 @@ RSpec/MessageSpies:
     - 'spec/presenters/blacklight/show_presenter_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 345
+# Offense count: 346
 # Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 328
+# Offense count: 329
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Enabled: false
@@ -406,13 +416,14 @@ RSpec/ScatteredLet:
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
-# Offense count: 4
+# Offense count: 10
 RSpec/SubjectStub:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
+    - 'spec/models/blacklight/search_builder_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 118
+# Offense count: 119
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -476,7 +487,7 @@ Style/BracesAroundHashParameters:
     - 'lib/blacklight/solr/response/facets.rb'
     - 'lib/generators/blacklight/test_support_generator.rb'
 
-# Offense count: 50
+# Offense count: 51
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -497,7 +508,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'lib/blacklight/solr/response/spelling.rb'
 
-# Offense count: 93
+# Offense count: 94
 Style/Documentation:
   Enabled: false
 

data/.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 addons:
   chrome: stable
 language: ruby
@@ -18,8 +18,6 @@ matrix:
       env: "RAILS_VERSION=5.2.1 BLACKLIGHT_API_TEST=true ENGINE_CART_RAILS_OPTIONS=\"--api --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test\""
     - rvm: 2.4.5
       env: "RAILS_VERSION=5.1.6"
-    - rvm: 2.3.8
-      env: "RAILS_VERSION=5.2.1"
     - rvm: jruby-9.2.0.0
       env: "RAILS_VERSION=5.1.6 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
@@ -27,8 +25,6 @@ matrix:
   fast_finish: true
 
 before_install:
-  - gem install chromedriver-helper --no-document
-  - chromedriver-update 73.0.3683.68
   - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
 
 notifications:

data/CONTRIBUTING.md

@@ -0,0 +1,48 @@
+# Contributing to Blacklight
+
+Blacklight is a collaborative, open source project produced by developers from many diverse  organizations. The Blacklight developers want to create an out-of-the-box framework that is easy to install and get started with, both as a service to the community and in the interests of our own institutions in creating a sustainable project and product.
+
+Development is largely motivated by the needs of each developer’s organization, and we work on the shared project together so we can benefit from the community’s development efforts, experiences building discovery systems, and shared problem solving.
+
+We always welcome contributions from the community, especially to add new features, address bugs or defects, and clarify existing code for future developers.
+
+## Adding a ticket
+Let us know you're interested in working on a feature by filing a ticket in our [issue tracker](https://github.com/projectblacklight/blacklight/issues).
+
+## Making Your Changes
+
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so we don't break it in a future version unintentionally.
+* After making your changes, be sure to run the [Blacklight tests](https://github.com/projectblacklight/blacklight/wiki/testing) to make sure everything works.
+* Submit your change as a [Pull Request](https://help.github.com/en/articles/about-pull-requests).
+
+## Pull Requests and Code Review
+- Pull requests must be reviewed and approved by one non-author with write-permissions
+- A reviewer who has approved a PR but has not merged it should provide a comment (e.g. "This looks good, I'm just waiting for Travis to build", "This is a breaking change. I would like at least one more reviewer.")
+- An approved PR may be merged by the reviewer, the author, or another committer
+
+## Support
+If you are interested in working on the Blacklight plugin, but want guidance or support, please send an email to our [Blacklight-development mailing list](http://groups.google.com/group/blacklight-development) and we'll be glad to help.
+
+## Becoming a Committer
+
+Anyone can contribute to Blacklight using pull requests, the issue tracker, and being active on the mailing list and IRC channels. Being a contributor means that you take an active interest in the project and contribute regularly in some way, ranging from asking sensible questions (which documents the project and provides feedback to developers) to providing new features as patches.
+
+If you become a valuable contributor to the project you may be invited to become a committer.  Blacklight code contributors become committers after being sponsored by one of the current active committers.  The committers will take an Apache-style (+1/0/-1) vote to elevate them, and then a formal invitation will be extended to the contributor.
+
+Committers should be:
+
+- technically adept
+- constructive, positive members of the Blacklight software community
+- committed to producing useful, practical code for the community
+
+You're expected to:
+
+- contribute patches and new functionality to Blacklight and other shared development efforts (RSolr, Blacklight plugins, etc)
+- actively participate in technical discussions on the email list, IRC, and github
+- answer user support questions via the various channels
+- review pull requests from fellow committers and the community
+- test-drive new release candidates against your own institution's Blacklight applications
+- participate in regular committer meetings, usually in the form of conference calls, to coordinate development & direction

data/VERSION

@@ -1 +1 @@
-7.1.0.alpha
+7.1.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -160,17 +160,17 @@ Blacklight.onLoad(function () {
           //Set the Rails hidden field that fakes an HTTP verb
           //properly for current state action.
           form.find('input[name=_method]').val('delete');
-          span.text(form.attr('data-present'));
+          span.html(form.attr('data-present'));
         } else {
           form.find('input[name=_method]').val('put');
-          span.text(form.attr('data-absent'));
+          span.html(form.attr('data-absent'));
         }
       }
 
       form.append(checkboxDiv);
       updateStateFor(checked);
       checkbox.click(function () {
-        span.text(form.attr('data-inprogress'));
+        span.html(form.attr('data-inprogress'));
         label.attr('disabled', 'disabled');
         checkbox.attr('disabled', 'disabled');
         $.ajax({

data/app/assets/stylesheets/blacklight/_search_results.scss

@@ -13,7 +13,7 @@
     // bookmarks checkbox on index, give it some
     // lower margin when it collapses
     .index-document-functions {
-      margin-bottom: ($line-height-base / 2);
+      margin-bottom: ($spacer * 1.5);
 
       @media (min-width: breakpoint-min(sm)) {
         margin-bottom: 0;
@@ -22,8 +22,8 @@
 
     .document-thumbnail {
       float: right;
-      margin-bottom: $line-height-base;
-      padding-left: $line-height-base;
+      margin-bottom: ($spacer * 3);
+      padding-left: ($spacer * 3);
     }
   }
 }

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 # Methods added to this helper will be available to all templates in the hosting application
 module Blacklight::BlacklightHelperBehavior
-  include UrlHelperBehavior
-  include HashAsHiddenFieldsHelperBehavior
-  include LayoutHelperBehavior
-  include IconHelperBehavior
+  include Blacklight::UrlHelperBehavior
+  include Blacklight::HashAsHiddenFieldsHelperBehavior
+  include Blacklight::LayoutHelperBehavior
+  include Blacklight::IconHelperBehavior
 
   ##
   # Get the name of this application from an i18n string

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -153,8 +153,13 @@ module Blacklight::CatalogHelperBehavior
   #
   # @param [SolrDocument] document
   # @return [String]
-  def render_document_sidebar_partial(_document = @document)
-    render partial: 'show_sidebar'
+  def render_document_sidebar_partial(document = nil)
+    unless document
+      Deprecation.warn(self, 'render_document_sidebar_partial expects one argument ' /
+        '(@document) and you passed none. This behavior will be removed in version 8')
+      document = @document
+    end
+    render 'show_sidebar', document: document
   end
 
   ##

data/app/javascript/blacklight/checkbox_submit.js

@@ -73,10 +73,10 @@
                //Set the Rails hidden field that fakes an HTTP verb
                //properly for current state action.
                form.find('input[name=_method]').val('delete');
-               span.text(form.attr('data-present'));
+               span.html(form.attr('data-present'));
             } else {
                form.find('input[name=_method]').val('put');
-               span.text(form.attr('data-absent'));
+               span.html(form.attr('data-absent'));
             }
           }
 
@@ -84,7 +84,7 @@
         updateStateFor(checked);
 
         checkbox.click(function() {
-            span.text(form.attr('data-inprogress'));
+            span.html(form.attr('data-inprogress'));
             label.attr('disabled', 'disabled');
             checkbox.attr('disabled', 'disabled');
 

data/app/models/blacklight/icon.rb

@@ -7,9 +7,10 @@ module Blacklight
     # @param [String, Symbol] icon_name
     # @param [Hash] options
     # @param [String] classes additional classes separated by a string
-    def initialize(icon_name, classes: '')
+    def initialize(icon_name, classes: '', aria_hidden: false)
       @icon_name = icon_name
       @classes = classes
+      @aria_hidden = aria_hidden
     end
 
     ##
@@ -23,7 +24,8 @@ module Blacklight
     # @return [Hash]
     def options
       {
-        class: classes
+        class: classes,
+        "aria-hidden": (true if @aria_hidden)
       }
     end
 

data/app/models/record_mailer.rb

@@ -7,7 +7,10 @@ class RecordMailer < ActionMailer::Base
             rescue
               I18n.t('blacklight.email.text.default_title')
             end
-    subject = I18n.t('blacklight.email.text.subject', count: documents.length, title: title)
+
+    subject = I18n.t('blacklight.email.text.subject',
+                     count: documents.length,
+                     title: Array(title).first)
 
     @documents      = documents
     @message        = details[:message]

data/app/views/catalog/_facet_layout.html.erb

@@ -1,8 +1,10 @@
 <div class="card facet-limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet-limit-active' if facet_field_in_params?(facet_field.key) %>">
-  <h3 class="card-header <%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle facet-field-heading" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
+  <h3 class="card-header <%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle facet-field-heading" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>" id="<%= facet_field_id(facet_field) %>-header">
     <%= link_to facet_field_label(facet_field.key), "##{ facet_field_id(facet_field)}", "data-turbolinks": false %>
   </h3>
-  <div id="<%= facet_field_id(facet_field) %>" class="card-body panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'show' %>">
-    <%= yield %>
+  <div id="<%= facet_field_id(facet_field) %>" aria-labelledby="<%= facet_field_id(facet_field) %>-header" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'show' %>">
+    <div  class="card-body">
+      <%= yield %>
+    </div>
   </div>
 </div>

data/app/views/catalog/_search_form.html.erb

@@ -20,7 +20,7 @@
     <span class="input-group-append">
       <button type="submit" class="btn btn-primary search-btn" id="search">
         <span class="submit-search-text"><%= t('blacklight.search.form.submit') %></span>
-        <%= blacklight_icon :search %>
+        <%= blacklight_icon :search, aria_hidden: true %>
       </button>
     </span>
   </div>

data/app/views/catalog/_show_sidebar.html.erb

@@ -1,10 +1,12 @@
-<%= render :partial => 'show_tools' %>
-  
-<% unless @document.more_like_this.empty? %>
+<%= render 'show_tools' %>
+
+<% unless document.more_like_this.empty? %>
   <div class="card">
     <div class="card-header">More Like This</div>
     <div class="card-body">
-      <%= render :collection => @document.more_like_this, :partial => 'show_more_like_this', :as => :document %>
+      <%= render collection: document.more_like_this,
+                 partial: 'show_more_like_this',
+                 as: :document %>
     </div>
   </div>
-<% end %>
+<% end %>

data/app/views/catalog/_show_tools.html.erb

@@ -1,12 +1,3 @@
-<%-
-  # Compare with render_document_functions_partial helper, and
-  # _document_functions partial. BL actually has two groups
-  # of document-related tools. "document functions" by default
-  # contains Bookmark functionality shown on both results and
-  # item view. While "document tools" contains external export type
-  # functions by default only on detail.
-
--%>
 <% if show_doc_actions? %>
   <div class="card show-tools">
     <div class="card-header">

data/app/views/catalog/show.html.erb

@@ -8,5 +8,5 @@
 <%= render_document_main_content_partial %>
 
 <% content_for(:sidebar) do %>
-  <%= render_document_sidebar_partial %>
+  <%= render_document_sidebar_partial @document %>
 <% end %>

data/app/views/record_mailer/email_record.text.erb

@@ -1,5 +1,6 @@
-<% @documents.each do |document| %>
-<%= document.to_email_text %>
-<%= t('blacklight.email.text.url', :url =>polymorphic_url(document, @url_gen_params)) %>
-<% end %>
-<%= t('blacklight.email.text.message', :message => @message) %>
+<% @documents.each do |document| %>
+<%= document.to_email_text %>
+<%= t('blacklight.email.text.url', :url =>polymorphic_url(document, @url_gen_params)) %>
+
+<% end %>
+<%= t('blacklight.email.text.message', :message => @message) %>

data/app/views/shared/_header_navbar.html.erb

@@ -11,7 +11,7 @@
   </div>
 </nav>
 
-<div class="navbar-search navbar navbar-light bg-faded" role="navigation">
+<div class="navbar-search navbar navbar-light bg-light" role="navigation">
   <div class="<%= container_classes %>">
     <%= render_search_bar  %>
   </div>

data/blacklight.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara", '~> 3'
-  s.add_development_dependency 'chromedriver-helper', '~> 2.1'
+  s.add_development_dependency 'webdrivers', '~> 3.0'
   s.add_development_dependency "selenium-webdriver", '>= 3.13.1'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency "equivalent-xml"

data/package-lock.json

@@ -1884,9 +1884,9 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "jquery": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
-      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -1928,9 +1928,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "map-cache": {
@@ -1989,9 +1989,9 @@
       "dev": true
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -2291,9 +2291,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "optional": true,
       "requires": {

data/package.json

@@ -24,7 +24,7 @@
   "dependencies": {
     "bloodhound-js": "^1.2.3",
     "bootstrap": "^4.3.1",
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.1",
     "typeahead.js": "^0.11.1"
   }
 }

data/spec/models/blacklight/document/cache_key_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Blacklight::Document::CacheKey, api: true do
   let(:subject) { SolrDocument.new(attributes) }
 
   it 'SolrDocument includes the module' do
-    expect(subject.class).to include(Blacklight::Document::CacheKey)
+    expect(subject.class).to include(described_class)
   end
 
   describe 'new record' do

data/spec/models/blacklight/icon_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::Icon do
-  subject { described_class.new(:search, classes: 'awesome') }
+  subject { described_class.new(:search, classes: 'awesome', aria_hidden: true) }
 
   describe '#svg' do
     it 'returns a string' do
@@ -17,6 +17,20 @@ RSpec.describe Blacklight::Icon do
     it 'applies options classes and default class' do
       expect(subject.options[:class]).to eq 'blacklight-icons awesome'
     end
+    it 'applies options aria-hidden=true' do
+      expect(subject.options[:'aria-hidden']).to be true
+    end
+    context 'no options provided' do
+      subject { described_class.new(:view) }
+
+      it 'applies default class with no options' do
+        expect(subject.options[:class]).to eq 'blacklight-icons'
+      end
+
+      it 'has no aria-hidden attribute with no options' do
+        expect(subject.options[:'aria-hidden']).to be nil
+      end
+    end
   end
 
   describe '#path' do

data/spec/models/blacklight/solr/response/facets_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe Blacklight::Solr::Response::Facets, api: true do
   describe Blacklight::Solr::Response::Facets::FacetField do
     describe "A field with default options" do
-      subject { Blacklight::Solr::Response::Facets::FacetField.new "my_field", [] }
+      subject { described_class.new "my_field", [] }
 
       its(:name) { is_expected.to eq "my_field" }
       its(:limit) { is_expected.to eq 100 }
@@ -12,7 +12,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     end
 
     describe "A field with additional options" do
-      subject { Blacklight::Solr::Response::Facets::FacetField.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
+      subject { described_class.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
 
       its(:name) { is_expected.to eq "my_field" }
       its(:limit) { is_expected.to eq 15 }

data/spec/models/blacklight/solr/response_spec.rb

@@ -6,9 +6,9 @@ RSpec.describe Blacklight::Solr::Response, api: true do
   let(:config) { Blacklight::Configuration.new }
 
   let(:r) do
-    Blacklight::Solr::Response.new(raw_response,
-                                   raw_response['params'],
-                                   blacklight_config: config)
+    described_class.new(raw_response,
+                        raw_response['params'],
+                        blacklight_config: config)
   end
 
   it 'creates a valid response' do
@@ -113,13 +113,13 @@ RSpec.describe Blacklight::Solr::Response, api: true do
   it 'provides the responseHeader params' do
     raw_response = eval(mock_query_response)
     raw_response['responseHeader']['params']['test'] = :test
-    r = Blacklight::Solr::Response.new(raw_response, raw_response['params'])
+    r = described_class.new(raw_response, raw_response['params'])
     expect(r.params['test']).to eq :test
   end
 
   it 'provides the solr-returned params and "rows" should be 11' do
     raw_response = eval(mock_query_response)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.params[:rows].to_s).to eq '11'
     expect(r.params[:sort]).to eq 'title_si asc, pub_date_si desc'
   end
@@ -127,42 +127,42 @@ RSpec.describe Blacklight::Solr::Response, api: true do
   it 'provides the ruby request params if responseHeader["params"] does not exist' do
     raw_response = eval(mock_query_response)
     raw_response.delete 'responseHeader'
-    r = Blacklight::Solr::Response.new(raw_response, rows: 999, sort: 'score desc, pub_date_si desc, title_si asc')
+    r = described_class.new(raw_response, rows: 999, sort: 'score desc, pub_date_si desc, title_si asc')
     expect(r.params[:rows].to_s).to eq '999'
     expect(r.params[:sort]).to eq 'score desc, pub_date_si desc, title_si asc'
   end
 
   it 'provides spelling suggestions for regular spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.spelling.words).to include("dell")
     expect(r.spelling.words).to include("ultrasharp")
   end
 
   it 'provides spelling suggestions for extended spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck_extended)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.spelling.words).to include("dell")
     expect(r.spelling.words).to include("ultrasharp")
   end
 
   it 'provides no spelling suggestions when extended results and suggestion frequency is the same as original query frequency' do
     raw_response = eval(mock_response_with_spellcheck_same_frequency)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.spelling.words).to eq []
   end
 
   context "pre solr 5 spellcheck collation syntax" do
     it 'provides spelling suggestions for a regular spellcheck results with a collation' do
       raw_response = eval(mock_response_with_spellcheck_collation)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.words).to include("dell")
       expect(r.spelling.words).to include("ultrasharp")
     end
 
     it 'provides spelling suggestion collation' do
       raw_response = eval(mock_response_with_spellcheck_collation)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.collation).to eq 'dell ultrasharp'
     end
   end
@@ -170,14 +170,14 @@ RSpec.describe Blacklight::Solr::Response, api: true do
   context "solr 5 spellcheck collation syntax" do
     it 'provides spelling suggestions for a regular spellcheck results with a collation' do
       raw_response = eval(mock_response_with_spellcheck_collation_solr5)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.words).to include("dell")
       expect(r.spelling.words).to include("ultrasharp")
     end
 
     it 'provides spelling suggestion collation' do
       raw_response = eval(mock_response_with_spellcheck_collation_solr5)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.collation).to eq 'dell ultrasharp'
     end
   end
@@ -185,7 +185,7 @@ RSpec.describe Blacklight::Solr::Response, api: true do
   context 'solr 6.5 spellcheck collation syntax' do
     it 'provides spelling suggestions for a regular spellcheck results with a collation' do
       raw_response = eval(mock_response_with_spellcheck_collation_solr65)
-      r = Blacklight::Solr::Response.new(raw_response, {})
+      r = described_class.new(raw_response, {})
       expect(r.spelling.words).to include("dell")
       expect(r.spelling.words).to include("ultrasharp")
     end
@@ -193,19 +193,19 @@ RSpec.describe Blacklight::Solr::Response, api: true do
 
   it "provides MoreLikeThis suggestions" do
     raw_response = eval(mock_response_with_more_like_this)
-    r = Blacklight::Solr::Response.new(raw_response, {})
+    r = described_class.new(raw_response, {})
     expect(r.more_like(double(id: '79930185'))).to have(2).items
   end
 
   it "is empty when the response has no results" do
-    r = Blacklight::Solr::Response.new({}, {})
+    r = described_class.new({}, {})
     allow(r).to receive_messages(total: 0)
     expect(r).to be_empty
   end
 
   describe "#export_formats" do
     it "collects the unique export formats for the current response" do
-      r = Blacklight::Solr::Response.new({}, {})
+      r = described_class.new({}, {})
       allow(r).to receive_messages(documents: [double(export_formats: { a: 1, b: 2 }), double(export_formats: { b: 1, c: 2 })])
       expect(r.export_formats).to include :a, :b
     end

data/spec/models/blacklight/suggest/response_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Blacklight::Suggest::Response, api: true do
 
   describe '#initialize' do
     it 'creates a Blacklight::Suggest::Response' do
-      expect(empty_response).to be_an Blacklight::Suggest::Response
+      expect(empty_response).to be_an described_class
     end
   end
 

data/spec/models/solr_document_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe SolrDocument, api: true do
   describe "access methods" do
     let(:solrdoc) do
-      SolrDocument.new(id: '00282214', format: ['Book'], title_tsim: 'some-title')
+      described_class.new(id: '00282214', format: ['Book'], title_tsim: 'some-title')
     end
 
     describe "#[]" do

data/spec/spec_helper.rb

@@ -22,19 +22,9 @@ require 'rspec/collection_matchers'
 require 'capybara/rspec'
 require 'selenium-webdriver'
 require 'equivalent-xml'
-require 'chromedriver-helper'
+require 'webdrivers'
 
-Capybara.javascript_driver = :headless_chrome
-
-Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu no-sandbox] }
-  )
-
-  Capybara::Selenium::Driver.new(app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities)
-end
+Capybara.javascript_driver = :selenium_chrome_headless
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

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

@@ -28,13 +28,13 @@ RSpec.describe "catalog/facet_layout" do
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_selector '.card-header.collapsed'
-    expect(rendered).to have_selector '.collapse.card-body'
+    expect(rendered).to have_selector '.collapse .card-body'
   end
 
   it "is configured to be open by default" do
     allow(facet_field).to receive_messages(collapse: false)
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).not_to have_selector '.card-header.collapsed'
-    expect(rendered).to have_selector '.show.card-body'
+    expect(rendered).to have_selector '.show .card-body'
   end
 end

data/spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -17,9 +17,9 @@ RSpec.describe "/catalog/_show_sidebar.html.erb" do
   end
 
   it "shows more-like-this titles in the sidebar" do
-    @document = SolrDocument.new id: 1, title_s: 'abc', format: 'default'
-    allow(@document).to receive(:more_like_this).and_return([SolrDocument.new('id' => '2', 'title_tsim' => 'Title of MLT Document')])
-    render
+    document = SolrDocument.new id: 1, title_s: 'abc', format: 'default'
+    allow(document).to receive(:more_like_this).and_return([SolrDocument.new('id' => '2', 'title_tsim' => 'Title of MLT Document')])
+    render 'catalog/show_sidebar', document: document
     expect(rendered).to include("More Like This")
     expect(rendered).to include("Title of MLT Document")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.1.0.alpha
+  version: 7.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,19 +180,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +312,7 @@ files:
 - ".solr_wrapper.yml"
 - ".travis.yml"
 - ".yardopts"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -739,12 +740,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)