test_bench-fixture 1.3.0.1 → 1.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439b3f623746bdb26d4d9e5a30ee5abd7283b829e04383c4240aa175ec4b07e7
-  data.tar.gz: 73abed890d2945a1854c54ac338b46ec846d8ba5b8c5bdd70d2f7f1a54110680
+  metadata.gz: 228f02c0300bbc34a7d8adda502101e505a550acfb0a7321cdfff0be432eded4
+  data.tar.gz: c80feb86b41fd7ecac31452405d04514d89a8e105227331f2613804638faac44
 SHA512:
-  metadata.gz: cd516904ef461a2fe872abdef28b9f5ced3cd8e8e68608d59f8e182a2c1a37ef27f36f365e7edbf5f7f1dea9b06a349fde016829648147c5d2f2414647a670a9
-  data.tar.gz: 4d07e52f97d8913db429c665d1dffa709174340086cc4827ab3be365ae984198b25d3c7e64112def9c9b961190d44d1fa039f0aa1d41d58bf78d7f584b14cf94
+  metadata.gz: 1fd22f150206d1052906667a11d57a092994045aedc31ef77e8fcdac5ef8af4fbd5873b30cf78754fc48d70118388812b76cfd0f42ed5ea8a0ca68f29c352606
+  data.tar.gz: 6b1c46c55223c1ff5fcd7beb25d058a3b2167c43fa13aef953a2b4d8f06f0f1f0aaac531edb0d5367a28c13dde318628130b63f41ebcf6e4281dd199ad3dc24c

data/lib/test_bench/fixture/fixture.rb

@@ -37,7 +37,11 @@ module TestBench
     def self.call(cls, *args, **kwargs, &block)
       factory_method = factory_method(cls)
 
-      last_parameter_type, _ = factory_method.parameters.last
+      if factory_method.name == :new
+        last_parameter_type, _ = cls.instance_method(:initialize).parameters.last
+      else
+        last_parameter_type, _ = factory_method.parameters.last
+      end
 
       if last_parameter_type == :block
         instance = build(cls, *args, **kwargs, &block)
@@ -58,12 +62,32 @@ module TestBench
     alias_method :session, :test_session
     alias_method :session=, :test_session=
 
-    def comment(text)
+    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)
+
+      additional_lines.each do |text|
+        test_session.comment(text)
+      end
     end
 
-    def detail(text)
+    def detail(text, *additional_lines)
       test_session.detail(text)
+
+      additional_lines.each do |text|
+        test_session.detail(text)
+      end
     end
 
     def assert(value, caller_location: nil)
@@ -95,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}"
@@ -112,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)
@@ -156,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
@@ -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.0.1
+  version: 1.4.0.1
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-09-20 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.2.22
 signing_key:
 specification_version: 4
 summary: Test object framework for Ruby and MRuby