Improve Ctrl-C handling of spec (#5719)

crystal-lang · Apr 13, 2018 · 68575de · 68575de
1 parent 90c3a7a
commit 68575de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/spec/context.cr b/src/spec/context.cr
@@ -42,15 +42,15 @@ module Spec
       @results[result.kind] << result
     end
 
-    def self.print_results(elapsed_time)
-      @@instance.print_results(elapsed_time)
+    def self.print_results(elapsed_time, aborted = false)
+      @@instance.print_results(elapsed_time, aborted)
     end
 
     def self.succeeded
       @@instance.succeeded
     end
 
-    def print_results(elapsed_time)
+    def print_results(elapsed_time, aborted = false)
       Spec.formatters.each(&.finish)
 
       pendings = @results[:pending]
@@ -124,11 +124,13 @@ module Spec
       total = pendings.size + failures.size + errors.size + success.size
 
       final_status = case
+                     when aborted                           then :error
                      when (failures.size + errors.size) > 0 then :fail
                      when pendings.size > 0                 then :pending
                      else                                        :success
                      end
 
+      puts "Aborted!".colorize.red if aborted
       puts "Finished in #{Spec.to_human(elapsed_time)}"
       puts Spec.color("#{total} examples, #{failures.size} failures, #{errors.size} errors, #{pendings.size} pending", final_status)
 

diff --git a/src/spec/dsl.cr b/src/spec/dsl.cr
@@ -52,6 +52,7 @@ module Spec
 
   # :nodoc:
   def self.abort!
+    @@aborted = true
     exit
   end
 
@@ -169,8 +170,8 @@ module Spec
     start_time = Time.monotonic
     at_exit do
       elapsed_time = Time.monotonic - start_time
-      Spec::RootContext.print_results(elapsed_time)
-      exit 1 unless Spec::RootContext.succeeded
+      Spec::RootContext.print_results(elapsed_time, @@aborted)
+      exit 1 unless Spec::RootContext.succeeded && !@@aborted
     end
   end
 end