1 files changed, 21 insertions, 20 deletions

diff --git a/rt/t/web/attachment_encoding.t b/rt/t/web/attachment_encoding.t
index 5af7fda20..f49720e0f 100644
--- a/rt/t/web/attachment_encoding.t
+++ b/rt/t/web/attachment_encoding.t
@@ -3,14 +3,15 @@ use strict;
 use warnings;
 
 use RT::Test tests => 32;
-use Encode;
 my ( $baseurl, $m ) = RT::Test->started_ok;
 ok $m->login, 'logged in as root';
 
-use utf8;
-
 use File::Spec;
 
+my $subject  = Encode::decode("UTF-8",'标题');
+my $content  = Encode::decode("UTF-8",'测试');
+my $filename = Encode::decode("UTF-8",'附件.txt');
+
 diag 'test without attachments' if $ENV{TEST_VERBOSE};
 
 {
@@ -19,13 +20,13 @@ diag 'test without attachments' if $ENV{TEST_VERBOSE};
     $m->form_name('TicketModify');
     $m->submit_form(
         form_number => 3,
-        fields      => { Subject => '标题', Content => '测试' },
+        fields      => { Subject => $subject, Content => $content },
     );
     $m->content_like( qr/Ticket \d+ created/i, 'created the ticket' );
     $m->follow_link_ok( { text => 'with headers' },
         '-> /Ticket/Attachment/WithHeaders/...' );
-    $m->content_contains( '标题', 'has subject 标题' );
-    $m->content_contains( '测试', 'has content 测试' );
+    $m->content_contains( $subject, "has subject $subject" );
+    $m->content_contains( $content, "has content $content" );
 
     my ( $id ) = $m->uri =~ /(\d+)$/;
     ok( $id, 'found attachment id' );
@@ -35,8 +36,8 @@ diag 'test without attachments' if $ENV{TEST_VERBOSE};
     ok( $attachment->SetHeader( 'X-RT-Original-Encoding' => 'gbk' ),
         'set original encoding to gbk' );
     $m->get( $m->uri );
-    $m->content_contains( '标题', 'has subject 标题' );
-    $m->content_contains( '测试', 'has content 测试' );
+    $m->content_contains( $subject, "has subject $subject" );
+    $m->content_contains( $content, "has content $content" );
 }
 
 diag 'test with attachemnts' if $ENV{TEST_VERBOSE};
@@ -44,10 +45,10 @@ diag 'test with attachemnts' if $ENV{TEST_VERBOSE};
 {
 
     my $file =
-      File::Spec->catfile( RT::Test->temp_directory, encode_utf8 '附件.txt' );
+      File::Spec->catfile( RT::Test->temp_directory, Encode::encode("UTF-8",$filename) );
     open( my $fh, '>', $file ) or die $!;
     binmode $fh, ':utf8';
-    print $fh '附件';
+    print $fh $filename;
     close $fh;
 
     $m->get_ok( $baseurl . '/Ticket/Create.html?Queue=1' );
@@ -55,17 +56,17 @@ diag 'test with attachemnts' if $ENV{TEST_VERBOSE};
     $m->form_name('TicketModify');
     $m->submit_form(
         form_number => 3,
-        fields => { Subject => '标题', Content => '测试', Attach => $file },
+        fields => { Subject => $subject, Content => $content, Attach => $file },
     );
     $m->content_like( qr/Ticket \d+ created/i, 'created the ticket' );
-    $m->content_contains( '附件.txt', 'attached filename' );
-    $m->content_lacks( encode_utf8 '附件.txt', 'no double encoded attached filename' );
+    $m->content_contains( $filename, 'attached filename' );
+    $m->content_lacks( Encode::encode("UTF-8",$filename), 'no double encoded attached filename' );
     $m->follow_link_ok( { text => 'with headers' },
         '-> /Ticket/Attachment/WithHeaders/...' );
 
     # subject is in the parent attachment, so there is no 标题
-    $m->content_lacks( '标题', 'does not have content 标题' );
-    $m->content_contains( '测试', 'has content 测试' );
+    $m->content_lacks( $subject, "does not have content $subject" );
+    $m->content_contains( $content, "has content $content" );
 
     my ( $id ) = $m->uri =~ /(\d+)$/;
     ok( $id, 'found attachment id' );
@@ -75,15 +76,15 @@ diag 'test with attachemnts' if $ENV{TEST_VERBOSE};
     ok( $attachment->SetHeader( 'X-RT-Original-Encoding' => 'gbk' ),
         'set original encoding to gbk' );
     $m->get( $m->uri );
-    $m->content_lacks( '标题', 'does not have content 标题' );
-    $m->content_contains( '测试', 'has content 测试' );
+    $m->content_lacks( $subject, "does not have content $subject" );
+    $m->content_contains( $content, "has content $content" );
 
 
     $m->back;
     $m->back;
-    $m->follow_link_ok( { text => 'Download 附件.txt' },
+    $m->follow_link_ok( { text => "Download $filename" },
         '-> /Ticket/Attachment/...' );
-    $m->content_contains( '附件', 'has content 附件' );
+    $m->content_contains( $filename, "has file content $filename" );
 
     ( $id ) = $m->uri =~ /(\d+)\D+$/;
     ok( $id, 'found attachment id' );
@@ -94,7 +95,7 @@ diag 'test with attachemnts' if $ENV{TEST_VERBOSE};
     ok( $attachment->SetHeader( 'X-RT-Original-Encoding' => 'gbk' ),
         'set original encoding to gbk' );
     $m->get( $m->uri );
-    $m->content_contains( '附件', 'has content 附件' );
+    $m->content_contains( $filename, "has content $filename" );
 
     unlink $file;
 }