From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NbzKA-0007rt-SY for garchives@archives.gentoo.org; Mon, 01 Feb 2010 16:40:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40362E0869; Mon, 1 Feb 2010 16:40:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1CF27E0869 for ; Mon, 1 Feb 2010 16:40:30 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id B14921B4079 for ; Mon, 1 Feb 2010 16:40:29 +0000 (UTC) Received: from flameeyes by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NbzK9-0004wc-8g for gentoo-commits@lists.gentoo.org; Mon, 01 Feb 2010 16:40:29 +0000 From: "Diego Petteno (flameeyes)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-ruby/activesupport/files: activesupport-2.3.5-mocha-0.9.5.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: activesupport-2.3.5-mocha-0.9.5.patch X-VCS-Directories: dev-ruby/activesupport/files X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: Sender: Diego Petteno Date: Mon, 01 Feb 2010 16:40:29 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 54d3a4e3-42fc-41c1-b869-0eaea4f0517e X-Archives-Hash: 7e7ee565fe1f9dae7e2b4a7346dfaefc flameeyes 10/02/01 16:40:29 Added: activesupport-2.3.5-mocha-0.9.5.patch Log: Add patch to force support for mocha 0.9.5 or later, and adds support f= or JRuby. (Portage version: 2.2_rc62/cvs/Linux x86_64) Revision Changes Path 1.1 dev-ruby/activesupport/files/activesupport-2.3.5-moc= ha-0.9.5.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activesup= port/files/activesupport-2.3.5-mocha-0.9.5.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activesup= port/files/activesupport-2.3.5-mocha-0.9.5.patch?rev=3D1.1&content-type=3D= text/plain Index: activesupport-2.3.5-mocha-0.9.5.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Index: activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.= rb =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- activesupport-2.3.5.orig/lib/active_support/testing/setup_and_teardow= n.rb +++ activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb @@ -45,12 +45,7 @@ module ActiveSupport return if @method_name.to_s =3D=3D "default_test" =20 if using_mocha =3D respond_to?(:mocha_verify) - assertion_counter_klass =3D if defined?(Mocha::TestCaseAdapt= er::AssertionCounter) - Mocha::TestCaseAdapter::Assertio= nCounter - else - Mocha::Integration::TestUnit::As= sertionCounter - end - assertion_counter =3D assertion_counter_klass.new(result) + assertion_counter =3D Mocha::Integration::TestUnit::Assertio= nCounter.new(result) end =20 yield(Test::Unit::TestCase::STARTED, name)