From 958795fdc15b5d562e2fd66f5ee32e065c7f1c06 Mon Sep 17 00:00:00 2001
From: Jon Atack <jonnyatack@gmail.com>
Date: Fri, 21 Aug 2015 12:33:12 +0200
Subject: [PATCH] Travis-ci updates

- Add test for Rails master with MongoDB (allowing failure).

- Test Rails 3.1/3.2 with Ruby 2.2 (allowing failure), but not 2.2.3.
---
 .travis.yml | 47 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29a41dd..141ab07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,23 +35,30 @@ env:
 
 matrix:
   include:
+    - rvm: 2.2.3
+      env: RAILS=master DB=mongodb
     - rvm: 2.2.3
       env: RAILS=master DB=sqlite3
     - rvm: 2.2.3
       env: RAILS=master DB=mysql
     - rvm: 2.2.3
       env: RAILS=master DB=postgres
-  exclude:
+
     - rvm: 2.2
-      env: RAILS=3-1-stable DB=sqlite
+      env: RAILS=3-2-stable DB=sqlite3
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=postgres
+
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=sqlite3
     - rvm: 2.2
       env: RAILS=3-1-stable DB=mysql
     - rvm: 2.2
       env: RAILS=3-1-stable DB=postgres
-  allow_failures:
-    - env: RAILS=master DB=sqlite3
-    - env: RAILS=master DB=mysql
-    - env: RAILS=master DB=postgres
+
+  exclude:
     - rvm: 2.2.3
       env: RAILS=3-2-stable DB=sqlite
     - rvm: 2.2.3
@@ -59,6 +66,34 @@ matrix:
     - rvm: 2.2.3
       env: RAILS=3-2-stable DB=postgres
 
+    - rvm: 2.2.3
+      env: RAILS=3-1-stable DB=sqlite
+    - rvm: 2.2.3
+      env: RAILS=3-1-stable DB=mysql
+    - rvm: 2.2.3
+      env: RAILS=3-1-stable DB=postgres
+
+  allow_failures:
+    - env: RAILS=master DB=mongodb
+    - env: RAILS=master DB=sqlite3
+    - env: RAILS=master DB=mysql
+    - env: RAILS=master DB=postgres
+
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=postgres
+
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=postgres
+
+
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'
   - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'