summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-02-01 16:40:29 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-02-01 16:40:29 +0000
commit455519745f12edb30d77e6b82729c3620809a919 (patch)
tree9f7f8ab4b0e5f58cde6e599ae837fcaefe43ce2b /dev-ruby/activesupport/files
parentAdd a patch to fix a big bug on JRuby. (diff)
downloadgentoo-2-455519745f12edb30d77e6b82729c3620809a919.tar.gz
gentoo-2-455519745f12edb30d77e6b82729c3620809a919.tar.bz2
gentoo-2-455519745f12edb30d77e6b82729c3620809a919.zip
Add patch to force support for mocha 0.9.5 or later, and adds support for JRuby.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/activesupport/files')
-rw-r--r--dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch b/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch
new file mode 100644
index 000000000000..4b6381e337fd
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch
@@ -0,0 +1,18 @@
+Index: activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb
+===================================================================
+--- activesupport-2.3.5.orig/lib/active_support/testing/setup_and_teardown.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 == "default_test"
+
+ if using_mocha = respond_to?(:mocha_verify)
+- assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
+- Mocha::TestCaseAdapter::AssertionCounter
+- else
+- Mocha::Integration::TestUnit::AssertionCounter
+- end
+- assertion_counter = assertion_counter_klass.new(result)
++ assertion_counter = Mocha::Integration::TestUnit::AssertionCounter.new(result)
+ end
+
+ yield(Test::Unit::TestCase::STARTED, name)