Compatible with Rails 4.1.0, minitest 5
fix test
Merge branch 'rails_4.1.0'