abstract.rb in qed-2.5.1

- old
+ new

@@ -187,11 +187,11 @@
       #@fail << [step, assertion]
     end
 
     # After running a step that raised an error.
     def error(step, exception)
-      raise exception if $DEBUG
+      raise exception if $DEBUG  # TODO: do we really want to do it like this?
       #@error << [step, exception]
     end
 
     #
     def after_data(step)
@@ -235,12 +235,12 @@
     def print_time
       io.puts "\nFinished in %.5f seconds.\n\n" % [Time.now - @start_time]
     end
 
     def print_tally
-      assert_count = Assertion.count
-      assert_fails = Assertion.fails
+      assert_count = AE::Assertor.counts[:total]
+      assert_fails = AE::Assertor.counts[:fail]
       assert_delta = assert_count - assert_fails
 
       mask = "%s demos, %s steps: %s failures, %s errors (%s/%s assertions)"
       vars = [demos.size, steps.size, fails.size, errors.size, assert_delta, assert_count] #, @pass.size ]
 
@@ -251,10 +251,10 @@
     def clean_backtrace(btrace)
       btrace.chomp(":in \`__binding__'")
     end
 
     #
-    INTERNALS = /(lib|bin)[\\\/]qed/
+    INTERNALS = /(lib|bin)[\\\/](qed|ae)/
 
 =begin
     # Clean the backtrace of any reference to ko/ paths and code.
     def clean_backtrace(backtrace)
       trace = backtrace.reject{ |bt| bt =~ INTERNALS }