From 2e4c0df758132e0e6f7d743fcf44ece896f349de Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 26 Oct 2024 02:29:09 +0000 Subject: [PATCH] Fix tests for the partial quoting feature that randomly fail (#41294). Patch by Katsuya HIDAKA (user:hidakatsuya). git-svn-id: https://svn.redmine.org/redmine/trunk@23162 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/system/messages_test.rb | 2 +- .../lib/redmine/quote_reply_helper_test.rb | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/system/messages_test.rb b/test/system/messages_test.rb index ff5e48cd4..9a53a3f42 100644 --- a/test/system/messages_test.rb +++ b/test/system/messages_test.rb @@ -23,7 +23,7 @@ class MessagesTest < ApplicationSystemTestCase fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :enumerations, :custom_fields, :custom_values, :custom_fields_trackers, - :watchers, :boards, :messages + :watchers, :boards, :messages, :attachments def test_reply_to_topic_message with_text_formatting 'common_mark' do diff --git a/test/unit/lib/redmine/quote_reply_helper_test.rb b/test/unit/lib/redmine/quote_reply_helper_test.rb index f3c9c110b..541a59fe6 100644 --- a/test/unit/lib/redmine/quote_reply_helper_test.rb +++ b/test/unit/lib/redmine/quote_reply_helper_test.rb @@ -26,15 +26,17 @@ class QuoteReplyHelperTest < ActionView::TestCase fixtures :issues def test_quote_reply - url = quoted_issue_path(issues(:issues_001)) + with_locale 'en' do + url = quoted_issue_path(issues(:issues_001)) - a_tag = quote_reply(url, '#issue_description_wiki') - assert_includes a_tag, %|onclick="#{h "quoteReply('/issues/1/quoted', '#issue_description_wiki', 'common_mark'); return false;"}"| - assert_includes a_tag, %|class="icon icon-comment"| - assert_not_includes a_tag, 'title=' + a_tag = quote_reply(url, '#issue_description_wiki') + assert_includes a_tag, %|onclick="#{h "quoteReply('/issues/1/quoted', '#issue_description_wiki', 'common_mark'); return false;"}"| + assert_includes a_tag, %|class="icon icon-comment"| + assert_not_includes a_tag, 'title=' - # When icon_only is true - a_tag = quote_reply(url, '#issue_description_wiki', icon_only: true) - assert_includes a_tag, %|title="Quote"| + # When icon_only is true + a_tag = quote_reply(url, '#issue_description_wiki', icon_only: true) + assert_includes a_tag, %|title="Quote"| + end end end -- 2.39.5