Make ctx->send_event detect termination events

Fixes #707
Test-More · Aug 18, 2016 · 7d5bee6 · 7d5bee6
1 parent 3ec926b
commit 7d5bee6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -5,6 +5,7 @@
     - Document Test::Builder::Tester plan limitations
     - Document limitations in is_deeply (#595)
     - Better documentation of done_testing purpose (#151)
+    - Make ctx->send_event detect termination events (#707)
 
 1.302052  2016-08-13 14:34:07-07:00 America/Los_Angeles
 

diff --git a/lib/Test2/API/Context.pm b/lib/Test2/API/Context.pm
@@ -201,12 +201,13 @@ sub send_event {
 
     my $pkg = $LOADED{$event} || $self->_parse_event($event);
 
-    $self->{+HUB}->send(
-        $pkg->new(
-            trace => $self->{+TRACE}->snapshot,
-            %args,
-        )
+    my $e = $pkg->new(
+        trace => $self->{+TRACE}->snapshot,
+        %args,
     );
+
+    ${$self->{+_ABORTED}}++ if $self->{+_ABORTED} && defined $e->terminate;
+    $self->{+HUB}->send($e);
 }
 
 sub build_event {
@@ -317,13 +318,11 @@ sub diag {
 
 sub plan {
     my ($self, $max, $directive, $reason) = @_;
-    ${$self->{+_ABORTED}}++ if $self->{+_ABORTED} && $directive && $directive =~ m/^(SKIP|skip_all)$/;
     $self->send_event('Plan', max => $max, directive => $directive, reason => $reason);
 }
 
 sub bail {
     my ($self, $reason) = @_;
-    ${$self->{+_ABORTED}}++ if $self->{+_ABORTED};
     $self->send_event('Bail', reason => $reason);
 }