diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-02-03 00:11:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 00:11:52 +0900 |
| commit | 2b7a38a4b1da16a8854a8e4326ee5b362850f3d2 (patch) | |
| tree | 9b37a386e154efd88f7eaf0f7b18698dd1c5f20b | |
| parent | aa647b46cce55ec12f5895e403c0d1b85502c8e0 (diff) | |
| parent | 693b1bbd9aed8cc8f2e1d2b5139639532e79249b (diff) | |
| download | rails-2b7a38a4b1da16a8854a8e4326ee5b362850f3d2.tar.gz rails-2b7a38a4b1da16a8854a8e4326ee5b362850f3d2.tar.bz2 rails-2b7a38a4b1da16a8854a8e4326ee5b362850f3d2.zip | |
Merge pull request #27885 from kamipo/fix_ci_failure
Fix CI failure caused by aa647b46cce55ec12f5895e403c0d1b85502c8e0
| -rw-r--r-- | actionview/test/template/render_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index 489b62ea8e..fbe0e555bd 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -253,7 +253,7 @@ module RenderTestCases def test_render_sub_template_with_errors e = assert_raises(ActionView::Template::Error) { @view.render(template: "test/sub_template_raise") } assert_match %r!method.*doesnt_exist!, e.message - assert_equal "Trace of template inclusion: #{File.expand_path("#{FIXTURE_LOAD_PATH}/test/sub_template_raise.html.erb").sub("#{Rails.root}/", "")}", e.sub_template_message + assert_match %r{Trace of template inclusion: .*test/sub_template_raise.html.erb}, e.sub_template_message assert_equal "1", e.line_number assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name end |