Fixed: Use Rails suite for ActionView for Rails 3 tests.

DataDog · Aug 16, 2019 · b094bd0 · b094bd0
1 parent abcb7a3
commit b094bd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Appraisals b/Appraisals
@@ -57,7 +57,6 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'contrib-old' do
-      gem 'actionview', '< 5.0'
       gem 'active_model_serializers', '~> 0.9.0'
       gem 'activerecord', '3.2.22.5'
       gem 'activerecord-mysql-adapter', platform: :ruby
@@ -163,7 +162,6 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'contrib-old' do
-      gem 'actionview', '< 5.0'
       gem 'active_model_serializers', '~> 0.9.0'
       gem 'activerecord', '3.2.22.5'
       gem 'activerecord-mysql-adapter', platform: :ruby

diff --git a/Rakefile b/Rakefile
@@ -202,7 +202,6 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake test:sidekiq'
       sh 'bundle exec appraisal contrib-old rake test:sucker_punch'
       # Contrib specs
-      sh 'bundle exec appraisal contrib-old rake spec:action_view'
       sh 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
@@ -236,6 +235,10 @@ task :ci do
       sh 'bundle exec appraisal rails30-postgres rake spec:rails'
       sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails32-postgres rake spec:rails'
+      # Rails suite specs
+      sh 'bundle exec appraisal rails32-postgres rake spec:action_view'
+      sh 'bundle exec appraisal rails32-mysql2 rake spec:active_record'
+      sh 'bundle exec appraisal rails32-postgres rake spec:active_support'
     end
   elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
         && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
@@ -251,7 +254,6 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake test:sidekiq'
       sh 'bundle exec appraisal contrib-old rake test:sucker_punch'
       # Contrib specs
-      sh 'bundle exec appraisal contrib-old rake spec:action_view'
       sh 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
@@ -291,6 +293,10 @@ task :ci do
       sh 'bundle exec appraisal rails32-postgres rake spec:rails'
       sh 'bundle exec appraisal rails4-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails4-postgres rake spec:rails'
+      # Rails suite specs
+      sh 'bundle exec appraisal rails32-postgres rake spec:action_view'
+      sh 'bundle exec appraisal rails32-mysql2 rake spec:active_record'
+      sh 'bundle exec appraisal rails32-postgres rake spec:active_support'
     end
   elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION)\
         && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')