Merge branch 'master' into remove_skydrive

.engine_cart.yml

@@ -1 +1,2 @@
-rails_options: "<%= '--skip-listen' if ENV.fetch('RAILS_VERSION', '') < '5.0' %>"
+# Skipping test because rails 5.1.0 generates with an old version of capybara
+rails_options: "--skip-test <%= '--skip-listen' if ENV.fetch('RAILS_VERSION', '') < '5.0' %>"

.travis.yml

@@ -12,21 +12,16 @@ before_install:
   - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
   - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
   - "phantomjs --version"
+
 rvm:
-  - "2.2.2"
-# rack 2 requires Ruby version >= 2.2.2
+  - "2.4.1"
+global_env:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  matrix:
-    - "RAILS_VERSION=4.1.10"
-    - "RAILS_VERSION=4.2.1"
-    - "RAILS_VERSION=5.0.0.1"
+  - "RAILS_VERSION=5.1.0"
 matrix:
   include:
-    - rvm: "2.3.0"
-      env: "RAILS_VERSION=5.0.1"
-    - rvm: 2.2.6
-      env: "RAILS_VERSION=4.2.7.1"
-    - rvm: 2.4.0
-      env: "RAILS_VERSION=5.0.1"
+    - rvm: "2.3.4"
+      env: "RAILS_VERSION=5.0.2"
+    - rvm: 2.2.7
+      env: "RAILS_VERSION=4.2.8"

Gemfile

@@ -28,12 +28,13 @@ else
   end
 
   case ENV['RAILS_VERSION']
+  when /^5.1/
+    gem 'capybara', '~> 2.13.0'
   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'
+    gem 'json', '~> 1.8'
   end
 end
 # END ENGINE_CART BLOCK