Skip to content

Commit

Permalink
The Email::Sender::Simple deliveries no longer returns an array ref i…
Browse files Browse the repository at this point in the history 
…n scalar context.
  • Loading branch information
@theory
theory committed Oct 13, 2012
1 parent 8c99c5e commit e622002
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
16 changes: 8 additions & 8 deletions t/moderate.t
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -613,11 +613,11 @@ test_psgi +PGXN::Manager::Router->app => sub {
', 'And it should have the proper json'; ', 'And it should have the proper json';


# Did we send him email? # Did we send him email?
ok my $deliveries = Email::Sender::Simple->default_transport->deliveries, ok my @deliveries = Email::Sender::Simple->default_transport->deliveries,
'Should have email deliveries.'; 'Should have email deliveries.';
is @{ $deliveries }, 1, 'Should have one message'; is @deliveries, 1, 'Should have one message';
is @{ $deliveries->[0]{successes} }, 1, 'Should have been successfully delivered'; is @{ $deliveries[0]{successes} }, 1, 'Should have been successfully delivered';
my $email = $deliveries->[0]{email}; my $email = $deliveries[0]{email};
is $email->get_header('Subject'), 'Welcome to PGXN!', is $email->get_header('Subject'), 'Welcome to PGXN!',
'The subject should be set'; 'The subject should be set';
is $email->get_header('From'), PGXN::Manager->config->{admin_email}, is $email->get_header('From'), PGXN::Manager->config->{admin_email},
Expand Down Expand Up @@ -667,11 +667,11 @@ test_psgi +PGXN::Manager::Router->app => sub {
'And the content should say so'; 'And the content should say so';


# Did we send him email? # Did we send him email?
ok my $deliveries = Email::Sender::Simple->default_transport->deliveries, ok my @deliveries = Email::Sender::Simple->default_transport->deliveries,
'Should have email deliveries.'; 'Should have email deliveries.';
is @{ $deliveries }, 1, 'Should have one message'; is @deliveries, 1, 'Should have one message';
is @{ $deliveries->[0]{successes} }, 1, 'Should have been successfully delivered'; is @{ $deliveries[0]{successes} }, 1, 'Should have been successfully delivered';
my $email = $deliveries->[0]{email}; my $email = $deliveries[0]{email};
is $email->get_header('Subject'), 'Account Request Rejected', is $email->get_header('Subject'), 'Account Request Rejected',
'The subject should be set'; 'The subject should be set';
is $email->get_header('From'), PGXN::Manager->config->{admin_email}, is $email->get_header('From'), PGXN::Manager->config->{admin_email},
Expand Down
8 changes: 4 additions & 4 deletions t/pub.t
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -195,12 +195,12 @@ sub test_error_response {
}); });


# Check the alert email. # Check the alert email.
ok my $deliveries = Email::Sender::Simple->default_transport->deliveries, ok my @deliveries = Email::Sender::Simple->default_transport->deliveries,
'Should have email deliveries.'; 'Should have email deliveries.';
is @{ $deliveries }, 1, 'Should have one message'; is @deliveries, 1, 'Should have one message';
is @{ $deliveries->[0]{successes} }, 1, 'Should have been successfully delivered'; is @{ $deliveries[0]{successes} }, 1, 'Should have been successfully delivered';


my $email = $deliveries->[0]{email}; my $email = $deliveries[0]{email};
is $email->get_header('Subject'), 'PGXN Manager Internal Server Error', is $email->get_header('Subject'), 'PGXN Manager Internal Server Error',
'The subject should be set'; 'The subject should be set';
is $email->get_header('From'), PGXN::Manager->config->{admin_email}, is $email->get_header('From'), PGXN::Manager->config->{admin_email},
Expand Down
14 changes: 7 additions & 7 deletions t/register.t
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -204,12 +204,12 @@ test_psgi $app => sub {
}); });


# And an email should have been sent. # And an email should have been sent.
ok my $deliveries = Email::Sender::Simple->default_transport->deliveries, ok my @deliveries = Email::Sender::Simple->default_transport->deliveries,
'Should have email deliveries.'; 'Should have email deliveries.';
is @{ $deliveries }, 1, 'Should have one message'; is @deliveries, 1, 'Should have one message';
is @{ $deliveries->[0]{successes} }, 1, 'Should have been successfully delivered'; is @{ $deliveries[0]{successes} }, 1, 'Should have been successfully delivered';


my $email = $deliveries->[0]{email}; my $email = $deliveries[0]{email};
is $email->get_header('Subject'), 'New User Request for tgl', is $email->get_header('Subject'), 'New User Request for tgl',
'The subject should be set'; 'The subject should be set';
is $email->get_header('From'), PGXN::Manager->config->{admin_email}, is $email->get_header('From'), PGXN::Manager->config->{admin_email},
Expand Down Expand Up @@ -243,7 +243,7 @@ test_psgi $app => sub {
ok !$res->is_redirect, 'It should not be a redirect response'; ok !$res->is_redirect, 'It should not be a redirect response';
is $res->code, 409, 'Should have 409 status code'; is $res->code, 409, 'Should have 409 status code';


is @{ Email::Sender::Simple->default_transport->deliveries }, is +Email::Sender::Simple->default_transport->deliveries,
0, 'No email should have been sent'; 0, 'No email should have been sent';


# So check the content. # So check the content.
Expand Down Expand Up @@ -311,7 +311,7 @@ test_psgi $app => sub {
'TGL should exist'; 'TGL should exist';
}); });


is @{ Email::Sender::Simple->default_transport->deliveries }, is +Email::Sender::Simple->default_transport->deliveries,
1, 'And an admin email should have been sent'; 1, 'And an admin email should have been sent';
Email::Sender::Simple->default_transport->clear_deliveries; Email::Sender::Simple->default_transport->clear_deliveries;
}; };
Expand Down Expand Up @@ -403,7 +403,7 @@ test_psgi $app => sub {
}, undef, 'tgl'), ['Tom Lane', 'tgl@pgxn.org', '', 'new'], 'TGL should exist'; }, undef, 'tgl'), ['Tom Lane', 'tgl@pgxn.org', '', 'new'], 'TGL should exist';
}); });


is @{ Email::Sender::Simple->default_transport->deliveries }, is +Email::Sender::Simple->default_transport->deliveries,
1, 'And an admin email should have been sent'; 1, 'And an admin email should have been sent';
Email::Sender::Simple->default_transport->clear_deliveries; Email::Sender::Simple->default_transport->clear_deliveries;
}; };
Expand Down
22 changes: 11 additions & 11 deletions t/reset.t
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ test_psgi $app => sub {
); );
}); });


is @{ Email::Sender::Simple->default_transport->deliveries }, is +Email::Sender::Simple->default_transport->deliveries,
0, 'No email should have been sent' 0, 'No email should have been sent'
}; };


Expand All @@ -139,7 +139,7 @@ test_psgi $app => sub {
is $res->content, $mt->maketext('Bad request: no who parameter.'), is $res->content, $mt->maketext('Bad request: no who parameter.'),
'And the content should say so'; 'And the content should say so';


is @{ Email::Sender::Simple->default_transport->deliveries }, is +Email::Sender::Simple->default_transport->deliveries,
0, 'No email should have been sent' 0, 'No email should have been sent'
}; };


Expand All @@ -164,7 +164,7 @@ test_psgi $app => sub {
ok $sess->{reset_sent}, ok $sess->{reset_sent},
'The "reset_sent" key should have been set in the session'; 'The "reset_sent" key should have been set in the session';


is @{ Email::Sender::Simple->default_transport->deliveries }, is +Email::Sender::Simple->default_transport->deliveries,
0, 'But no email should have been sent' 0, 'But no email should have been sent'
}; };


Expand All @@ -190,12 +190,12 @@ test_psgi $app => sub {
ok $sess->{reset_sent}, ok $sess->{reset_sent},
'The "reset_sent" key should have been set in the session'; 'The "reset_sent" key should have been set in the session';


ok my $deliveries = Email::Sender::Simple->default_transport->deliveries, ok my @deliveries = Email::Sender::Simple->default_transport->deliveries,
'Should have email deliveries.'; 'Should have email deliveries.';
is @{ $deliveries }, 1, 'Should have one message'; is @deliveries, 1, 'Should have one message';
is @{ $deliveries->[0]{successes} }, 1, 'Should have been successfully delivered'; is @{ $deliveries[0]{successes} }, 1, 'Should have been successfully delivered';


my $email = $deliveries->[0]{email}; my $email = $deliveries[0]{email};
is $email->get_header('Subject'), 'Reset Your Password', is $email->get_header('Subject'), 'Reset Your Password',
'The subject should be set'; 'The subject should be set';
is $email->get_header('From'), PGXN::Manager->config->{admin_email}, is $email->get_header('From'), PGXN::Manager->config->{admin_email},
Expand Down Expand Up @@ -229,12 +229,12 @@ test_psgi +PGXN::Manager::Router->app => sub {
is $res->content, $mt->maketext('Success'), is $res->content, $mt->maketext('Success'),
'And the content should say so'; 'And the content should say so';


ok my $deliveries = Email::Sender::Simple->default_transport->deliveries, ok my @deliveries = Email::Sender::Simple->default_transport->deliveries,
'Should have email deliveries.'; 'Should have email deliveries.';
is @{ $deliveries }, 1, 'Should have one message'; is @deliveries, 1, 'Should have one message';
is @{ $deliveries->[0]{successes} }, 1, 'Should have been successfully delivered'; is @{ $deliveries[0]{successes} }, 1, 'Should have been successfully delivered';


my $email = $deliveries->[0]{email}; my $email = $deliveries[0]{email};
is $email->get_header('Subject'), 'Reset Your Password', is $email->get_header('Subject'), 'Reset Your Password',
'The subject should be set'; 'The subject should be set';
is $email->get_header('From'), PGXN::Manager->config->{admin_email}, is $email->get_header('From'), PGXN::Manager->config->{admin_email},
Expand Down

0 comments on commit e622002

Please sign in to comment.