pork 1.5.0 → 2.1.0

data/test/test_around.rb

@@ -0,0 +1,64 @@
+
+require 'pork/test'
+
+describe 'using fibers to simulate around' do
+  def a
+    @a ||= []
+  end
+
+  def around_me i
+    a << "around before #{i}"
+    yield
+    a << "around after #{i}"
+  end
+
+  before do
+    a << :before
+  end
+
+  after do
+    expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+      :would, :after, "around after 1", "around after 0"]
+  end
+
+  around do |test|
+    expect(a).eq [:before]
+
+    around_me(0) do
+      test.call
+
+      expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+        :would, :after, "around after 1"]
+    end
+  end
+
+  around do
+    expect(a).eq [:before, "around before 0"]
+
+    a << :nocall
+  end
+
+  around do |test|
+    expect(a).eq [:before, "around before 0", :nocall]
+
+    around_me(1) do
+      test.call
+
+      expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+        :would, :after]
+    end
+  end
+
+  after do
+    expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+      :would]
+
+    a << :after
+  end
+
+  would 'wrap around around' do
+    expect(a).eq [:before, "around before 0", :nocall, "around before 1"]
+
+    a << :would
+  end
+end

data/test/test_bacon.rb

@@ -236,13 +236,14 @@ describe "before/after" do
     @a = 2
   end
 
+  # after should run in reverse order
   after do
-    @a.should.eq 2
-    @a = 3
+    @a.should.eq 3
   end
 
   after do
-    @a.should.eq 3
+    @a.should.eq 2
+    @a = 3
   end
 
   would "run in the right order" do
@@ -343,7 +344,7 @@ end
 
 describe 'describe arguments' do
   check = lambda do |ctx, desc, name=nil|
-    ctx.should.lt Pork::Executor
+    ctx.should.lt Pork::Suite
     ctx.description_for(name).should.eq "#{desc}: #{name}"
   end
 
@@ -372,8 +373,8 @@ describe 'describe arguments' do
   end
 
   would 'work with namespaced modules' do
-    str = 'Pork::Executor'
-    Pork::API.describe(Pork::Executor) do
+    str = 'Pork::Suite'
+    Pork::API.describe(Pork::Suite) do
       check[self, str]
       would 'd' do check[self.class, str, 'd'] end
     end

data/test/test_isolator.rb

@@ -0,0 +1,29 @@
+
+require 'pork/test'
+
+describe Pork::Isolator do
+  before do
+    @suite = Class.new(Pork::Suite){init}
+  end
+
+  describe '.all_tests' do
+    would 'have the correct source order' do
+      @suite.copy :append do
+        would{}
+      end
+
+      @suite.describe do
+        describe do
+          would{}
+        end
+
+        paste :append
+      end
+
+      Pork::Isolator[@suite].
+        all_tests[:files].values.map(&:keys).each do |lines|
+          expect(lines).eq lines.sort
+        end
+    end
+  end
+end

data/test/test_meta.rb

@@ -0,0 +1,40 @@
+
+require 'pork/test'
+
+describe 'meta' do
+  before do
+    @stat = Pork::Stat.new(Pork.report_class.new(StringIO.new))
+    @suite = Class.new(Pork::Suite){init}
+  end
+
+  def execute
+    Pork::Executor.execute(:suite => @suite, :stat => @stat)
+  end
+
+  would 'raise missing assertion' do
+    @suite.would{}
+    @suite.after{ok} # defined after would so no run for that
+    stat = execute
+    err, _, _ = stat.exceptions.first
+
+    expect(err).kind_of?(Pork::Error)
+    expect(err.message).eq 'Missing assertions'
+  end
+
+  would 'not raise missing assertion if there is one in after block' do
+    @suite.after{ok}
+    @suite.would{}
+    stat = execute
+
+    expect(stat.exceptions).empty?
+  end
+
+  would 'run after block even if there is an error in test' do
+    called = false
+    @suite.after{ called = true }
+    @suite.would{ flunk }
+    execute
+
+    expect(called).eq true
+  end
+end

data/test/test_nested.rb

@@ -14,7 +14,7 @@ describe 'A' do
 
   would 'f' do
     f.should.eq m
-    f.should.kind_of? Fixnum
+    f.should.kind_of? Integer
     lambda{ f.should.eq '' }.should.raise Pork::Failure
   end
 
@@ -78,3 +78,26 @@ describe Pork::Context do
     expect(pork_description).eq desc
   end
 end
+
+describe 'assertion in after block' do
+  after do
+    ok
+  end
+
+  would do
+  end
+end
+
+describe 'no before/after after would' do
+  would do
+    ok
+  end
+
+  before do
+    flunk
+  end
+
+  after do
+    flunk
+  end
+end

data/test/test_pork_test.rb

@@ -2,21 +2,21 @@
 require 'pork/test'
 
 describe 'PORK_TEST=a' do
-  def verify line, executor, index
-    path = executor[index].first
-    type, desc, block, opts = extract(path, executor)
+  def verify line, suite, index
+    path = Pork::Isolator[suite][index].first
+    type, desc, block, opts = extract(path, suite)
     expect(type)                 .eq :would
     expect(desc)                 .eq 'find the corresponding test case'
     expect(block.source_location).eq [__FILE__, line]
     expect(opts)                 .eq :groups => [:a, :b]
   end
 
-  def extract path, executor
-    path.inject(executor.instance_variable_get(:@tests)) do |tests, idx|
+  def extract path, suite
+    path.inject(suite.tests) do |tests, idx|
       type, arg, = tests[idx]
       case type
       when :describe # we need to go deeper
-        arg.instance_variable_get(:@tests)
+        arg.tests
       else
         tests[idx] # should end here
       end
@@ -25,11 +25,11 @@ describe 'PORK_TEST=a' do
 
   would 'find the corresponding test case', :groups => [:a, :b] do
     line = __LINE__ - 1
-    [self.class, Pork::Executor].each do |executor|
-      verify(line, executor, "#{__FILE__}:#{__LINE__}") # line
-      verify(line, executor, 'a')                       # group
-      verify(line, executor, "#{__FILE__}:#{__LINE__}") # diff line
-      verify(line, executor, __FILE__)                  # file
+    [self.class, Pork::Suite].each do |suite|
+      verify(line, suite, "#{__FILE__}:#{__LINE__}") # line
+      verify(line, suite, 'a')                       # group
+      verify(line, suite, "#{__FILE__}:#{__LINE__}") # diff line
+      verify(line, suite, __FILE__)                  # file
       # for self.class, would is the 1st, for Pork::Executor, would is 2nd
     end
   end
@@ -37,16 +37,18 @@ describe 'PORK_TEST=a' do
   describe 'PORK_TEST=b' do
     would 'find both', :groups => [:b] do
       line = __LINE__ - 1
-      woulds = Pork::Executor[__FILE__]
-      woulds               .size.should.eq 4
-      Pork::Executor['a']  .size.should.eq 1
-      Pork::Executor['b']  .size.should.eq 2
-      Pork::Executor['b']       .should.eq woulds.first(2)
-      Pork::Executor['a,b']     .should.eq woulds.first(2)
-      self.class['a']           .should.nil?
-      self.class['b']      .size.should.eq 1
+      top = Pork::Isolator[]
+      woulds = top[__FILE__]
+      woulds    .size.should.eq 4
+      top['a']  .size.should.eq 1
+      top['b']  .size.should.eq 2
+      top['b']       .should.eq woulds.first(2)
+      top['a,b']     .should.eq woulds.first(2)
+      local = Pork::Isolator[self.class]
+      local['a']     .should.nil?
+      local['b'].size.should.eq 1
 
-      a, b = Pork::Executor['b'].map{ |path| extract(path, Pork::Executor) }
+      a, b = top['b'].map{ |path| extract(path, Pork::Suite) }
       expect(a[0])                .eq :would
       expect(a[1])                .eq 'find the corresponding test case'
       expect(a[3])                .eq :groups => [:a, :b]
@@ -60,12 +62,13 @@ describe 'PORK_TEST=a' do
   describe 'PORK_TEST=c', :groups => [:c] do
     would 'inherit groups from describe', :groups => [:d] do
       line = __LINE__ - 2
-      c = Pork::Executor['c']
-      d = Pork::Executor['d']
-      expect(c.size)                               .eq 2
-      expect(d.size)                               .eq 1
-      expect(c.first)                              .eq d.first
-      expect(Pork::Executor["#{__FILE__}:#{line}"]).eq c
+      isolator = Pork::Isolator[]
+      c = isolator['c']
+      d = isolator['d']
+      expect(c.size)                         .eq 2
+      expect(d.size)                         .eq 1
+      expect(c.first)                        .eq d.first
+      expect(isolator["#{__FILE__}:#{line}"]).eq c
     end
 
     would 'dummy' do

data/test/test_readme.rb

@@ -1,13 +1,17 @@
 
 require 'pork/test'
-require 'uri'
 
 describe 'README.md' do
   File.read("#{File.dirname(File.expand_path(__FILE__))}/../README.md").
     scan(%r{``` ruby\nrequire 'pork/auto'\n(.+?)\n```}m).
     each.with_index do |(code), index|
       would 'pass from README.md #%02d' % index do
-        Module.new{ extend Pork::API; instance_eval(code) }
+        suite = Class.new(Pork::Suite) do
+          init
+          instance_eval(code)
+        end
+
+        Pork::Executor.execute(:suite => suite)
         ok
       end
   end

data/test/test_stat.rb

@@ -4,7 +4,7 @@ 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
@@ -23,7 +23,7 @@ describe Pork::Stat do
   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
 
@@ -42,17 +42,19 @@ describe Pork::Stat do
   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
 
@@ -65,28 +67,28 @@ describe Pork::Stat do
     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
@@ -95,14 +97,14 @@ describe Pork::Stat do
 
     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
@@ -112,20 +114,20 @@ describe Pork::Stat do
     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

data/test/test_suite.rb

@@ -0,0 +1,10 @@
+
+require 'pork/test'
+
+describe Pork::Suite do
+  def self.suite_method
+    would{ ok }
+  end
+
+  suite_method
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pork
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -51,8 +51,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -60,6 +60,7 @@ files:
 - Rakefile
 - TODO.md
 - lib/pork.rb
+- lib/pork/api.rb
 - lib/pork/auto.rb
 - lib/pork/context.rb
 - lib/pork/env.rb
@@ -68,9 +69,8 @@ files:
 - lib/pork/expect.rb
 - lib/pork/extra/rainbows.rb
 - lib/pork/extra/show_source.rb
-- lib/pork/imp.rb
 - lib/pork/inspect.rb
-- lib/pork/isolate.rb
+- lib/pork/isolator.rb
 - lib/pork/mode/parallel.rb
 - lib/pork/mode/sequential.rb
 - lib/pork/mode/shuffled.rb
@@ -82,25 +82,31 @@ files:
 - lib/pork/report/description.rb
 - lib/pork/report/dot.rb
 - lib/pork/report/progressbar.rb
+- lib/pork/runner.rb
 - lib/pork/stat.rb
+- lib/pork/suite.rb
 - lib/pork/test.rb
 - lib/pork/version.rb
 - pork.gemspec
 - task/README.md
 - task/gemgem.rb
+- test/test_around.rb
 - test/test_bacon.rb
 - test/test_expect.rb
 - test/test_inspect.rb
+- test/test_isolator.rb
+- test/test_meta.rb
 - test/test_nested.rb
 - test/test_pork_test.rb
 - test/test_readme.rb
 - test/test_should.rb
 - test/test_stat.rb
+- test/test_suite.rb
 homepage: https://github.com/godfat/pork
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,17 +121,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.1
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Pork -- Simple and clean and modular testing library.
 test_files:
+- test/test_around.rb
 - test/test_bacon.rb
 - test/test_expect.rb
 - test/test_inspect.rb
+- test/test_isolator.rb
+- test/test_meta.rb
 - test/test_nested.rb
 - test/test_pork_test.rb
 - test/test_readme.rb
 - test/test_should.rb
 - test/test_stat.rb
+- test/test_suite.rb

data/.travis.yml

@@ -1,15 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - rbx
-  - jruby-9
-
-before_install:
-  - rvm get head
-  - rvm reload
-  - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
-install: 'gem install bundler; bundle install --retry=3'
-script: 'ruby -r bundler/setup -S rake test'

data/lib/pork/imp.rb

@@ -1,88 +0,0 @@
-
-require 'pork/env'
-require 'pork/stat'
-require 'pork/error'
-require 'pork/expect'
-
-module Pork
-  module Imp
-    attr_reader :desc, :tests
-
-    def before &block; @tests << [:before, block]; end
-    def after  &block; @tests << [:after , block]; end
-
-    def copy  desc=:default, &suite
-      @stash[desc] = suite
-    end
-    def paste desc=:default, *args
-      module_exec(*args, &search_stash(desc))
-    end
-
-    def describe desc=:default, opts={}, &suite
-      executor = Class.new(self){ init("#{desc}: ") }
-      executor.module_eval(&suite)
-      @tests << [:describe, executor, suite || lambda{}, opts]
-    end
-
-    def would desc=:default, opts={}, &test
-      @tests << [:would   , desc    , test  || lambda{}, opts]
-    end
-
-    def execute mode, *args
-      require "pork/mode/#{mode}"
-      public_send(mode, *args)
-    end
-
-    private
-    def init desc=''
-      @desc, @tests, @stash = desc, [], {}
-      @super_executor = ancestors[1..-1].find{ |a| a <= Executor }
-    end
-
-    def run stat, desc, test, env
-      assertions = stat.assertions
-      context = new(stat, desc)
-      seed = Pork.reseed
-      stat.reporter.case_start(context)
-      run_protected(stat, desc, test, seed) do
-        env.run_before(context)
-        context.instance_eval(&test)
-        raise Error.new('Missing assertions') if assertions == stat.assertions
-        stat.reporter.case_pass
-      end
-    ensure
-      stat.incr_tests
-      run_protected(stat, desc, test, seed){ env.run_after(context) }
-      stat.reporter.case_end
-    end
-
-    def run_protected stat, desc, test, seed
-      yield
-    rescue *stat.protected_exceptions => e
-      case e
-      when Skip
-        stat.incr_skips
-        stat.reporter.case_skip
-      else
-        err = [e, description_for("would #{desc}"), test, seed]
-        case e
-        when Failure
-          stat.add_failure(err)
-          stat.reporter.case_failed
-        else
-          stat.add_error(err)
-          stat.reporter.case_errored
-        end
-      end
-    end
-
-    protected
-    def search_stash desc
-      @stash[desc] or @super_executor && @super_executor.search_stash(desc)
-    end
-
-    def description_for name=''
-      "#{@super_executor && @super_executor.description_for}#{@desc}#{name}"
-    end
-  end
-end