diff --git a/Gemfile b/Gemfile index 9a386356f..659f82e0c 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ version = ENV['RAILS_VERSION'] || '4.2' if version == 'master' gem 'rack', github: 'rack/rack' gem 'arel', github: 'rails/arel' + gem 'rails-controller-testing', github: 'rails/rails-controller-testing' git 'https://github.com/rails/rails.git' do gem 'railties' gem 'activesupport' diff --git a/test/active_model_serializers/test/serializer_test.rb b/test/active_model_serializers/test/serializer_test.rb index bf4480c76..a0b069433 100644 --- a/test/active_model_serializers/test/serializer_test.rb +++ b/test/active_model_serializers/test/serializer_test.rb @@ -1,4 +1,5 @@ require 'test_helper' +require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5 module ActiveModelSerializers module Test