From 3d93d2c7cd784f52646c330a1eb783b75ce9e033 Mon Sep 17 00:00:00 2001
From: Matthew Horan <matt@matthoran.com>
Date: Sun, 29 Jun 2014 22:55:47 -0400
Subject: [PATCH] Update Travis builds

* Test Capybara 2.2 and 2.3 compatibility on all platforms.
* Drop support for Capybara 2.0.
* Only test Qt 5 on 1.9.3. The C implementation is the same for all Ruby
  versions, so there's no need to test against all platforms.
---
 .travis.yml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77b05b31..031afa9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,30 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.1.2
   - jruby-19mode
+notifications:
+  email: false
+script: xvfb-run rake
+env:
+  global:
+    - BUNDLE_JOBS=4
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 matrix:
-  exclude:
+  include:
     - rvm: 1.9.3
-      gemfile: gemfiles/2.0.gemfile
+      gemfile: gemfiles/2.1.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-    - rvm: 2.0.0
-      gemfile: gemfiles/2.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/2.2.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-    - rvm: jruby-19mode
-      gemfile: gemfiles/2.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/2.3.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-notifications:
-  email: false
-script: xvfb-run rake
-env:
-  - QMAKE=/usr/bin/qmake
-  - QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
 gemfile:
-  - gemfiles/2.0.gemfile
   - gemfiles/2.1.gemfile
+  - gemfiles/2.2.gemfile
+  - gemfiles/2.3.gemfile
 before_install:
   - sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
   - sudo apt-get update