[Rt-commit] r13774 - in rt/3.8/trunk: . lib/RT/Graph share/html/Elements t/mail
spang at bestpractical.com
spang at bestpractical.com
Thu Jul 3 15:34:06 EDT 2008
Author: spang
Date: Thu Jul 3 15:34:04 2008
New Revision: 13774
Modified:
rt/3.8/trunk/ (props changed)
rt/3.8/trunk/lib/RT/Graph/Tickets.pm
rt/3.8/trunk/lib/RT/Test.pm
rt/3.8/trunk/share/html/Elements/ShowUserVerbose
rt/3.8/trunk/t/mail/crypt-gnupg.t
rt/3.8/trunk/t/mail/gnupg-bad.t
rt/3.8/trunk/t/mail/gnupg-incoming.t
rt/3.8/trunk/t/mail/gnupg-realmail.t
rt/3.8/trunk/t/mail/gnupg-reverification.t
rt/3.8/trunk/t/mail/sendmail.t
Log:
Modified: rt/3.8/trunk/lib/RT/Graph/Tickets.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Graph/Tickets.pm (original)
+++ rt/3.8/trunk/lib/RT/Graph/Tickets.pm Thu Jul 3 15:34:04 2008
@@ -67,12 +67,12 @@
}
our %ticket_status_style = (
- new => { fontcolor => '#FF0000', fontsize => 10 },
- open => { fontcolor => '#000000', fontsize => 10 },
- stalled => { fontcolor => '#DAA520', fontsize => 10 },
- resolved => { fontcolor => '#00FF00', fontsize => 10 },
- rejected => { fontcolor => '#808080', fontsize => 10 },
- deleted => { fontcolor => '#A9A9A9', fontsize => 10 },
+ new => { fontcolor => '#FF0000' },
+ open => { fontcolor => '#000000' },
+ stalled => { fontcolor => '#DAA520' },
+ resolved => { fontcolor => '#00FF00' },
+ rejected => { fontcolor => '#808080' },
+ deleted => { fontcolor => '#A9A9A9' },
);
our %link_style = (
Modified: rt/3.8/trunk/lib/RT/Test.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Test.pm (original)
+++ rt/3.8/trunk/lib/RT/Test.pm Thu Jul 3 15:34:04 2008
@@ -54,7 +54,6 @@
use Test::More;
use Socket;
use File::Temp;
-use File::Spec;
my $config;
our ($existing_server, $port, $dbname);
my $mailsent;
@@ -610,13 +609,9 @@
$key =~ s/\@/-at-/g;
$key .= ".$type.key";
-
require RT::Crypt::GnuPG;
- (my $volume, my $directories, my $file) = File::Spec->splitpath($0);
- my $keys_dir = File::Spec->catdir( File::Spec->curdir(), $directories,
- File::Spec->updir(), qw(data gnupg keys) );
return RT::Crypt::GnuPG::ImportKey(
- RT::Test->file_content([$keys_dir, $key])
+ RT::Test->file_content([qw(t data gnupg keys), $key])
);
}
Modified: rt/3.8/trunk/share/html/Elements/ShowUserVerbose
==============================================================================
--- rt/3.8/trunk/share/html/Elements/ShowUserVerbose (original)
+++ rt/3.8/trunk/share/html/Elements/ShowUserVerbose Thu Jul 3 15:34:04 2008
@@ -55,7 +55,7 @@
$phrase = $User->RealName
if $User->RealName && lc $User->RealName ne lc $address;
$comment = $User->Name if lc $User->Name ne lc $address;
- $Address = Email::Address->new( $phrase, $address, "($comment)" );
+ $Address = Email::Address->new( $phrase, $address, $comment );
}
Modified: rt/3.8/trunk/t/mail/crypt-gnupg.t
==============================================================================
--- rt/3.8/trunk/t/mail/crypt-gnupg.t (original)
+++ rt/3.8/trunk/t/mail/crypt-gnupg.t Thu Jul 3 15:34:04 2008
@@ -17,10 +17,7 @@
use File::Spec ();
use Cwd;
-
-(my $volume, my $directories, my $file) = File::Spec->splitpath($0);
-my $homedir = File::Spec->catdir( cwd(), $directories, File::Spec->updir(),
- qw(data gnupg keyrings) );
+my $homedir = File::Spec->catdir( cwd(), qw(t data gnupg keyrings) );
mkdir $homedir;
use_ok('RT::Crypt::GnuPG');
Modified: rt/3.8/trunk/t/mail/gnupg-bad.t
==============================================================================
--- rt/3.8/trunk/t/mail/gnupg-bad.t (original)
+++ rt/3.8/trunk/t/mail/gnupg-bad.t Thu Jul 3 15:34:04 2008
@@ -14,9 +14,7 @@
use Cwd 'getcwd';
-(my $volume, my $directories, my $file) = File::Spec->splitpath($0);
-my $homedir = File::Spec->catdir( getcwd(), $directories, File::Spec->updir(),
- qw(data gnupg keyrings) );
+my $homedir = File::Spec->catdir( getcwd(), qw(t data gnupg keyrings) );
RT->Config->Set( LogToScreen => 'debug' );
RT->Config->Set( 'GnuPG',
Modified: rt/3.8/trunk/t/mail/gnupg-incoming.t
==============================================================================
--- rt/3.8/trunk/t/mail/gnupg-incoming.t (original)
+++ rt/3.8/trunk/t/mail/gnupg-incoming.t Thu Jul 3 15:34:04 2008
@@ -17,9 +17,7 @@
use String::ShellQuote 'shell_quote';
use IPC::Run3 'run3';
-(my $volume, my $directories, my $file) = File::Spec->splitpath($0);
-my $homedir = File::Spec->catdir( getcwd(), $directories, File::Spec->updir(),
- qw(data gnupg keyrings) );
+my $homedir = File::Spec->catdir( getcwd(), qw(t data gnupg keyrings) );
# catch any outgoing emails
RT::Test->set_mail_catcher;
Modified: rt/3.8/trunk/t/mail/gnupg-realmail.t
==============================================================================
--- rt/3.8/trunk/t/mail/gnupg-realmail.t (original)
+++ rt/3.8/trunk/t/mail/gnupg-realmail.t Thu Jul 3 15:34:04 2008
@@ -69,10 +69,7 @@
my ($eid, $usage, $format, $attachment) = @_;
diag "email_ok $eid: $usage, $format, $attachment" if $ENV{'TEST_VERBOSE'};
- (my $volume, my $directories, my $file_new) = File::Spec->splitpath($0);
- my $emaildatadir = File::Spec->catdir( File::Spec->curdir(), $directories,
- File::Spec->updir(), qw(data gnupg emails));
- my ($file) = glob("$emaildatadir/$eid-*");
+ my ($file) = glob("t/data/gnupg/emails/$eid-*");
my $mail = RT::Test->file_content($file);
my ($status, $id) = RT::Test->send_via_mailgate($mail);
Modified: rt/3.8/trunk/t/mail/gnupg-reverification.t
==============================================================================
--- rt/3.8/trunk/t/mail/gnupg-reverification.t (original)
+++ rt/3.8/trunk/t/mail/gnupg-reverification.t Thu Jul 3 15:34:04 2008
@@ -49,10 +49,7 @@
my @ticket_ids;
-(my $volume, my $directories, my $file) = File::Spec->splitpath($0);
-my $emaildatadir = File::Spec->catdir( File::Spec->curdir(), $directories,
- File::Spec->updir(), qw(data gnupg emails) );
-my @files = glob("$emaildatadir/*-signed-*");
+my @files = glob("t/data/gnupg/emails/*-signed-*");
foreach my $file ( @files ) {
diag "testing $file" if $ENV{'TEST_VERBOSE'};
Modified: rt/3.8/trunk/t/mail/sendmail.t
==============================================================================
--- rt/3.8/trunk/t/mail/sendmail.t (original)
+++ rt/3.8/trunk/t/mail/sendmail.t Thu Jul 3 15:34:04 2008
@@ -156,7 +156,7 @@
# create an iso 8859-1 ticket
@scrips_fired = ();
- $content = RT::Test->file_content($iso_8859_1_ticket_email);
+ $content = RT::Test->file_content($test_email);
# be as much like the mail gateway as possible.
use RT::Interface::Email;
More information about the Rt-commit
mailing list