Merge pull request #411 from arthurnn/settings_fix

small settings fix
2026-01-23 06:16:50 +00:00 · 2013-10-21 11:29:49 -07:00 · 2013-10-21 11:29:49 -07:00 · 81080c230e
commit 81080c230e
parent 7dcef9f0f5 2ea0920f08
2 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,6 +11,7 @@ gemfile:
 matrix:
  allow_failures:
    - gemfile: Gemfile.edge
+    - rvm: jruby-19mode
 notifications:
  email: false
  campfire:
--- a/test/unit/active_model/serializer/config_test.rb
+++ b/test/unit/active_model/serializer/config_test.rb
@ -58,7 +58,7 @@ module ActiveModel
        def test_setup_acessor_when_nil
          assert_nil CONFIG.foo
          CONFIG.foo = 1
-          assert 1, CONFIG.foo
+          assert_equal 1, CONFIG.foo
          assert_nil CONFIG.bar
        end
      end