MONGOID-5051 Fix JRuby test failures on master (mongodb#4957)

* .dockerignore copied from driver * ignore tmp * restrict to i18n < 1.8.8 * dry gemfiles * Always install tzdata Co-authored-by: Oleg Pudeyev <[email protected]>
johnnyshields · Feb 23, 2021 · 5613193 · 5613193
1 parent 4aab6ea
commit 5613193
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 375 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+/.git
+/yard-docs
+Gemfile.lock
+gemfiles/*.lock
+.env.private*
+/tmp
diff --git a/Gemfile b/Gemfile
@@ -1,35 +1,18 @@
 source 'https://rubygems.org'
+
 gemspec
 
-gem 'rake'
-gem 'actionpack'
-gem 'activemodel'
+require_relative './gemfiles/standard'
 
-gem 'i18n', '~> 1.0', '>= 1.1'
+standard_dependencies
 
-group :development do
-  gem 'yard'
-end
+gem 'actionpack'
+gem 'activemodel'
 
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
+i18n_versions = ['~> 1.0', '>= 1.1']
+if RUBY_PLATFORM =~ /java/
+  # https://github.com/jruby/jruby/issues/6573
+  i18n_versions << '< 1.8.8'
 end
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-  platforms :mri do
-    gem 'timeout-interrupt'
-    gem 'byebug'
-  end
-end
+gem 'i18n', *i18n_versions
diff --git a/gemfiles/driver_master.gemfile b/gemfiles/driver_master.gemfile
@@ -3,37 +3,13 @@ source "https://rubygems.org"
 gem 'bson', git: "https://github.com/mongodb/bson-ruby"
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver"
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
 gem 'i18n', '~> 1.0'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-  platforms :mri do
-    gem 'timeout-interrupt'
-    gem 'byebug'
-  end
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_master_jruby.gemfile b/gemfiles/driver_master_jruby.gemfile
@@ -7,37 +7,14 @@ source "https://rubygems.org"
 # This gemfile only specifies driver git source.
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver"
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
-gem 'i18n', '~> 1.0'
+# https://github.com/jruby/jruby/issues/6573
+gem 'i18n', '~> 1.0', '< 1.8.8'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-  platforms :mri do
-    gem 'timeout-interrupt'
-    gem 'byebug'
-  end
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_min.gemfile b/gemfiles/driver_min.gemfile
@@ -2,37 +2,13 @@ source "https://rubygems.org"
 
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.10-stable'
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
 gem 'i18n', '~> 1.0'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-  platforms :mri do
-    gem 'timeout-interrupt'
-    gem 'byebug'
-  end
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_min_jruby.gemfile b/gemfiles/driver_min_jruby.gemfile
@@ -5,33 +5,14 @@ source "https://rubygems.org"
 # bson with JRuby, just test the driver then
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.10-stable'
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
-gem 'i18n', '~> 1.0'
+# https://github.com/jruby/jruby/issues/6573
+gem 'i18n', '~> 1.0', '< 1.8.8'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_oldstable.gemfile b/gemfiles/driver_oldstable.gemfile
@@ -3,37 +3,13 @@ source "https://rubygems.org"
 gem 'bson', git: "https://github.com/mongodb/bson-ruby"
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.12-stable'
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
 gem 'i18n', '~> 1.0'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-  platforms :mri do
-    gem 'timeout-interrupt'
-    gem 'byebug'
-  end
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_oldstable_jruby.gemfile b/gemfiles/driver_oldstable_jruby.gemfile
@@ -5,33 +5,14 @@ source "https://rubygems.org"
 # bson with JRuby, just test the driver then
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.12-stable'
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
-gem 'i18n', '~> 1.0'
+# https://github.com/jruby/jruby/issues/6573
+gem 'i18n', '~> 1.0', '< 1.8.8'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_stable.gemfile b/gemfiles/driver_stable.gemfile
@@ -3,41 +3,13 @@ source "https://rubygems.org"
 gem 'bson', git: "https://github.com/mongodb/bson-ruby"
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.13-stable'
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
 gem 'i18n', '~> 1.0'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-  platforms :mri do
-    gem 'timeout-interrupt'
-    if RUBY_VERSION <= '2.3'
-      gem 'byebug', '~> 10'
-    else
-      gem 'byebug'
-    end
-  end
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies
diff --git a/gemfiles/driver_stable_jruby.gemfile b/gemfiles/driver_stable_jruby.gemfile
@@ -5,33 +5,14 @@ source "https://rubygems.org"
 # bson with JRuby, just test the driver then
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.13-stable'
 
-gem 'rake'
 gem 'actionpack', '~> 5.1'
 gem 'activemodel', '~> 5.1'
 
-gem 'i18n', '~> 1.0'
+# https://github.com/jruby/jruby/issues/6573
+gem 'i18n', '~> 1.0', '< 1.8.8'
 
-group :development do
-  gem 'yard'
-end
-
-group :development, :test do
-  gem 'rspec-core', '~> 3.7'
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
+gemspec path: '..'
 
-group :test do
-  gem 'timecop'
-  gem 'rspec-retry'
-  gem 'benchmark-ips'
-  gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'fuubar'
-  gem 'rfc'
-  gem 'childprocess'
-end
+require_relative './standard'
 
-gemspec path: '..'
+standard_dependencies