RubyGems - blacklight - Versions diffs - 6.20.0 → 6.21.0 - Mend

blacklight 6.20.0 → 6.21.0

Files changed (12) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469ca5ef4136d32bb5afe11a51dc7eeec97c6b0eded26f0e2d1a9c607fa175a1
-  data.tar.gz: 7061a8348a91417bffdacb4f7f508e3f1cba134d754ca1cbbe33743229e09e31
+  metadata.gz: 481b96adfac07b1cb0009bc9969f299a3a5bab9f519b38c5f0b0f1ccd7a45ec6
+  data.tar.gz: 0c237ece3ec9a48dfd7ddfa45086ca64c807bef013f5f2a0357f47bebe84b0be
 SHA512:
-  metadata.gz: 6427d562139eb605f5bd5e53d61a9f13abb2a1c35430fc20e21fc8e3a3035f8b7c6c2a9f8b72449db2a6478410a64cd1031ed7e17e42611ceb3be0ebe1b65fa9
-  data.tar.gz: c0a27859a10d9c1a97bc2f16794d000b407704146f543aec1acd77fe714626e4ce6cc8e2d93be9d7d066ddb4bccf2faaf84107d5dc9e9266f69c3fcb9bec8566
+  metadata.gz: b94d6eb3e43c0fa7d5144370f43e3990491e5014977258782a775939bc12610b5fd7aa1c5521e3bbfb51785f652ca1fb8afdefd9f88ed078f56fdf3130152f20
+  data.tar.gz: 7dfc79605ae0f1763eed7322273dcdb1b66c9655c94522a5795dc9d122c412fb855aac1ecc43f43bc9b0eb7a0a037c494769f4265b4bfa2418ccef6305583c2a

data/.travis.yml CHANGED

@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 addons:
   chrome: stable
 language: ruby
@@ -8,11 +8,11 @@ notifications:
   email: false
 rvm:
-  - 2.5.0
+  - 2.5.7
 matrix:
   include:
-    - rvm: 2.5.0
+    - rvm: 2.5.7
       env: "RAILS_VERSION=5.2.0"
     - rvm: 2.4.4
       env: "RAILS_VERSION=4.2.10"
@@ -50,4 +50,4 @@ global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-jdk: oraclejdk8
+jdk: openjdk11

data/Gemfile CHANGED

@@ -32,6 +32,8 @@ else
   end
   case ENV['RAILS_VERSION']
+  when /^5.[12]/
+    gem 'sass-rails', '~> 5.0'
   when /^4.2/
     gem 'responders', '~> 2.0'
     gem 'sass-rails', '>= 5.0'

data/VERSION CHANGED

@@ -11,6 +11,13 @@ module Blacklight
       "#{main_content_classes} show-document"
     end
+    ##
+    # Attributes to add to the <html> tag (e.g. lang and dir)
+    # @return [Hash]
+    def html_tag_attributes
+      { lang: I18n.locale }
+    end
     ##
     # Classes added to a document's sidebar div
     # @return [String]

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" class="no-js">
+<%= content_tag :html, class: 'no-js', **html_tag_attributes do %>
   <head>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -41,4 +41,4 @@
   <%= render :partial => 'shared/footer' %>
   </body>
-</html>
+<% end %>

data/blacklight.gemspec CHANGED

@@ -40,7 +40,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", '>= 2', '< 4'
-  s.add_development_dependency 'chromedriver-helper', '< 2.0.0' # 2.1.0 is causing "Unable to find chromedriver" on Travis
+  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/solr/conf/schema.xml CHANGED

@@ -308,7 +308,6 @@
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -317,7 +316,6 @@
     <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
        <analyzer>
           <tokenizer class="solr.KeywordTokenizerFactory"/>
-          <filter class="solr.StandardFilterFactory"/>
           <filter class="solr.LowerCaseFilterFactory"/>
           <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
-describe "Search Page" do
+RSpec.describe "Search Page" do
+  it 'declares the page language in the html lang attribute' do
+    visit root_path
+    expect(page).to have_selector('html[lang=en]')
+  end
   it "shows welcome" do
     visit root_path
     expect(page).to have_selector("input#q")
@@ -116,4 +121,3 @@ describe "Search Page" do
     expect(page).to have_content "No results found for your search"
   end
 end

@@ -35,4 +35,14 @@ describe LayoutHelper do
       expect(helper.container_classes).to eq 'container'
     end
   end
+  describe '#html_tag_attributes' do
+    before do
+      allow(I18n).to receive(:locale).and_return('x')
+    end
+    it 'returns the current locale as the lang' do
+      expect(helper.html_tag_attributes).to include lang: 'x'
+    end
+  end
 end

data/spec/spec_helper.rb CHANGED

@@ -25,20 +25,10 @@ require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
-require 'selenium-webdriver'
+require 'webdrivers'
 require 'equivalent-xml'
-Capybara.javascript_driver = :headless_chrome
-Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu] }
-  )
-  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.

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.20.0
+  version: 6.21.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,19 +234,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -784,8 +784,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       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)