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

Merge pull request #411 from arthurnn/settings_fix

Browse Source 
small settings fix
This commit is contained in:
Santiago Pastorino 2013-10-21 11:29:49 -07:00
commit 81080c230e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -11,6 +11,7 @@ gemfile:
matrix: matrix:
allow_failures: allow_failures:
- gemfile: Gemfile.edge - gemfile: Gemfile.edge
- rvm: jruby-19mode
notifications: notifications:
email: false email: false
campfire: campfire:

2
test/unit/active_model/serializer/config_test.rb
View File

@ -58,7 +58,7 @@ module ActiveModel
def test_setup_acessor_when_nil def test_setup_acessor_when_nil
assert_nil CONFIG.foo assert_nil CONFIG.foo
CONFIG.foo = 1 CONFIG.foo = 1
assert 1, CONFIG.foo assert_equal 1, CONFIG.foo
assert_nil CONFIG.bar assert_nil CONFIG.bar
end end
end end