Update appraisals (#1249)

Author: dks17

.travis.yml

@@ -5,14 +5,11 @@ services:
   - mongodb
 bundler_args: --without development
 
-before_install:
-  - gem install bundler
-
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 
 gemfile:
   - gemfiles/rails_4_2.gemfile
@@ -30,26 +27,26 @@ env:
 
 matrix:
   include:
-  - rvm: 2.2.10
+  - rvm: 2.3.8
     gemfile: gemfiles/rails_4_2_mongoid_5.gemfile
     env: DEVISE_TOKEN_AUTH_ORM=mongoid
-  - rvm: 2.3.7
+  - rvm: 2.3.8
     gemfile: gemfiles/rails_5_1_mongoid_6.gemfile
     env: DEVISE_TOKEN_AUTH_ORM=mongoid
-  - rvm: 2.4.4
+  - rvm: 2.4.5
     gemfile: gemfiles/rails_5_1_mongoid_7.gemfile
     env: DEVISE_TOKEN_AUTH_ORM=mongoid
-  - rvm: 2.5.1
+  - rvm: 2.5.3
     gemfile: gemfiles/rails_5_2_mongoid_6.gemfile
     env: DEVISE_TOKEN_AUTH_ORM=mongoid
-  - rvm: 2.5.1
+  - rvm: 2.5.3
     gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
     env: DEVISE_TOKEN_AUTH_ORM=mongoid
-  - rvm: 2.5.1
-    gemfile: gemfiles/rails_5_2_stable_mongoid_6.gemfile
+  - rvm: 2.6.0
+    gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
     env: DEVISE_TOKEN_AUTH_ORM=mongoid
   - name: Code Climate Test Coverage
-    rmv: 2.5.1
+    rmv: 2.5.3
     env:
       - CC_TEST_REPORTER_ID=44d7688de8e1b567b4af25ec5083c2cc0a355ab911192a7cbefd1ea25b2ffd3d
       - GEMFILE_AR=gemfiles/rails_5_1.gemfile
@@ -73,14 +70,9 @@ matrix:
           ./cc-test-reporter upload-coverage;
         fi
   exclude:
-    - rvm: 2.2.10
-      gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails_4_2.gemfile
   fast_finish: true
-  allow_failures:
-    - gemfile: gemfiles/rails_5_2.gemfile
-    - gemfile: gemfiles/rails_5_2_mongoid_6.gemfile
-    - gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
-    - gemfile: gemfiles/rails_5_2_stable_mongoid_6.gemfile
 
 before_script:
   - if [[ $DB == "mysql" ]]; then mysql -e 'create database devise_token_auth_test'; fi

Appraisals

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 [
-  { name: '4-2', version: '4.2.10' }
+  { name: '4-2', version: '4.2' }
 ].each do |rails|
   appraise "rails-#{rails[:name]}" do
     gem 'rails', "~> #{rails[:version]}"
@@ -13,9 +13,9 @@
 end
 
 [
-  { name: '5-0', version: '5.0.7' },
-  { name: '5-1', version: '5.1.6' },
-  { name: '5-2', version: '5.2.1' }
+  { name: '5-0', version: '5.0' },
+  { name: '5-1', version: '5.1' },
+  { name: '5-2', version: '5.2' }
 ].each do |rails|
   appraise "rails-#{rails[:name]}" do
     gem 'rails', "~> #{rails[:version]}"
@@ -27,25 +27,17 @@ end
 end
 
 [
-  { name: '4-2', ruby: '2.2.10', rails: '4.2.10', mongoid: '5.4.0' },
-  { name: '5-1', ruby: '2.3.7', rails: '5.1.6', mongoid: '6.4.1' },
-  { name: '5-1', ruby: '2.4.4', rails: '5.1.6', mongoid: '7.0.1' },
-  { name: '5-2', ruby: '2.5.1', rails: '5.2.1', mongoid: '6.4.1' },
-  { name: '5-2', ruby: '2.5.1', rails: '5.2.1', mongoid: '7.0.2' }
+  { name: '4-2', ruby: '2.3.8', rails: '4.2', mongoid: '5.4' },
+  { name: '5-1', ruby: '2.3.8', rails: '5.1', mongoid: '6.4' },
+  { name: '5-1', ruby: '2.4.5', rails: '5.1', mongoid: '7.0' },
+  { name: '5-2', ruby: '2.5.3', rails: '5.2', mongoid: '6.4' },
+  { name: '5-2', ruby: '2.5.3', rails: '5.2', mongoid: '7.0' },
+  { name: '5-2', ruby: '2.6.0', rails: '5.2', mongoid: '7.0' }
 ].each do |set|
   appraise "rails-#{set[:name]}-mongoid-#{set[:mongoid][0]}" do
-    gem 'rails', set[:rails]
+    gem 'rails', "~> #{set[:rails]}"
 
-    gem 'mongoid', set[:mongoid]
-    gem 'mongoid-locker', '~> 1'
+    gem 'mongoid', "~> #{set[:mongoid]}"
+    gem 'mongoid-locker', '~> 1.0'
   end
 end
-
-# TODO: remove this appraise when the issue be fixed in rails 5.2.x release.
-# https://github.com/rails/rails/commit/47a6d788ddbab08b2a04c72cd80352aac44090ab
-appraise 'rails-5-2-stable-mongoid-6' do
-  gem 'rails', git: 'https://github.com/rails/rails.git', branch: '5-2-stable'
-
-  gem 'mongoid', '6.4.1'
-  gem 'mongoid-locker', '~> 1'
-end

Gemfile

@@ -65,4 +65,6 @@ if ENV['MONGOID_VERSION']
   else
     gem 'mongoid', '>= 5'
   end
+  
+  gem 'mongoid-locker', '~> 1.0'
 end