Merge pull request #63 from sul-dlss/update-dep

update dependencies and fix test suite.
sul-dlss-deprecated · Feb 5, 2018 · 4a7e94b · 4a7e94b
2 parents d9ef838 + 1218269
commit 4a7e94b
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 105 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 language: ruby
 rvm:
   - '2.3.4'
-sudo: false
+sudo: required
+addons:
+  chrome: stable
 jdk:
   - oraclejdk8
+
+before_install:
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
diff --git a/Gemfile b/Gemfile
@@ -39,7 +39,8 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'rails-controller-testing'
   gem 'capybara'
-  gem 'poltergeist'
+  gem 'capybara-selenium'
+  gem 'chromedriver-helper'
   gem 'coveralls', require: false
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,39 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.0.6)
+      actionpack (= 5.0.6)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actionmailer (5.0.6)
+      actionpack (= 5.0.6)
+      actionview (= 5.0.6)
+      activejob (= 5.0.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.0.6)
+      actionview (= 5.0.6)
+      activesupport (= 5.0.6)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.0.6)
+      activesupport (= 5.0.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.6)
+      activesupport (= 5.0.6)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
+    activemodel (5.0.6)
+      activesupport (= 5.0.6)
+    activerecord (5.0.6)
+      activemodel (= 5.0.6)
+      activesupport (= 5.0.6)
       arel (~> 7.0)
-    activesupport (5.0.1)
+    activesupport (5.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -42,6 +42,8 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     airbrussh (1.1.2)
       sshkit (>= 1.6.1, != 1.7.0)
+    archive-zip (0.7.0)
+      io-like (~> 0.3.0)
     arel (7.1.4)
     autoprefixer-rails (6.7.3)
       execjs
@@ -96,7 +98,14 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    cliver (0.3.2)
+    capybara-selenium (0.0.6)
+      capybara
+      selenium-webdriver
+    childprocess (0.8.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.1.0)
+      archive-zip (~> 0.7.0)
+      nokogiri (~> 1.6)
     coderay (1.1.0)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
@@ -105,7 +114,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     config (1.4.0)
       activesupport (>= 3.0)
       deep_merge (~> 1.1.1)
@@ -118,6 +127,7 @@ GEM
       tins (~> 1.6.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.3)
     debug_inspector (0.0.2)
     deep_merge (1.1.1)
     deprecation (1.0.0)
@@ -141,22 +151,25 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    faraday (0.12.0.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    font-awesome-rails (4.7.0.2)
+    ffi (1.9.18)
+    font-awesome-rails (4.7.0.3)
       railties (>= 3.2, < 5.2)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
     hashdiff (0.3.2)
     honeybadger (3.1.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    i18n (0.8.1)
+    i18n (0.9.3)
+      concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
     iso-639 (0.2.5)
     jbuilder (2.6.2)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.2.2)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -174,17 +187,19 @@ GEM
       kaminari-core (= 1.0.1)
     kaminari-core (1.0.1)
     libv8 (3.16.14.19)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     material_icons (2.2.1)
       railties (>= 3.2)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    mirador_rails (0.5.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    mirador_rails (0.7.0)
       font-awesome-rails
       jquery-rails
       material_icons
@@ -204,53 +219,49 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (4.1.0)
     netrc (0.11.0)
-    nio4r (1.2.1)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
+    nio4r (2.2.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     nom-xml (0.5.4)
       activesupport (>= 3.2.18)
       i18n
       nokogiri
-    openseadragon (0.3.3)
+    openseadragon (0.4.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
-    poltergeist (1.13.0)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     public_suffix (2.0.5)
     puma (3.7.0)
-    rack (2.0.1)
+    rack (2.0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+    rails (5.0.6)
+      actioncable (= 5.0.6)
+      actionmailer (= 5.0.6)
+      actionpack (= 5.0.6)
+      actionview (= 5.0.6)
+      activejob (= 5.0.6)
+      activemodel (= 5.0.6)
+      activerecord (= 5.0.6)
+      activesupport (= 5.0.6)
+      bundler (>= 1.3.0)
+      railties (= 5.0.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.1)
       actionpack (~> 5.x)
       actionview (~> 5.x)
       activesupport (~> 5.x)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.0.6)
+      actionpack (= 5.0.6)
+      activesupport (= 5.0.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.0)
     rdoc (4.3.0)
     ref (2.0.0)
     responders (2.3.0)
@@ -259,8 +270,10 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rsolr (1.1.2)
+    retriable (3.1.1)
+    rsolr (2.1.0)
       builder (>= 2.1.2)
+      faraday (>= 0.9.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -278,7 +291,7 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sass (3.4.23)
@@ -291,20 +304,24 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    selenium-webdriver (3.8.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    solr_wrapper (0.21.0)
+    solr_wrapper (1.2.0)
       faraday
+      retriable
       ruby-progressbar
       rubyzip
     spring (1.4.3)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -323,13 +340,13 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.6)
     tins (1.6.0)
-    tinymce-rails (4.5.7)
+    tinymce-rails (4.7.6)
       railties (>= 3.1.1)
     twitter-typeahead-rails (0.11.1.pre.corejavascript)
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -349,7 +366,7 @@ GEM
       hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -366,6 +383,8 @@ DEPENDENCIES
   capistrano-rails
   capistrano-rvm
   capybara
+  capybara-selenium
+  chromedriver-helper
   coderay
   coffee-rails
   config
@@ -379,7 +398,6 @@ DEPENDENCIES
   mirador_rails (~> 0.3)
   mods_display (= 0.3.4)
   mysql2
-  poltergeist
   puma
   rails (~> 5.0, >= 5.0.1)
   rails-controller-testing
@@ -398,4 +416,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.1
+   1.16.1
diff --git a/app/models/concerns/mods_data.rb b/app/models/concerns/mods_data.rb
@@ -95,7 +95,7 @@ def mods_to_solr
     # All the pub dates in int years
     solr_doc['pub_date_t'] = dates[:all_int]
     # average of pub dates for sort
-    solr_doc['pub_date_sort'] = dates[:sort]
+    solr_doc['pub_date_sort'] = dates[:sort].presence
     # pub date for display
     solr_doc['pub_date_display'] = display_date(data.pub_dates)
     solr_doc['place_search'] = data.place