From 94678f977a285543634f1db8ae6ba7f4f29085f7 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Fri, 24 Apr 2015 16:28:27 -0400
Subject: [PATCH] Update travis config file

A few things in here:
- Test on ruby 2.2
- Allow failures in all variants of RAILS_MASTER test
- Use db:create task
---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64d25f1d1..64d37609c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,16 +13,14 @@ addons:
 
 matrix:
   allow_failures:
-    - rvm: 2.0.0
-      env: "RAILS_MASTER=1"
-    - rvm: 2.1
-      env: "RAILS_MASTER=1"
+    - env: "RAILS_MASTER=1"
     - rvm: rbx-2
   fast_finish: true
 
 rvm:
   - 2.0.0
   - 2.1
+  - 2.2
   - rbx-2
 
 services:
@@ -37,8 +35,7 @@ before_install:
   - jshint .
 
 before_script:
-  - psql -c 'create database discourse_test;' -U postgres
-  - bundle exec rake db:migrate
+  - bundle exec rake db:create db:migrate
 
 bundler_args: --without development --deployment --retry=3 --jobs=3