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

Merge remote-tracking branch 'upstream/master' into feature/adapter

Browse Source
This commit is contained in:
Tema Bolshakov
2014-08-29 12:55:20 +04:00
parent e45e5a82b7 f29e78f4c8
commit b4a313e6d8
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_helper.rb
View File

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