Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ruby/activesupport/files: activesupport-2.3.5-mocha-0.9.5.patch
Date: Mon, 01 Feb 2010 16:40:31
Message-Id: E1NbzK9-0004wc-8g@stork.gentoo.org
1 flameeyes 10/02/01 16:40:29
2
3 Added: activesupport-2.3.5-mocha-0.9.5.patch
4 Log:
5 Add patch to force support for mocha 0.9.5 or later, and adds support for JRuby.
6 (Portage version: 2.2_rc62/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch?rev=1.1&content-type=text/plain
13
14 Index: activesupport-2.3.5-mocha-0.9.5.patch
15 ===================================================================
16 Index: activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb
17 ===================================================================
18 --- activesupport-2.3.5.orig/lib/active_support/testing/setup_and_teardown.rb
19 +++ activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb
20 @@ -45,12 +45,7 @@ module ActiveSupport
21 return if @method_name.to_s == "default_test"
22
23 if using_mocha = respond_to?(:mocha_verify)
24 - assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
25 - Mocha::TestCaseAdapter::AssertionCounter
26 - else
27 - Mocha::Integration::TestUnit::AssertionCounter
28 - end
29 - assertion_counter = assertion_counter_klass.new(result)
30 + assertion_counter = Mocha::Integration::TestUnit::AssertionCounter.new(result)
31 end
32
33 yield(Test::Unit::TestCase::STARTED, name)