[Rt-commit] r17377 - in rt/3.8/branches/3.8.2-releng: lib/RT

[falcone at bestpractical.com]

Author: falcone
Date: Fri Dec 26 14:55:25 2008
New Revision: 17377

Modified:
   rt/3.8/branches/3.8.2-releng/lib/RT/Test.pm
   rt/3.8/branches/3.8.2-releng/t/web/cf_access.t
   rt/3.8/branches/3.8.2-releng/t/web/query_builder.t
   rt/3.8/branches/3.8.2-releng/t/web/ticket-create-utf8.t

Log:
handle utf8 encoding during testing

Modified: rt/3.8/branches/3.8.2-releng/lib/RT/Test.pm
==============================================================================
--- rt/3.8/branches/3.8.2-releng/lib/RT/Test.pm	(original)
+++ rt/3.8/branches/3.8.2-releng/lib/RT/Test.pm	Fri Dec 26 14:55:25 2008
@@ -52,9 +52,30 @@
 use warnings;
 
 use base 'Test::More';
+
 use Socket;
 use File::Temp;
 use File::Spec;
+
+our $SKIP_REQUEST_WORK_AROUND = 0;
+
+use HTTP::Request::Common ();
+use Hook::LexWrap;
+wrap 'HTTP::Request::Common::form_data',
+   post => sub {
+       return if $SKIP_REQUEST_WORK_AROUND;
+       my $data = $_[-1];
+       if (ref $data) {
+       $data->[0] = Encode::encode_utf8($data->[0]);
+       }
+       else {
+       $_[-1] = Encode::encode_utf8($_[-1]);
+       }
+   };
+
+
+our @EXPORT = qw(is_empty);
+
 my $config;
 our ($existing_server, $port, $dbname);
 my $mailsent;

Modified: rt/3.8/branches/3.8.2-releng/t/web/cf_access.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/cf_access.t	(original)
+++ rt/3.8/branches/3.8.2-releng/t/web/cf_access.t	Fri Dec 26 14:55:25 2008
@@ -3,6 +3,8 @@
 
 use Test::More tests => 26;
 use RT::Test;
+$RT::Test::SKIP_REQUEST_WORK_AROUND = 1;
+
 my ($baseurl, $m) = RT::Test->started_ok;
 
 use constant ImageFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';

Modified: rt/3.8/branches/3.8.2-releng/t/web/query_builder.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/query_builder.t	(original)
+++ rt/3.8/branches/3.8.2-releng/t/web/query_builder.t	Fri Dec 26 14:55:25 2008
@@ -216,10 +216,10 @@
     ok( $response->is_success, "Fetched " . $url."Search/Build.html" );
 
     ok($agent->form_name('BuildQuery'), "found the form once");
-    $agent->field("ValueOf'CF.{\321\202}'", "\321\201");
+    $agent->field("ValueOf'CF.{\x{442}}'", "\x{441}");
     $agent->submit();
     is( getQueryFromForm,
-        "'CF.{\321\202}' LIKE '\321\201'",
+        "'CF.{\x{442}}' LIKE '\x{441}'",
         "no changes, no duplicate condition with badly encoded text"
     );
 

Modified: rt/3.8/branches/3.8.2-releng/t/web/ticket-create-utf8.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/ticket-create-utf8.t	(original)
+++ rt/3.8/branches/3.8.2-releng/t/web/ticket-create-utf8.t	Fri Dec 26 14:55:25 2008
@@ -8,12 +8,9 @@
 
 use Encode;
 
-my $str_ru_test = "\x{442}\x{435}\x{441}\x{442}";
-my $oct_ru_test = Encode::encode_utf8( $str_ru_test );
-my $str_ru_autoreply = "\x{410}\x{432}\x{442}\x{43e}\x{43e}\x{442}\x{432}\x{435}\x{442}";
-my $oct_ru_autoreply = Encode::encode_utf8( $str_ru_autoreply );
-my $str_ru_support = "\x{43f}\x{43e}\x{434}\x{434}\x{435}\x{440}\x{436}\x{43a}\x{430}";
-my $oct_ru_support = Encode::encode_utf8( $str_ru_support );
+my $ru_test = "\x{442}\x{435}\x{441}\x{442}";
+my $ru_autoreply = "\x{410}\x{432}\x{442}\x{43e}\x{43e}\x{442}\x{432}\x{435}\x{442}";
+my $ru_support = "\x{43f}\x{43e}\x{434}\x{434}\x{435}\x{440}\x{436}\x{43a}\x{430}";
 
 my $q = RT::Test->load_or_create_queue( Name => 'Regression' );
 ok $q && $q->id, 'loaded or created queue';
@@ -30,11 +27,11 @@
 {
     ok $m->goto_create_ticket( $q ), "go to create ticket";
     $m->form_number(3);
-    $m->field( Subject => $oct_ru_test );
+    $m->field( Subject => $ru_test );
     $m->submit;
 
     $m->content_like( 
-        qr{<td\s+class="message-header-value"[^>]*>\s*\Q$oct_ru_test\E\s*</td>}i,
+        qr{<td\s+class="message-header-value"[^>]*>\s*\Q$ru_test\E\s*</td>}i,
         'header on the page'
     );
 }
@@ -43,16 +40,16 @@
 {
     ok $m->goto_create_ticket( $q ), "go to create ticket";
     $m->form_number(3);
-    $m->field( Subject => $oct_ru_test );
-    $m->field( Content => $oct_ru_support );
+    $m->field( Subject => $ru_test );
+    $m->field( Content => $ru_support );
     $m->submit;
 
     $m->content_like( 
-        qr{<td\s+class="message-header-value"[^>]*>\s*\Q$oct_ru_test\E\s*</td>}i,
+        qr{<td\s+class="message-header-value"[^>]*>\s*\Q$ru_test\E\s*</td>}i,
         'header on the page'
     );
     $m->content_like( 
-        qr{\Q$oct_ru_support\E}i,
+        qr{\Q$ru_support\E}i,
         'content on the page'
     );
 }