[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-566-g9023b7d
Thomas Sibley
trs at bestpractical.com
Wed Aug 25 13:32:45 EDT 2010
The branch, 3.9-trunk has been updated
via 9023b7dab2cca8133c182f2e3689b7f558c907a7 (commit)
from 346e64758ad6ef379ecefecc8d81519a8168f7ab (commit)
Summary of changes:
t/api/attachment_filename.t | 22 +++++++++++-----------
t/mail/gateway.t | 10 +++++-----
t/web/attachments.t | 6 +++---
t/web/cf_access.t | 6 +++---
t/web/command_line.t | 8 ++++++--
5 files changed, 28 insertions(+), 24 deletions(-)
- Log -----------------------------------------------------------------
commit 9023b7dab2cca8133c182f2e3689b7f558c907a7
Author: Thomas Sibley <trs at bestpractical.com>
Date: Wed Aug 25 13:33:45 2010 -0400
Fix tests to account for our logo change
I've TODOed one test in t/web/command_line.t because the binary PNG data
is getting mangled along the way. It looks like newline conversion
attempts are to blame.
diff --git a/t/api/attachment_filename.t b/t/api/attachment_filename.t
index 2eced01..0d9eeb5 100644
--- a/t/api/attachment_filename.t
+++ b/t/api/attachment_filename.t
@@ -8,32 +8,32 @@ my $mime = MIME::Entity->build(
);
$mime->attach(
- Path => 'share/html/NoAuth/images/bplogo.gif',
- Type => 'image/gif',
+ Path => 'share/html/NoAuth/images/bpslogo.png',
+ Type => 'image/png',
);
$mime->attach(
- Path => 'share/html/NoAuth/images/bplogo.gif',
- Type => 'image/gif',
- Filename => 'bplogo.gif',
+ Path => 'share/html/NoAuth/images/bpslogo.png',
+ Type => 'image/png',
+ Filename => 'bpslogo.png',
);
$mime->attach(
- Path => 'share/html/NoAuth/images/bplogo.gif',
- Filename => 'images/bplogo.gif',
- Type => 'image/gif',
+ Path => 'share/html/NoAuth/images/bpslogo.png',
+ Filename => 'images/bpslogo.png',
+ Type => 'image/png',
);
my $id = $ticket->Create( MIMEObj => $mime, Queue => 'General' );
ok( $id, "created ticket $id" );
my $atts = RT::Attachments->new( $RT::SystemUser );
-$atts->Limit( FIELD => 'ContentType', VALUE => 'image/gif' );
-is( $atts->Count, 3, 'got 3 gif files' );
+$atts->Limit( FIELD => 'ContentType', VALUE => 'image/png' );
+is( $atts->Count, 3, 'got 3 png files' );
# no matter if mime's filename include path or not,
# we should throw away the path all the time.
while ( my $att = $atts->Next ) {
- is( $att->Filename, 'bplogo.gif', "attachment's filename" );
+ is( $att->Filename, 'bpslogo.png', "attachment's filename" );
}
diff --git a/t/mail/gateway.t b/t/mail/gateway.t
index f22679e..1e27eb3 100644
--- a/t/mail/gateway.t
+++ b/t/mail/gateway.t
@@ -447,7 +447,7 @@ EOF
diag "Testing preservation of binary attachments";
{
# Get a binary blob (Best Practical logo)
- my $LOGO_FILE = $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
+ my $LOGO_FILE = $RT::MasonComponentRoot .'/NoAuth/images/bpslogo.png';
# Create a mime entity with an attachment
my $entity = MIME::Entity->build(
@@ -459,7 +459,7 @@ diag "Testing preservation of binary attachments";
$entity->attach(
Path => $LOGO_FILE,
- Type => 'image/gif',
+ Type => 'image/png',
Encoding => 'base64',
);
# Create a ticket with a binary attachment
@@ -479,7 +479,7 @@ diag "Testing preservation of binary attachments";
# Verify that the binary attachment is valid in the database
my $attachments = RT::Attachments->new($RT::SystemUser);
- $attachments->Limit(FIELD => 'ContentType', VALUE => 'image/gif');
+ $attachments->Limit(FIELD => 'ContentType', VALUE => 'image/png');
my $txn_alias = $attachments->Join(
ALIAS1 => 'main',
FIELD1 => 'TransactionId',
@@ -488,7 +488,7 @@ diag "Testing preservation of binary attachments";
);
$attachments->Limit( ALIAS => $txn_alias, FIELD => 'ObjectType', VALUE => 'RT::Ticket' );
$attachments->Limit( ALIAS => $txn_alias, FIELD => 'ObjectId', VALUE => $id );
- is ($attachments->Count, 1, 'Found only one gif attached to the ticket');
+ is ($attachments->Count, 1, 'Found only one png attached to the ticket');
my $attachment = $attachments->First;
ok ($attachment->Id, 'loaded attachment object');
my $acontent = $attachment->Content;
@@ -499,7 +499,7 @@ diag "Testing preservation of binary attachments";
# Grab the binary attachment via the web ui
my $ua = new LWP::UserAgent;
my $full_url = "$url/Ticket/Attachment/". $attachment->TransactionId
- ."/". $attachment->id. "/bplogo.gif?&user=root&pass=password";
+ ."/". $attachment->id. "/bpslogo.png?&user=root&pass=password";
my $r = $ua->get( $full_url );
# Verify that the downloaded attachment is the same as what we uploaded.
diff --git a/t/web/attachments.t b/t/web/attachments.t
index e827b2f..0b66bd9 100644
--- a/t/web/attachments.t
+++ b/t/web/attachments.t
@@ -3,7 +3,7 @@ use strict;
use RT::Test tests => 14;
-use constant LogoFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
+use constant LogoFile => $RT::MasonComponentRoot .'/NoAuth/images/bpslogo.png';
use constant FaviconFile => $RT::MasonComponentRoot .'/NoAuth/images/favicon.png';
my ($baseurl, $m) = RT::Test->started_ok;
@@ -28,7 +28,7 @@ is($m->status, 200, "request successful");
$m->content_like(qr/Attachments test/, 'we have subject on the page');
$m->content_like(qr/Some content/, 'and content');
-$m->content_like(qr/Download bplogo\.gif/, 'page has file name');
+$m->content_like(qr/Download bpslogo\.png/, 'page has file name');
$m->follow_link_ok({text => 'Reply'}, "reply to the ticket");
$m->form_name('TicketUpdate');
@@ -42,6 +42,6 @@ $m->field('UpdateContent', 'Message');
$m->click('SubmitTicket');
is($m->status, 200, "request successful");
-$m->content_like(qr/Download bplogo\.gif/, 'page has file name');
+$m->content_like(qr/Download bpslogo\.png/, 'page has file name');
$m->content_like(qr/Download favicon\.png/, 'page has file name');
diff --git a/t/web/cf_access.t b/t/web/cf_access.t
index 594bff8..bbb2824 100644
--- a/t/web/cf_access.t
+++ b/t/web/cf_access.t
@@ -6,7 +6,7 @@ $RT::Test::SKIP_REQUEST_WORK_AROUND = 1;
my ($baseurl, $m) = RT::Test->started_ok;
-use constant ImageFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
+use constant ImageFile => $RT::MasonComponentRoot .'/NoAuth/images/bpslogo.png';
use constant ImageFileContent => RT::Test->file_content(ImageFile);
ok $m->login, 'logged in';
@@ -151,7 +151,7 @@ diag "create a ticket with an image";
$m->title_like(qr/testing img cf creation/, "its title is the Subject");
- $m->follow_link( text => 'bplogo.gif' );
+ $m->follow_link( text => 'bpslogo.png' );
$m->content_is(ImageFileContent, "it links to the uploaded image");
}
@@ -180,7 +180,7 @@ $m->click('AddCol');
$m->form_name('BuildQuery');
$m->click('DoSearch');
-$m->follow_link( text_regex => qr/bplogo\.gif/ );
+$m->follow_link( text_regex => qr/bpslogo\.png/ );
$m->content_is(ImageFileContent, "it links to the uploaded image");
__END__
diff --git a/t/web/command_line.t b/t/web/command_line.t
index ef0ac6c..8904519 100644
--- a/t/web/command_line.t
+++ b/t/web/command_line.t
@@ -118,7 +118,7 @@ ok($val,$msg);
# text attachment
check_attachment($test_email);
# binary attachment
- check_attachment($RT::MasonComponentRoot.'/NoAuth/images/bplogo.gif');
+ check_attachment($RT::MasonComponentRoot.'/NoAuth/images/bpslogo.png');
# change a ticket's Owner
expect_send("edit ticket/$ticket_id set owner=root", 'Changing owner...');
@@ -533,7 +533,11 @@ sub check_attachment {
my $attachment_content = do { local($/); <$fh> };
close $fh;
chomp $attachment_content;
- expect_is($attachment_content,"Attachment contains original text");
+ TODO: {
+ local $TODO = "Binary PNG content is getting mangled somewhere along the way"
+ if $attachment_path =~ /\.png$/;
+ expect_is($attachment_content,"Attachment contains original text");
+ }
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list