Test by default with Rails 5.2

simukappu · May 5, 2018 · 7185859 · 7185859
1 parent a6ade8f
commit 7185859
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,62 +5,66 @@ branches:
     - images
 
 rvm:
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
+  - 2.2.10
   - ruby-head
 
 gemfile:
   - Gemfile
   - gemfiles/Gemfile.rails-4.2
   - gemfiles/Gemfile.rails-5.0
   - gemfiles/Gemfile.rails-5.1
+  - gemfiles/Gemfile.rails-5.2
 
 env:
   - AN_ORM=active_record
   - AN_ORM=mongoid
 
 matrix:
   exclude:
-    - rvm: 2.1.10
-      gemfile: Gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-5.0
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-5.1
     - rvm: ruby-head
       env: AN_ORM=mongoid
     - gemfile: Gemfile
       env: AN_ORM=mongoid
   include:
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-4.2
       env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-4.2
       env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-4.2
       env: AN_ORM=mongoid AN_TEST_DB=mongodb
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-5.0
       env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-5.0
       env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-5.0
       env: AN_ORM=mongoid AN_TEST_DB=mongodb
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-5.1
       env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-5.1
       env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.4.1
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile.rails-5.1
       env: AN_ORM=mongoid AN_TEST_DB=mongodb
+    - rvm: 2.5.1
+      gemfile: gemfiles/Gemfile.rails-5.2
+      env: AN_ORM=active_record AN_TEST_DB=mysql
+    - rvm: 2.5.1
+      gemfile: gemfiles/Gemfile.rails-5.2
+      env: AN_ORM=active_record AN_TEST_DB=postgresql
+    - rvm: 2.5.1
+      gemfile: gemfiles/Gemfile.rails-5.2
+      env: AN_ORM=mongoid AN_TEST_DB=mongodb
   allow_failures:
     - rvm: ruby-head
   fast_finish: true
@@ -72,7 +76,9 @@ sudo: false
 
 cache: bundler
 
-before_install: "rm ${BUNDLE_GEMFILE}.lock"
+before_install:
+  - gem install bundler --no-document
+  - rm ${BUNDLE_GEMFILE}.lock
 
 before_script:
   - bundle update

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 5.1'
+gem 'rails', '~> 5.2'
 
 group :development do
   gem 'bullet'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -228,7 +228,7 @@ DEPENDENCIES
   mongoid (>= 4.0.0)
   mysql2 (~> 0.5.1)
   pg (~> 1.0.0)
-  rails (~> 5.1)
+  rails (~> 5.2)
   rails-controller-testing
   rspec-rails (~> 3.7.2)
   simplecov (~> 0)