Merge branch 'master' into bugfix-opensearch-routing

geoblacklight · Dec 13, 2017 · b266487 · b266487
2 parents 7a806b6 + bf81789
commit b266487
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/geoblacklight.gemspec b/geoblacklight.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 2.5.2'
 
   spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'blacklight', '~> 6.10'
+  spec.add_dependency 'blacklight', '<= 6.11.0'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'config'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,7 +14,7 @@
 
 Capybara.register_driver(:headless_chrome) do |app|
   capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w(headless disable-gpu) }
+    chromeOptions: { args: %w(headless disable-gpu window-size=1280,1024) }
   )
 
   Capybara::Selenium::Driver.new(app,