Merge pull request #3341 from codealchemy/fix-ci

Fix CI
railsadminteam · Feb 20, 2021 · b514455 · b514455
2 parents f0c46f1 + 4ee793f
commit b514455
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,7 +21,7 @@ end
 group :test do
   gem 'cancancan', '~> 3.0'
   gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
-  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0']
+  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0', '< 2.0']
   gem 'dragonfly', '~> 1.0'
   gem 'factory_bot', '>= 4.2'
   gem 'generator_spec', '>= 0.8'

diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
@@ -30,7 +30,7 @@ end
 group :test do
   gem "cancancan", "~> 2.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
+  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
@@ -31,7 +31,7 @@ end
 group :test do
   gem "cancancan", "~> 2.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
+  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -31,7 +31,7 @@ end
 group :test do
   gem "cancancan", "~> 2.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
+  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -31,7 +31,7 @@ end
 group :test do
   gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
+  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -25,7 +25,7 @@ end
 group :test do
   gem "cancancan", "~> 3.0", github: "ghiculescu/cancancan", branch: "avoid-resolve_column_aliases-2"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
+  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,6 +4,12 @@
 CI_TARGET_ORMS = [:active_record, :mongoid].freeze
 PK_COLUMN = {active_record: :id, mongoid: :_id}[CI_ORM]
 
+if RUBY_ENGINE == 'jruby'
+  # Workaround for JRuby CI failure https://github.com/jruby/jruby/issues/6547#issuecomment-774104996
+  require 'i18n/backend'
+  require 'i18n/backend/simple'
+end
+
 require 'simplecov'
 require 'simplecov-lcov'