test_bench-fixture 1.3.1.1 → 1.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3be2a7cebd18fa06326859f2169a44e6a8974af8c32033669bbd95aacc827b
-  data.tar.gz: 36784decf899b9f0432da060ce1133d4e426a45830ce6adaf92c7c82e405f4d2
+  metadata.gz: dd27a4edf7acf4edf1164412314db924454693e2f72f0e574bec02a58af093ae
+  data.tar.gz: bc3a36d8ad06b43cc579ef4f0f5b0c5f88218bc1a3d59619bf5de16a6b28f2d6
 SHA512:
-  metadata.gz: a9d28986ecc5bd4c76efd955b7dcc6923289dbe8430fa849ba20e5340805dead1f0a1f3ed7813dd403041fbf3decb2bd2dcd27d72e195a3690cdf84d4abf4eed
-  data.tar.gz: 8d52b899330892b3e021ce3c275dc51573ea6c02995c704bab40d5698da21a5e934ab42e1ea81afdeb14b213dd19e295e9061901a2d2201173050d1c6b1679be
+  metadata.gz: 582d6f3112ba646f6e0c44bd23e8a7a1edc2cd56cc0f7fe50fac7165e512be215dba275d44535042fd19fa03dfbc96d693a066802f3aab3c2e0e23a13a270a1d
+  data.tar.gz: 7a496e3c08dbb33f894d09609d735868c22904355fabb162a500b9cd8aa3ad566a652758e15187de9fb5fca9a0ca1ce4fda9981cecd2e25a41da8e5ebdb22cd8

data/lib/test_bench/fixture/fixture.rb

@@ -107,8 +107,6 @@ module TestBench
 
       detail "(No error was raised)"
 
-      assert(false, caller_location: caller_location)
-
     rescue error_class => error
 
       detail "Raised error: #{error.inspect}#{" (subclass of #{error_class})" if error.class < error_class}"
@@ -124,6 +122,9 @@ module TestBench
       end
 
       assert(result, caller_location: caller_location)
+
+    else
+      assert(false, caller_location: caller_location)
     end
 
     def refute_raises(error_class=nil, strict: nil, caller_location: nil, &block)
@@ -168,6 +169,16 @@ module TestBench
       test_session.test(text, &block)
     end
 
+    def test!(text=nil, &block)
+      result = test(text, &block)
+
+      unless result
+        raise Session::Abort.new, "Context aborted"
+      end
+
+      result
+    end
+
     def fixture(cls, *args, **kwargs, &block)
       Fixture.(cls, *args, session: test_session, **kwargs, &block)
     end

data/lib/test_bench/fixture/session.rb

@@ -2,22 +2,22 @@ module TestBench
   module Fixture
     class Session
       Error = Class.new(RuntimeError)
+      Abort = Class.new(RuntimeError)
 
       def assertion_counter
         @assertion_counter ||= 0
       end
       attr_writer :assertion_counter
 
-      def error_counter
-        @error_counter ||= 0
+      def failure_counter
+        @failure_counter ||= 0
       end
-      attr_writer :error_counter
+      attr_writer :failure_counter
 
-      def skip
-        @skip ||= false
+      def skip_counter
+        @skip_counter ||= 0
       end
-      attr_writer :skip
-      alias_method :skip?, :skip
+      attr_writer :skip_counter
 
       def started
         instance_variable_defined?(:@started) ?
@@ -36,7 +36,7 @@ module TestBench
       alias_method :finished?, :finished
 
       def error_policy
-        @error_policy ||= ErrorPolicy::Build.(:rescue_assert)
+        @error_policy ||= ErrorPolicy::RescueAssert.new
       end
       attr_writer :error_policy
 
@@ -105,14 +105,6 @@ module TestBench
         output.detail(text)
       end
 
-      def error(error)
-        fail!
-
-        output.error(error)
-
-        error_policy.(error)
-      end
-
       def assert(value, caller_location: nil)
         caller_location ||= caller[0]
 
@@ -123,8 +115,6 @@ module TestBench
         output.assert(result, caller_location)
 
         unless result
-          self.error_counter += 1
-
           assertion_failure = AssertionFailure.build(caller_location)
           raise assertion_failure
         end
@@ -148,19 +138,23 @@ module TestBench
 
       def test(title=nil, &block)
         if block.nil?
+          record_skip
           output.skip_test(title)
           return
         end
 
         output.start_test(title)
 
+        previous_failure_counter = self.failure_counter
         previous_assertion_counter = self.assertion_counter
 
-        action = proc {
+        action = ->{
           block.()
 
-          unless assertion_counter > previous_assertion_counter
-            raise Error, "Test did not perform an assertion"
+          if failure_counter == previous_failure_counter
+            if assertion_counter == previous_assertion_counter
+              raise Error, "Test did not perform an assertion"
+            end
           end
         }
 
@@ -171,6 +165,7 @@ module TestBench
 
       def context(title=nil, &block)
         if block.nil?
+          record_skip
           output.skip_context(title)
           return
         end
@@ -209,18 +204,23 @@ module TestBench
       end
 
       def evaluate(action, &block)
-        previous_error_counter = self.error_counter
+        previous_failure_counter = self.failure_counter
 
         begin
           action.()
 
+        rescue Abort
+
         rescue => error
-          error(error)
+          record_failure
+
+          output.error(error)
 
+          error_policy.(error)
           error = nil
 
         ensure
-          result = error_counter == previous_error_counter
+          result = failure_counter == previous_failure_counter
 
           block.(result, error) unless block.nil?
         end
@@ -228,17 +228,21 @@ module TestBench
         result
       end
 
-      def fail!
-        self.assertion_counter += 1
-        self.error_counter += 1
+      def record_failure
+        self.failure_counter += 1
       end
+      alias_method :fail!, :record_failure
 
       def failed?
-        error_counter.nonzero? ? true : false
+        failure_counter.nonzero? ? true : false
+      end
+
+      def record_skip
+        self.skip_counter += 1
       end
 
-      def skip!
-        self.skip = true
+      def skipped?
+        skip_counter.nonzero? ? true : false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_bench-fixture
 version: !ruby/object:Gem::Version
-  version: 1.3.1.1
+  version: 1.4.0.0
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench-bootstrap
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Test object framework for Ruby and MRuby