diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-05-01 16:57:38 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-05-01 16:57:38 +0000 |
| commit | 5f1385e0967d4bd658a15408f03bf70f46fae9c2 (patch) | |
| tree | 381d8522cf0bd5295192d3a28ad6e47bdd449b27 | |
| parent | a971c16a67a33390894e87b1a41e5b0e1b747e43 (diff) | |
| download | redmine-5f1385e0967d4bd658a15408f03bf70f46fae9c2.tar.gz redmine-5f1385e0967d4bd658a15408f03bf70f46fae9c2.zip | |
Merged r14235 from trunk to 3.0-stable.
prevent IssuesControllerTest#test_index_csv_big_5 fails randomly
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14236 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/functional/issues_controller_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 28d4eef14..c3ebaf4a3 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -537,10 +537,10 @@ class IssuesControllerTest < ActionController::TestCase assert_equal 'text/csv; header=present', @response.content_type lines = @response.body.chomp.split("\n") header = lines[0] + status = "\xaa\xac\xbaA".force_encoding('Big5') + assert header.include?(status) issue_line = lines.find {|l| l =~ /^#{issue.id},/} - s1 = "\xaa\xac\xbaA".force_encoding('Big5') - assert_include s1, header - assert_include str_big5, issue_line + assert issue_line.include?(str_big5) end end |