ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #614 from arthurnn/fix_build_40

Browse Source 
Fix rails 4.0.x build.
This commit is contained in:
Steve Klabnik 2014-08-27 16:19:15 -04:00
commit ba9b151b6b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ test/tmp
test/version_tmp test/version_tmp
tmp tmp
*.swp *.swp
.ruby-version

2
.travis.yml
View File

@ -15,6 +15,4 @@ matrix:
allow_failures: allow_failures:
- rvm: ruby-head - rvm: ruby-head
- env: "RAILS_VERSION=master" - env: "RAILS_VERSION=master"
- env: "RAILS_VERSION=4.0"
- env: "RAILS_VERSION=3.2" - env: "RAILS_VERSION=3.2"

2
test/test_helper.rb
View File

@ -5,6 +5,8 @@ require 'action_controller'
require 'action_controller/test_case' require 'action_controller/test_case'
require "active_support/json" require "active_support/json"
require 'minitest/autorun' require 'minitest/autorun'
# Ensure backward compatibility with Minitest 4
Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
require "active_model_serializers" require "active_model_serializers"