From 455a89871411292dbf754cc4f2eafbc46722c758 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 21 Oct 2013 14:23:49 -0400
Subject: [PATCH 1/2] allow failures on jruby

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index fd881a3a..19f67cc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ gemfile:
 matrix:
   allow_failures:
     - gemfile: Gemfile.edge
+    - rvm: jruby-19mode
 notifications:
   email: false
   campfire:

From 2ea0920f089eb95be6c61e4e6fe45e8538e3796b Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 21 Oct 2013 14:27:18 -0400
Subject: [PATCH 2/2] s/assert/assert_equal

---
 test/unit/active_model/serializer/config_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/active_model/serializer/config_test.rb b/test/unit/active_model/serializer/config_test.rb
index 481a3f15..0a88cfb7 100644
--- 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