projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#37125: Include discounts in report: customer accounting summary
[freeside.git]
/
rt
/
t
/
mail
/
wrong_mime_charset.t
diff --git
a/rt/t/mail/wrong_mime_charset.t
b/rt/t/mail/wrong_mime_charset.t
index
511a7e6
..
a3986d7
100644
(file)
--- a/
rt/t/mail/wrong_mime_charset.t
+++ b/
rt/t/mail/wrong_mime_charset.t
@@
-1,13
+1,10
@@
-#!/usr/bin/perl
use strict;
use warnings;
use strict;
use warnings;
-use RT::Test nodb => 1, tests =>
6
;
+use RT::Test nodb => 1, tests =>
undef
;
use_ok('RT::I18N');
use_ok('RT::I18N');
-use utf8;
-use Encode;
-my $test_string = 'À';
-my $encoded_string = encode( 'iso-8859-1', $test_string );
+my $test_string = Encode::decode("UTF-8", 'À');
+my $encoded_string = Encode::encode( 'iso-8859-1', $test_string );
my $mime = MIME::Entity->build(
"Subject" => $encoded_string,
"Data" => [$encoded_string],
my $mime = MIME::Entity->build(
"Subject" => $encoded_string,
"Data" => [$encoded_string],
@@
-23,10
+20,6
@@
local $SIG{__WARN__} = sub {
RT::I18N::SetMIMEEntityToEncoding( $mime, 'iso-8859-1' );
RT::I18N::SetMIMEEntityToEncoding( $mime, 'iso-8859-1' );
-TODO: {
- local $TODO =
-'need a better approach of encoding converter, should be fixed in 4.2';
-
# this is a weird behavior for different perl versions, 5.12 warns twice,
# which is correct since we do the encoding thing twice, for Subject
# and Data respectively.
# this is a weird behavior for different perl versions, 5.12 warns twice,
# which is correct since we do the encoding thing twice, for Subject
# and Data respectively.
@@
-41,10
+34,11
@@
like(
"We can't encode something into the wrong encoding without Encode complaining"
);
"We can't encode something into the wrong encoding without Encode complaining"
);
-my $subject = decode( 'iso-8859-1', $mime->head->get('Subject') );
+my $subject =
Encode::
decode( 'iso-8859-1', $mime->head->get('Subject') );
chomp $subject;
is( $subject, $test_string, 'subject is set to iso-8859-1' );
chomp $subject;
is( $subject, $test_string, 'subject is set to iso-8859-1' );
-my $body = decode( 'iso-8859-1', $mime->stringify_body );
+my $body =
Encode::
decode( 'iso-8859-1', $mime->stringify_body );
chomp $body;
is( $body, $test_string, 'body is set to iso-8859-1' );
chomp $body;
is( $body, $test_string, 'body is set to iso-8859-1' );
-}
+
+done_testing;