diff --git a/.travis.yml b/.travis.yml
index 540343a..6a5f092 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
language: ruby
-sudo: false
script: bundle exec rake ci
@@ -7,11 +6,10 @@ notifications:
email: false
rvm:
- - 2.3.0
+ - 2.5.3
env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-before_script:
- - jdk_switcher use oraclejdk8
\ No newline at end of file
+jdk: openjdk11
diff --git a/Gemfile b/Gemfile
index 789152f..8548f6c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'coveralls', require: false
# gem 'byebug', group: [:development, :test]
# BEGIN ENGINE_CART BLOCK
-# engine_cart: 1.0.1
+# engine_cart: 2.3.0
# engine_cart stanza: 0.10.0
# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
@@ -39,14 +39,9 @@ else
gem 'rails', ENV['RAILS_VERSION']
end
end
-
- case ENV['RAILS_VERSION']
- when /^4.2/
- gem 'responders', '~> 2.0'
- gem 'sass-rails', '>= 5.0'
- gem 'coffee-rails', '~> 4.1.0'
- when /^4.[01]/
- gem 'sass-rails', '< 5.0'
- end
end
# END ENGINE_CART BLOCK
+
+unless File.exist?(file)
+ eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__))
+end
diff --git a/Rakefile b/Rakefile
index b74614f..6c85ae2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,4 +10,4 @@ load 'tasks/blacklight_heatmaps.rake'
require 'engine_cart/rake_task'
-task default: :spec
+task default: [:ci]
diff --git a/blacklight_heatmaps.gemspec b/blacklight_heatmaps.gemspec
index 29df3cd..96bd15a 100644
--- a/blacklight_heatmaps.gemspec
+++ b/blacklight_heatmaps.gemspec
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'rspec-rails', '~> 3.4'
- s.add_development_dependency 'engine_cart', '~> 1.0'
+ s.add_development_dependency 'engine_cart', '~> 2.0'
s.add_development_dependency 'solr_wrapper'
s.add_development_dependency 'capybara'
- s.add_development_dependency 'poltergeist'
+ s.add_development_dependency 'webdrivers'
end
diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml
index 6fb1196..caa0a51 100644
--- a/solr/conf/schema.xml
+++ b/solr/conf/schema.xml
@@ -308,7 +308,6 @@
-
@@ -317,7 +316,6 @@
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0a72b99..fc726fd 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,8 +17,9 @@
Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each { |f| require f }
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
+require 'webdrivers/chromedriver'
+
+Capybara.javascript_driver = :selenium_chrome_headless
require 'blacklight'
require 'blacklight_heatmaps'
diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra
new file mode 100644
index 0000000..b62b467
--- /dev/null
+++ b/spec/test_app_templates/Gemfile.extra
@@ -0,0 +1 @@
+gem 'sprockets', '< 4'
diff --git a/tasks/blacklight_heatmaps.rake b/tasks/blacklight_heatmaps.rake
index caea922..3168f4a 100644
--- a/tasks/blacklight_heatmaps.rake
+++ b/tasks/blacklight_heatmaps.rake
@@ -3,13 +3,7 @@
require 'solr_wrapper'
require 'engine_cart/rake_task'
require 'rspec/core/rake_task'
-
-desc 'Run specs'
-RSpec::Core::RakeTask.new do |t|
-end
-
-
-EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+RSpec::Core::RakeTask.new(:spec)
desc 'Run test suite'
task ci: ['blacklight_heatmaps:generate'] do
diff --git a/vendor/assets/javascripts/leaflet_solr_heatmap.js b/vendor/assets/javascripts/leaflet_solr_heatmap.js
index 96b7b79..9e6451c 100644
--- a/vendor/assets/javascripts/leaflet_solr_heatmap.js
+++ b/vendor/assets/javascripts/leaflet_solr_heatmap.js
@@ -28,20 +28,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
_computeHeatmapObject: function (data) {
var _this = this;
- _this.facetHeatmap = {},
- facetHeatmapArray = data.response.facet_heatmaps[this.options.field];
-
- // Convert array to an object
- $.each(facetHeatmapArray, function (index, value) {
- if ((index + 1) % 2 !== 0) {
- // Set object keys for even items
- _this.facetHeatmap[value] = '';
- }else {
- // Set object values for odd items
- _this.facetHeatmap[facetHeatmapArray[index - 1]] = value;
- }
- });
-
+ _this.facetHeatmap = data.response.facet_heatmaps[this.options.field];
this._computeIntArrays();
},