test/test_stat.rb in pork-1.5.0 vs test/test_stat.rb in pork-2.0.0

@@ -2,11 +2,11 @@
 require 'pork/test'
 require 'stringio'
 
 describe Pork::Stat do
   before do
-    @executor = Class.new(Pork::Executor){init}
+    @suite = Class.new(Pork::Suite){init}
   end
 
   def skip_if_backtrace_is_wrong
     0.should == {
     }
@@ -21,11 +21,11 @@
   end
 
   def run check=:expect_one_error
     stat = Pork::Stat.new(Pork.report_class.new(StringIO.new))
     stat.protected_exceptions = pork_stat.protected_exceptions
-    @stat = @executor.execute(Pork.execute_mode, stat)
+    @stat = Pork::Executor.execute(:suite => @suite, :stat => stat)
     send(check)
   end
 
   def expect_one_error
     expect(@stat.reporter.io.string).eq "\e[31mE\e[0m"
@@ -40,21 +40,23 @@
     expect(@stat.assertions).eq 0
     expect(@stat.failures)  .eq 1
   end
 
   would 'rescue custom errors' do
-    @executor.would{ raise WebMockError }
+    @suite.would{ raise WebMockError }
     run
   end
 
   would 'always have backtrace' do
-    @executor.would
+    @suite.would{}
     run
 
     err, _, test = @stat.exceptions.first
     err.set_backtrace([])
 
+    expect(err).kind_of?(Pork::Error)
+    expect(err.message).eq 'Missing assertions'
     expect(@stat.reporter.send(:show_backtrace, test, err)).not.empty?
   end
 
   describe 'Pork::Stat#show_source' do
     def verify source, check=:expect_one_error
@@ -63,70 +65,70 @@
       yield(err) if block_given?
       expect(@stat.reporter.send(:show_source, test, err)).include?(source)
     end
 
     would 'one line' do
-      @executor.would{ flunk }
-      verify('=> @executor.would{ flunk }')
+      @suite.would{ flunk }
+      verify('=> @suite.would{ flunk }')
     end
 
     would 'more lines' do
-      @executor.would do
+      @suite.would do
         flunk
       end
       verify(<<-SOURCE.chomp)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   flunk\e[0m
      end
       SOURCE
     end
 
     would 'multiple lines' do
-      @executor.would do
+      @suite.would do
         raise \
           'error'
       end
       verify(<<-SOURCE.chomp)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   raise \\\e[0m
 \e[41m  =>     'error'\e[0m
      end
       SOURCE
     end
 
     would 'multiple lines with == {}' do
       skip_if_backtrace_is_wrong
-      @executor.would do
+      @suite.would do
         0.should == {
 
 
         }
       end
       verify(<<-SOURCE.chomp, :expect_one_failure)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   0.should == {\e[0m
 \e[41m  => \e[0m
 \e[41m  => \e[0m
 \e[41m  =>   }\e[0m
      end
       SOURCE
     end
 
     would 'show the line in the test, not other methods' do
-      @executor.send(:define_method, :f){ flunk }
-      @executor.would do
+      @suite.send(:define_method, :f){ flunk }
+      @suite.would do
         f
       end
       verify(<<-SOURCE.chomp)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   f\e[0m
      end
       SOURCE
     end
 
     would 'show the line in the test, even if it is from 3rd party' do
-      @executor.would{ flunk }
-      verify("=> @executor.would{ flunk }") do |err|
+      @suite.would{ flunk }
+      verify("=> @suite.would{ flunk }") do |err|
         err.set_backtrace(err.backtrace.unshift("bad.rb:#{__LINE__}"))
       end
     end
   end
 end