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

diff --git a/test/system/messages_test.rb b/test/system/messages_test.rb
index ff5e48cd407342523944ca9b10be5dece303744c..9a53a3f42b5091cb4c4d65fce6db52977ea4e7b1 100644 (file)
--- 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 f3c9c110ba377ebd3e1466dee24e48b49c9cf1f7..541a59fe6538998f2b0a93dc6ec7acd4820bd4b4 100644 (file)
--- 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