Drop EOL Ruby and Rails versions.

brainspec · Sep 18, 2020 · e935c99 · e935c99
1 parent 88bcdf4
commit e935c99
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,23 +6,15 @@ addons:
   postgresql: 9.6
 gemfile:
   - Gemfile
-  - Gemfile.rails42
-  - Gemfile.rails50
-  - Gemfile.rails52
   - Gemfile.rails60
   - Gemfile.mongo_mapper
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - jruby-9.1.14.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+  - jruby-9.2.13.0
 before_install:
-  # Rubygems > 3.0.0 no longer supported rubies < 2.3
-  - gem install "rubygems-update:<3.0.0" --no-document && update_rubygems
-  # Bundler 2.0 is not supported by Rails < 5
-  - gem list -i bundler -v '>= 2.0.0' && rvm @global do gem uninstall bundler -x || true
-  - gem install bundler -v '< 2'
+  - gem install bundler
 env:
   global:
     - DB_USER=postgres
@@ -37,12 +29,6 @@ matrix:
   exclude:
     - gemfile: Gemfile.mongo_mapper
       env: DB=postgresql
-    - rvm: 2.2.9
-      gemfile: Gemfile.rails60
-    - rvm: 2.3.6
-      gemfile: Gemfile.rails60
-    - rvm: 2.4.3
-      gemfile: Gemfile.rails60
 branches:
   only:
     - master

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 eval_gemfile('Gemfile.global')
 
 gem 'minitest', '~> 5.8'
-gem 'rails',    '5.1.4', require: false
+gem 'rails',    '~> 5.2.4', require: false
 gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0', platform: :jruby
 gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0', platform: :jruby
 gem 'mongoid'

diff --git a/Gemfile.mongo_mapper b/Gemfile.mongo_mapper
@@ -1,7 +1,7 @@
 eval_gemfile('Gemfile.global')
 
 gem 'minitest', '~> 5.8'
-gem 'rails',    '4.2.8', :require => false
+gem 'rails',    '~> 5.2.4', :require => false
 gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0', platform: :jruby
 gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.0', platform: :jruby
 gem 'mongo_mapper'

diff --git a/Gemfile.rails42 b/Gemfile.rails42
diff --git a/Gemfile.rails50 b/Gemfile.rails50
diff --git a/Gemfile.rails52 b/Gemfile.rails52
diff --git a/test/mongo_mapper_test.rb b/test/mongo_mapper_test.rb
@@ -8,8 +8,7 @@
   require 'mongo_mapper'
 end
 
-MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
-MongoMapper.database   = 'enumerize-test-suite-of-mongomapper'
+MongoMapper.connection = Mongo::Client.new(['localhost:27017'], database: 'enumerize-test-suite-of-mongomapper')
 
 describe Enumerize do
   class MongoMapperUser