[Rt-commit] rtir branch, rt-3.9, updated. 714ceb9e5911630466974074f7768c5d42f2247f

[? sunnavy]

The branch, rt-3.9 has been updated
       via  714ceb9e5911630466974074f7768c5d42f2247f (commit)
      from  d9d4fe8cddeb17feaa2c294edfdb630d8e3c25e1 (commit)

Summary of changes:
 t/constituency/email.t          |    8 ++++----
 t/constituency/email_outgoing.t |    5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 714ceb9e5911630466974074f7768c5d42f2247f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Sep 27 14:00:02 2010 +0800

    avoid sned_via_mailgate_and_http if we can

diff --git a/t/constituency/email.t b/t/constituency/email.t
index 235cba1..431129f 100644
--- a/t/constituency/email.t
+++ b/t/constituency/email.t
@@ -41,7 +41,7 @@ Subject: This is a test of constituency functionality
 
 Foob!
 EOF
-        my ($status, $id) = RT::Test->send_via_mailgate_and_http($text, queue => $queue);
+        my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue);
         is $status >> 8, 0, "The mail gateway exited ok";
         ok $id, "created ticket $id";
 
@@ -56,7 +56,7 @@ EOF
     }
 }
 
-diag "create a ticket via gate using EXTENSION" if $ENV{'TEST_VERBOSE'};
+diag "create a ticket via gate using Extension header" if $ENV{'TEST_VERBOSE'};
 {
     my $i = 0;
 
@@ -71,12 +71,12 @@ diag "create a ticket via gate using EXTENSION" if $ENV{'TEST_VERBOSE'};
         my $text = <<EOF;
 From: @{[ $rtir_user->EmailAddress ]}
 To: rt\@@{[RT->Config->Get('rtname')]}
+X-RT-Mail-Extension: $val
 Subject: This is a test of constituency functionality
 
 Foob!
 EOF
-        local $ENV{'EXTENSION'} = $val;
-        my ($status, $id) = RT::Test->send_via_mailgate_and_http($text, queue => $queue);
+        my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue );
         is $status >> 8, 0, "The mail gateway exited ok";
         ok $id, "created ticket $id";
         $incident_id = $id if $queue eq 'Incidents';
diff --git a/t/constituency/email_outgoing.t b/t/constituency/email_outgoing.t
index 3866cb2..3b23598 100644
--- a/t/constituency/email_outgoing.t
+++ b/t/constituency/email_outgoing.t
@@ -68,7 +68,7 @@ Subject: This is a test of constituency functionality
 
 Foob!
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate_and_http($text, queue => 'Incident Reports');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Incident Reports');
     is $status >> 8, 0, "The mail gateway exited ok";
     ok $id, "created ticket $id";
 
@@ -99,11 +99,12 @@ diag "create an IR under GOVNET";
     my $text = <<EOF;
 From: @{[ $rtir_user->EmailAddress ]}
 To: gov-reports\@example.com
+X-RT-Mail-Extension: GOVNET
 Subject: This is a test of constituency functionality
 
 Foob!
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate_and_http($text, queue => 'Incident Reports', extension => 'GOVNET');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Incident Reports');
     is $status >> 8, 0, "The mail gateway exited ok";
     ok $id, "created ticket $id";
 

-----------------------------------------------------------------------