ddtrace 0.30.0 → 0.30.1

data/Appraisals

@@ -148,21 +148,21 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails4-mysql2' do
-      gem 'rails', '4.2.7.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'rails', '4.2.11.1'
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails4-postgres' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails4-postgres-redis' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'redis-rails'
@@ -259,21 +259,21 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails4-mysql2' do
-      gem 'rails', '4.2.7.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'rails', '4.2.11.1'
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails4-postgres' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails4-postgres-redis' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'redis-rails'
@@ -282,7 +282,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails4-postgres-sidekiq' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq'
@@ -291,34 +291,33 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails5-mysql2' do
-      gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres' do
-      gem 'rails', '~> 5.2.1'
+      gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-redis' do
-      gem 'rails', '~> 5.2.1'
+      gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
-      gem 'rails', '~> 5.2.1'
+      gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-sidekiq' do
-      gem 'rails', '~> 5.2.1'
+      gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sidekiq'
       gem 'activejob'
@@ -418,21 +417,21 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails4-mysql2' do
-      gem 'rails', '4.2.7.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'rails', '4.2.11.1'
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails4-postgres' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails4-postgres-redis' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'redis-rails'
@@ -441,7 +440,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails4-postgres-sidekiq' do
-      gem 'rails', '4.2.7.1'
+      gem 'rails', '4.2.11.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq'
@@ -451,7 +450,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
 
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
@@ -464,15 +463,14 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres-redis' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
@@ -525,7 +523,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
   if RUBY_PLATFORM != 'java'
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
@@ -538,16 +536,14 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres-redis' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
@@ -600,7 +596,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
   if RUBY_PLATFORM != 'java'
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
@@ -613,16 +609,14 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres-redis' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
@@ -636,7 +630,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
 
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
-      gem 'mysql2', '< 0.6', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
@@ -649,16 +643,14 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails6-postgres-redis' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails6-postgres-redis-activesupport' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
@@ -710,7 +702,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
   if RUBY_PLATFORM != 'java'
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
@@ -723,16 +715,14 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
     appraise 'rails5-postgres-redis' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
@@ -746,7 +736,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
 
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
-      gem 'mysql2', '< 0.6', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
     end
 
@@ -759,16 +749,14 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
     appraise 'rails6-postgres-redis' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 
     appraise 'rails6-postgres-redis-activesupport' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
+      gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
     end
 

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [0.30.1] - 2019-12-30
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.30.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.30.0...v0.30.1
+
+### Fixed
+
+- NoMethodError when configuring tracer with SyncWriter (#899, #900) (@Yurokle)
+- Spans associated with runtime metrics when disabled (#885)
+
+### Refactored
+
+- Improvements to test suite & CI (#815, #821, #846, #883, #890, #894)
+
 ## [0.30.0] - 2019-12-04
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.30.0

data/Rakefile

@@ -12,7 +12,7 @@ desc 'Run RSpec'
 # rubocop:disable Metrics/BlockLength
 namespace :spec do
   task all: [:main,
-             :rails, :railsredis, :railssidekiq, :railsactivejob,
+             :rails, :railsredis, :railsactivejob,
              :elasticsearch, :http, :redis, :sidekiq, :sinatra]
 
   RSpec::Core::RakeTask.new(:main) do |t, args|
@@ -28,7 +28,7 @@ namespace :spec do
 
   RSpec::Core::RakeTask.new(:rails) do |t, args|
     t.pattern = 'spec/ddtrace/contrib/rails/**/*_spec.rb'
-    t.exclude_pattern = 'spec/ddtrace/contrib/rails/**/*{sidekiq,active_job,disable_env}*_spec.rb'
+    t.exclude_pattern = 'spec/ddtrace/contrib/rails/**/*{active_job,disable_env,redis_cache}*_spec.rb'
     t.rspec_opts = args.to_a.join(' ')
   end
 
@@ -37,11 +37,6 @@ namespace :spec do
     t.rspec_opts = args.to_a.join(' ')
   end
 
-  RSpec::Core::RakeTask.new(:railssidekiq) do |t, args|
-    t.pattern = 'spec/ddtrace/contrib/rails/**/*sidekiq*_spec.rb'
-    t.rspec_opts = args.to_a.join(' ')
-  end
-
   RSpec::Core::RakeTask.new(:railsactivejob) do |t, args|
     t.pattern = 'spec/ddtrace/contrib/rails/**/*active_job*_spec.rb'
     t.rspec_opts = args.to_a.join(' ')
@@ -99,7 +94,7 @@ end
 
 namespace :test do
   task all: [:main,
-             :rails, :railsredis, :railssidekiq, :railsactivejob,
+             :rails,
              :sidekiq, :monkey]
 
   Rake::TestTask.new(:main) do |t|
@@ -114,32 +109,7 @@ namespace :test do
 
   Rake::TestTask.new(:rails) do |t|
     t.libs << %w[test lib]
-    t.test_files = FileList['test/contrib/rails/**/*_test.rb'].reject do |path|
-      path.include?('redis') ||
-        path.include?('sidekiq') ||
-        path.include?('active_job') ||
-        path.include?('disable_env')
-    end
-  end
-
-  Rake::TestTask.new(:railsredis) do |t|
-    t.libs << %w[test lib]
-    t.test_files = FileList['test/contrib/rails/**/*redis*_test.rb']
-  end
-
-  Rake::TestTask.new(:railssidekiq) do |t|
-    t.libs << %w[test lib]
-    t.test_files = FileList['test/contrib/rails/**/*sidekiq*_test.rb']
-  end
-
-  Rake::TestTask.new(:railsactivejob) do |t|
-    t.libs << %w[test lib]
-    t.test_files = FileList['test/contrib/rails/**/*active_job*_test.rb']
-  end
-
-  Rake::TestTask.new(:railsdisableenv) do |t|
-    t.libs << %w[test lib]
-    t.test_files = FileList['test/contrib/rails/**/*disable_env*_test.rb']
+    t.test_files = FileList['test/contrib/rails/**/*_test.rb']
   end
 
   [
@@ -227,13 +197,11 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:ethon'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
-      sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails32-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails32-postgres rake test:rails'
-      sh 'bundle exec appraisal rails32-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails32-postgres rake test:railsdisableenv'
-      sh 'bundle exec appraisal rails30-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails32-postgres-sidekiq rake test:railssidekiq'
+      sh 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails30-postgres rake spec:rails'
       sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -281,17 +249,15 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:ethon'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
-      sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails32-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails32-postgres rake test:rails'
-      sh 'bundle exec appraisal rails32-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails4-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails4-postgres rake test:rails'
-      sh 'bundle exec appraisal rails4-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails4-postgres rake test:railsdisableenv'
-      sh 'bundle exec appraisal rails30-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails32-postgres-sidekiq rake test:railssidekiq'
+      sh 'bundle exec appraisal rails4-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails4-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails30-postgres rake spec:rails'
       sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -347,24 +313,22 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:ethon'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
-      sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails32-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails32-postgres rake test:rails'
-      sh 'bundle exec appraisal rails32-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails4-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails4-postgres rake test:rails'
-      sh 'bundle exec appraisal rails4-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails4-postgres rake test:railsdisableenv'
-      sh 'bundle exec appraisal rails4-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails4-postgres-sidekiq rake test:railsactivejob'
+      sh 'bundle exec appraisal rails4-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails4-postgres rake spec:railsdisableenv'
+      sh 'bundle exec appraisal rails4-postgres-sidekiq rake spec:railsactivejob'
       sh 'bundle exec appraisal rails5-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails5-postgres rake test:rails'
-      sh 'bundle exec appraisal rails5-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails5-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails5-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails30-postgres rake spec:rails'
       sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -417,24 +381,22 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:ethon'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
-      sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails32-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails32-postgres rake test:rails'
-      sh 'bundle exec appraisal rails32-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails4-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails4-postgres rake test:rails'
-      sh 'bundle exec appraisal rails4-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails4-postgres rake test:railsdisableenv'
-      sh 'bundle exec appraisal rails4-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails4-postgres-sidekiq rake test:railsactivejob'
+      sh 'bundle exec appraisal rails4-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails4-postgres rake spec:railsdisableenv'
+      sh 'bundle exec appraisal rails4-postgres-sidekiq rake spec:railsactivejob'
       sh 'bundle exec appraisal rails5-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails5-postgres rake test:rails'
-      sh 'bundle exec appraisal rails5-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails5-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails5-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails30-postgres rake spec:rails'
       sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -491,11 +453,10 @@ task :ci do
       # We only test Rails 5+ because older versions require Bundler < 2.0
       sh 'bundle exec appraisal rails5-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails5-postgres rake test:rails'
-      sh 'bundle exec appraisal rails5-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails5-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails5-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
@@ -547,18 +508,16 @@ task :ci do
       # We only test Rails 5+ because older versions require Bundler < 2.0
       sh 'bundle exec appraisal rails5-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails5-postgres rake test:rails'
-      sh 'bundle exec appraisal rails5-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails5-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails5-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails6-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails6-postgres rake test:rails'
-      sh 'bundle exec appraisal rails6-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails6-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails6-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails6-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails6-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails6-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails6-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
@@ -611,18 +570,16 @@ task :ci do
       # We only test Rails 5+ because older versions require Bundler < 2.0
       sh 'bundle exec appraisal rails5-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails5-postgres rake test:rails'
-      sh 'bundle exec appraisal rails5-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails5-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails5-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
       sh 'bundle exec appraisal rails6-mysql2 rake test:rails'
       sh 'bundle exec appraisal rails6-postgres rake test:rails'
-      sh 'bundle exec appraisal rails6-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails6-postgres-redis-activesupport rake test:railsredis'
-      sh 'bundle exec appraisal rails6-postgres-sidekiq rake test:railssidekiq'
-      sh 'bundle exec appraisal rails6-postgres-sidekiq rake test:railsactivejob'
-      sh 'bundle exec appraisal rails6-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails6-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails6-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
       # Rails specs
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'