Skip to content

Commit

Permalink
Make the tests pass on the Rails master
Browse files Browse the repository at this point in the history
Rails 5 does not include `assert_template` but we need this on the tests of
the helper.

This add the `rails-controller-testing` to keep support on `assert_template`.
  • Loading branch information
maurogeorge committed Dec 3, 2015
1 parent 7500144 commit 9e19b19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions test/active_model_serializers/test/serializer_test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'test_helper'
require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5

module ActiveModelSerializers
module Test
Expand Down

0 comments on commit 9e19b19

Please sign in to comment.