[Rt-commit] r13784 - in rt/3.8/trunk: t/mail

[spang at bestpractical.com]

Author: spang
Date: Thu Jul  3 15:36:43 2008
New Revision: 13784

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/t/mail/sendmail.t

Log:
 r43584 at loki:  spang | 2008-07-03 17:13:51 +0100
 make sendmail.t use updated get_reloacateable_file


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:36:43 2008
@@ -2,6 +2,7 @@
 
 use strict;
 use Test::More tests => 137;
+use File::Spec ();
 
 use RT::Test;
 
@@ -45,7 +46,7 @@
 
 # Let's test to make sure a multipart/report is processed correctly
 my $multipart_report_email = RT::Test::get_relocateable_file('multipart-report',
-    qw(data emails));
+    (File::Spec->updir(), 'data', 'emails'));
 my $content =  RT::Test->file_content($multipart_report_email);
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
@@ -102,7 +103,7 @@
 @scrips_fired = ();
 
 my $iso_8859_1_ticket_email = RT::Test::get_relocateable_file(
-    'new-ticket-from-iso-8859-1', qw(data emails));
+    'new-ticket-from-iso-8859-1', (File::Spec->updir(), 'data', 'emails'));
 $content =  RT::Test->file_content($iso_8859_1_ticket_email);
 
 
@@ -246,7 +247,7 @@
 # {{{ test a multipart alternative containing a text-html part with an umlaut
 
  my $alt_umlaut_email = RT::Test::get_relocateable_file(
-     'multipart-alternative-with-umlaut', qw(data emails));
+     'multipart-alternative-with-umlaut', (File::Spec->updir(), 'data', 'emails'));
  $content =  RT::Test->file_content($alt_umlaut_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -276,7 +277,7 @@
 
 # {{{ test a text-html message with an umlaut
  my $text_html_email = RT::Test::get_relocateable_file('text-html-with-umlaut',
-     qw(data emails));
+     (File::Spec->updir(), 'data', 'emails'));
  $content =  RT::Test->file_content($text_html_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -313,7 +314,7 @@
 
 # {{{ test a text-html message with russian characters
  my $russian_email = RT::Test::get_relocateable_file('text-html-in-russian',
-     qw(data emails));
+     (File::Spec->updir(), 'data', 'emails'));
  $content =  RT::Test->file_content($russian_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -341,7 +342,7 @@
 RT->Config->Set( EmailInputEncodings => 'koi8-r', RT->Config->Get('EmailInputEncodings') );
 RT->Config->Set( EmailOutputEncoding => 'koi8-r' );
 my $russian_subject_email = RT::Test::get_relocateable_file(
-    'russian-subject-no-content-type', qw(data emails));
+    'russian-subject-no-content-type', (File::Spec->updir(), 'data', 'emails'));
 $content = RT::Test->file_content($russian_subject_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -384,7 +385,7 @@
 # {{{ test a message containing a nested RFC 822 message
 
 my $nested_rfc822_email = RT::Test::get_relocateable_file('nested-rfc-822',
-    qw(data emails));
+    (File::Spec->updir(), 'data', 'emails'));
 $content =  RT::Test->file_content($nested_rfc822_email);
 ok ($content, "Loaded nested-rfc-822 to test");
 
@@ -425,7 +426,7 @@
 # {{{ test a multipart alternative containing a uuencoded mesage generated by lotus notes
 
  my $uuencoded_email = RT::Test::get_relocateable_file('notes-uuencoded',
-     qw(data emails));
+     (File::Spec->updir(), 'data', 'emails'));
  $content =  RT::Test->file_content($uuencoded_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -452,7 +453,7 @@
 # {{{ test a multipart that crashes the file-based mime-parser works
 
  my $crashes_file_based_parser_email = RT::Test::get_relocateable_file(
-     'crashes-file-based-parser', qw(data emails));
+     'crashes-file-based-parser', (File::Spec->updir(), 'data', 'emails'));
  $content = RT::Test->file_content($crashes_file_based_parser_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -481,7 +482,7 @@
 # {{{ test a multi-line RT-Send-CC header
 
  my $rt_send_cc_email = RT::Test::get_relocateable_file('rt-send-cc',
-     qw(data emails));
+     (File::Spec->updir(), 'data', 'emails'));
  $content =  RT::Test->file_content($rt_send_cc_email);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -508,7 +509,7 @@
 diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
 {
     my $subject_folding_email = RT::Test::get_relocateable_file(
-        'subject-with-folding-ws', qw(data emails));
+        'subject-with-folding-ws', (File::Spec->updir(), 'data', 'emails'));
     my $content = RT::Test->file_content($subject_folding_email);
     my ($status, $msg, $ticket) = RT::Interface::Email::Gateway(
         { message => $content, queue => 1, action => 'correspond' }
@@ -521,7 +522,7 @@
 diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
 {
     my $long_subject_email = RT::Test::get_relocateable_file('very-long-subject',
-        qw(data emails));
+        (File::Spec->updir(), 'data', 'emails'));
     my $content = RT::Test->file_content($long_subject_email);
     my ($status, $msg, $ticket) = RT::Interface::Email::Gateway(
         { message => $content, queue => 1, action => 'correspond' }