test_bench-fixture 1.3.1.1 → 1.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3be2a7cebd18fa06326859f2169a44e6a8974af8c32033669bbd95aacc827b
-  data.tar.gz: 36784decf899b9f0432da060ce1133d4e426a45830ce6adaf92c7c82e405f4d2
+  metadata.gz: cc001b82ac9ea1f454084cb5eae8d7d1d6a210e394da970c90ca1867aa0720da
+  data.tar.gz: 6e6b9d88655aac2b360a89e08325b07ea2837ec3a55acc0aa145e6700cd1d615
 SHA512:
-  metadata.gz: a9d28986ecc5bd4c76efd955b7dcc6923289dbe8430fa849ba20e5340805dead1f0a1f3ed7813dd403041fbf3decb2bd2dcd27d72e195a3690cdf84d4abf4eed
-  data.tar.gz: 8d52b899330892b3e021ce3c275dc51573ea6c02995c704bab40d5698da21a5e934ab42e1ea81afdeb14b213dd19e295e9061901a2d2201173050d1c6b1679be
+  metadata.gz: 1e9b30ca2c58bc2a113ad378111addff10e348a76115ce467479942c37a46fecad65571e6fff52d1392fbc64bb6173cf57da6e073a52e337a04af0a4df91a2a7
+  data.tar.gz: 51e9b333a51d131d5419bad17105e6b3cd71e660ae35823f627748a06f21a52416db220e14954d6ed7c87ef0a9cd5fab0163eee403789c16de2de802cb6ba413

data/lib/test_bench/fixture/fixture.rb

@@ -62,6 +62,18 @@ module TestBench
     alias_method :session, :test_session
     alias_method :session=, :test_session=
 
+    def inspect
+      original_test_session = test_session
+
+      self.test_session = "(not inspected; class is #{original_test_session.class})"
+
+      begin
+        super
+      ensure
+        self.test_session = original_test_session
+      end
+    end
+
     def comment(text, *additional_lines)
       test_session.comment(text)
 
@@ -107,8 +119,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 +134,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 +181,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
@@ -137,7 +127,8 @@ module TestBench
 
         result = false
 
-        Kernel.load(path)
+        source = File.read(path)
+        TOPLEVEL_BINDING.eval(source, path)
 
         result = true
 
@@ -148,19 +139,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 +166,7 @@ module TestBench
 
       def context(title=nil, &block)
         if block.nil?
+          record_skip
           output.skip_context(title)
           return
         end
@@ -209,18 +205,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 +229,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.2
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2022-05-09 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.3.4
 signing_key:
 specification_version: 4
 summary: Test object framework for Ruby and MRuby