Start to fix the test suite

collectiveidea · Feb 1, 2018 · 7fa103b · 7fa103b
1 parent 84ad9c9
commit 7fa103b
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,11 +4,9 @@ gem "rake"
 
 group :test do
  platforms :jruby do
- gem "activerecord-jdbcmysql-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5"
-
- gem "activerecord-jdbcpostgresql-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5"
-
- gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5"
+ gem "activerecord-jdbcmysql-adapter"
+ gem "activerecord-jdbcpostgresql-adapter"
+ gem "activerecord-jdbcsqlite3-adapter"
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/3-0.gemfile b/gemfiles/mysql2/3-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcmysql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/3-1.gemfile b/gemfiles/mysql2/3-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcmysql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/3-2.gemfile b/gemfiles/mysql2/3-2.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcmysql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/4-0.gemfile b/gemfiles/mysql2/4-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcmysql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/4-1.gemfile b/gemfiles/mysql2/4-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcmysql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/4-2.gemfile b/gemfiles/mysql2/4-2.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcmysql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/5-0.gemfile b/gemfiles/mysql2/5-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcmysql-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/5-1.gemfile b/gemfiles/mysql2/5-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcmysql-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/mysql2/master.gemfile b/gemfiles/mysql2/master.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcmysql-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/3-0.gemfile b/gemfiles/postgresql/3-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/3-1.gemfile b/gemfiles/postgresql/3-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/3-2.gemfile b/gemfiles/postgresql/3-2.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/4-0.gemfile b/gemfiles/postgresql/4-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/4-1.gemfile b/gemfiles/postgresql/4-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/4-2.gemfile b/gemfiles/postgresql/4-2.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/5-0.gemfile b/gemfiles/postgresql/5-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcpostgresql-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/5-1.gemfile b/gemfiles/postgresql/5-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcpostgresql-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/postgresql/master.gemfile b/gemfiles/postgresql/master.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcpostgresql-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/3-0.gemfile b/gemfiles/sqlite3/3-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/3-1.gemfile b/gemfiles/sqlite3/3-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/3-2.gemfile b/gemfiles/sqlite3/3-2.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/4-0.gemfile b/gemfiles/sqlite3/4-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/4-1.gemfile b/gemfiles/sqlite3/4-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/4-2.gemfile b/gemfiles/sqlite3/4-2.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/5-0.gemfile b/gemfiles/sqlite3/5-0.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcsqlite3-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/5-1.gemfile b/gemfiles/sqlite3/5-1.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcsqlite3-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/master.gemfile b/gemfiles/sqlite3/master.gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 
 group :test do
  platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+ gem 'activerecord-jdbcsqlite3-adapter'
  end
 
  platforms :ruby, :mswin, :mingw do