From 1817ddaac7cedba4917ec55586c9ddaed64053c6 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 13 Mar 2010 23:57:36 +0100 Subject: [PATCH] restricts a test to < 1.9, and rewrites it using a proper expectation --- activerecord/test/cases/associations_test.rb | 16 +++++----------- activerecord/test/cases/helper.rb | 1 + 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb index d0d646d..d99fb44 100644 --- a/activerecord/test/cases/associations_test.rb +++ b/activerecord/test/cases/associations_test.rb @@ -180,17 +180,11 @@ class AssociationProxyTest < ActiveRecord::TestCase end end - def test_splat_does_not_invoke_to_a_on_singular_targets - Kernel.module_eval do - alias original_to_a to_a - def to_a - [:_] - end - end - assert_not_equal [:_], [*posts(:welcome).author] - ensure - Kernel.module_eval do - alias to_a original_to_a + if RUBY_VERSION < '1.9' + def test_splat_does_not_invoke_to_a_on_singular_targets + author = posts(:welcome).author + author.reload.target.expects(:to_a).never + [*author] end end diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index e831ebf..1fb59d3 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -7,6 +7,7 @@ require 'config' require 'test/unit' require 'stringio' +require 'mocha' require 'active_record' require 'active_support/dependencies' -- 1.6.6