From d16199e507086e3d54d94253b7e1d87ead394d9f Mon Sep 17 00:00:00 2001 From: Hartley McGuire Date: Tue, 2 Jan 2024 06:54:48 -0500 Subject: [PATCH] Merge pull request #47457 from zzak/ruby-3.3/feature/18285 (#50530) Fix ruby:master re: ruby/feature/18285 Co-authored-by: Jean Boussier --- actionview/test/template/render_test.rb | 2 +- activesupport/test/core_ext/time_with_zone_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index 5d37ee52ec2b2..f68daf2255fec 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -310,7 +310,7 @@ def test_render_sub_template_with_errors def test_undefined_method_error_references_named_class e = assert_raises(ActionView::Template::Error) { @view.render(inline: "<%= undefined %>") } - assert_match(/`undefined' for #/, e.message) + assert_match(/undefined local variable or method `undefined'/, e.message) end def test_render_renderable_object diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 9c1c2ecbb1335..e839478186119 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -1069,7 +1069,7 @@ def test_no_method_error_has_proper_context e = assert_raises(NoMethodError) { @twz.this_method_does_not_exist } - assert_match "undefined method `this_method_does_not_exist' for Fri, 31 Dec 1999 19:00:00.000000000 EST -05:00:Time", e.message + assert_match(/undefined method `this_method_does_not_exist' for.*Time/, e.message) assert_no_match "rescue", e.backtrace.first end end