github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2848 from arunagw/jruby_activesupport_fix

Browse Source 
Need to have a check here for JAVA PLATFORM for JRuby
This commit is contained in:
Jon Leighton
2011-09-04 03:11:45 -07:00
parent ef7e60f008 fc5e3ff1ba
commit 74372f7e79
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
activesupport/test/core_ext/module_test.rb
View File

@@ -183,8 +183,9 @@ class ModuleTest < Test::Unit::TestCase
someone.foo
rescue NoMethodError => e
file_and_line = "#{__FILE__}:#{Someone::FAILED_DELEGATE_LINE}"
assert e.backtrace.first.include?(file_and_line),
"[#{e.backtrace.first}] did not include [#{file_and_line}]"
# We can't simply check the first line of the backtrace, because JRuby reports the call to __send__ in the backtrace.
assert e.backtrace.any?{|a| a.include?(file_and_line)},
"[#{e.backtrace.inspect}] did not include [#{file_and_line}]"
end
def test_delegation_exception_backtrace_with_allow_nil
@@ -192,8 +193,9 @@ class ModuleTest < Test::Unit::TestCase
someone.bar
rescue NoMethodError => e
file_and_line = "#{__FILE__}:#{Someone::FAILED_DELEGATE_LINE_2}"
assert e.backtrace.first.include?(file_and_line),
"[#{e.backtrace.first}] did not include [#{file_and_line}]"
# We can't simply check the first line of the backtrace, because JRuby reports the call to __send__ in the backtrace.
assert e.backtrace.any?{|a| a.include?(file_and_line)},
"[#{e.backtrace.inspect}] did not include [#{file_and_line}]"
end
def test_parent