test_bench-fixture 1.2.2.2 → 1.3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a777ff52df4352c49326e6b394828cd64eed0abfdf54a0a677bff3f3958737
-  data.tar.gz: ccaa7603572eec663dcf2638b5345af7c245ed0aaf137cac124a24e800775910
+  metadata.gz: 1d3be2a7cebd18fa06326859f2169a44e6a8974af8c32033669bbd95aacc827b
+  data.tar.gz: 36784decf899b9f0432da060ce1133d4e426a45830ce6adaf92c7c82e405f4d2
 SHA512:
-  metadata.gz: 4694182ab91a9e75de0f6c69c59bd027842989f075bb0787b15be6e2b4a092d4405943e3c91e1b7f242d1575132f9e3a268544809c201f16f817230d266aacee
-  data.tar.gz: edc04eee7d348c8e2ea6216200e17eea95c6beee183ce45346542452bbce7f8da6a8dd06d87a4f3213825f7c44694fd43b5469ccdb698c141fd94ae1e11e9612
+  metadata.gz: a9d28986ecc5bd4c76efd955b7dcc6923289dbe8430fa849ba20e5340805dead1f0a1f3ed7813dd403041fbf3decb2bd2dcd27d72e195a3690cdf84d4abf4eed
+  data.tar.gz: 8d52b899330892b3e021ce3c275dc51573ea6c02995c704bab40d5698da21a5e934ab42e1ea81afdeb14b213dd19e295e9061901a2d2201173050d1c6b1679be

data/lib/test_bench/fixture.rb

@@ -1,5 +1,7 @@
-require 'logger'
-require 'stringio'
+unless RUBY_ENGINE == 'mruby'
+  require 'logger'
+  require 'stringio'
+end
 
 require 'test_bench/fixture/assertion_failure'
 

data/lib/test_bench/fixture/assertion_failure.rb

@@ -2,7 +2,7 @@ module TestBench
   module Fixture
     class AssertionFailure < RuntimeError
       def self.build(caller_location=nil)
-        caller_location ||= caller_locations.first
+        caller_location ||= caller[0]
 
         backtrace = [caller_location.to_s]
 

data/lib/test_bench/fixture/controls.rb

@@ -1,4 +1,6 @@
-require 'tempfile'
+unless RUBY_ENGINE == 'mruby'
+  require 'tempfile'
+end
 
 require 'test_bench/fixture/controls/caller_location'
 require 'test_bench/fixture/controls/error/backtrace'

data/lib/test_bench/fixture/controls/caller_location.rb

@@ -2,18 +2,12 @@ module TestBench
   module Fixture
     module Controls
       module CallerLocation
-        def self.example(file: nil, line_number: nil)
+        def self.example(file: nil, line_number: nil, label: nil)
           file ||= self.file
           line_number ||= self.line_number
+          label ||= self.label
 
-          eval(<<~RUBY, TOPLEVEL_BINDING, file, line_number - 2)
-          some_class = Class.new do
-            def self.some_method
-              Thread.current.backtrace_locations[1]
-            end
-          end
-          some_class.some_method
-          RUBY
+          "#{file}:#{line_number}:in `#{label}'"
         end
 
         def self.file
@@ -24,6 +18,10 @@ module TestBench
           11
         end
 
+        def self.label
+          'some_method'
+        end
+
         module Alternate
           def self.example(line_number: nil)
             line_number ||= self.line_number
@@ -38,12 +36,6 @@ module TestBench
           def self.line_number
             111
           end
-
-          module Pattern
-            def self.example
-              /other_dir/
-            end
-          end
         end
 
         Implementation = self
@@ -53,9 +45,7 @@ module TestBench
             file ||= self.file
             line_number ||= self.line_number
 
-            eval <<~RUBY, TOPLEVEL_BINDING, file, line_number
-            proc { Thread.current.backtrace_locations[1] }.call
-            RUBY
+            TOPLEVEL_BINDING.receiver.instance_eval 'proc { caller[0] }.call', file, line_number
           end
 
           def self.file
@@ -65,6 +55,10 @@ module TestBench
           def self.line_number
             22
           end
+
+          def self.label
+            'block in <main>'
+          end
         end
       end
     end

data/lib/test_bench/fixture/controls/test_file.rb

@@ -4,7 +4,8 @@ module TestBench
       module TestFile
         def self.example(filename: nil, text: nil, directory: nil)
           filename ||= self.filename
-          text ||= text
+          text ||= self.text
+          directory ||= self.directory
 
           basename, extension, _ = filename.partition('.rb')
 
@@ -29,6 +30,10 @@ module TestBench
           '# Nothing'
         end
 
+        def self.directory
+          '/tmp'
+        end
+
         def self.tempfiles
           @tempfiles ||= []
         end

data/lib/test_bench/fixture/error_policy.rb

@@ -24,7 +24,7 @@ module TestBench
           policies.fetch(policy) do
             *policies, final_policy = self.policies.keys
 
-            policy_list = "#{policies.map(&:inspect) * ', '} or #{final_policy.inspect}"
+            policy_list = "#{policies.map(&:inspect).join(', ')} or #{final_policy.inspect}"
 
             raise PolicyError, "Policy #{policy.inspect} is unknown. It must be one of: #{policy_list}"
           end

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,22 +62,30 @@ module TestBench
     alias_method :session, :test_session
     alias_method :session=, :test_session=
 
-    def comment(text)
+    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)
-      caller_location ||= caller_locations.first
+      caller_location ||= caller[0]
 
       test_session.assert(value, caller_location: caller_location)
     end
 
     def refute(value, caller_location: nil)
-      caller_location ||= caller_locations.first
+      caller_location ||= caller[0]
 
       test_session.assert(!value, caller_location: caller_location)
     end
@@ -86,7 +98,7 @@ module TestBench
         strict = true if strict.nil?
       end
 
-      caller_location ||= caller_locations.first
+      caller_location ||= caller[0]
 
       detail "Expected Error: #{error_class}#{' (strict)' if strict}"
       detail "Expected Message: #{message.inspect}" unless message.nil?
@@ -122,7 +134,7 @@ module TestBench
         strict = true if strict.nil?
       end
 
-      caller_location ||= caller_locations.first
+      caller_location ||= caller[0]
 
       detail "Prohibited Error: #{error_class}#{' (strict)' if strict}"
 

data/lib/test_bench/fixture/output/log.rb

@@ -59,7 +59,7 @@ module TestBench
 
         def self.assure_level(level)
           unless level_ordinals.key?(level)
-            raise Error, "Unknown log level #{level.inspect} (Valid levels: #{levels.map(&:inspect) * ', '})"
+            raise Error, "Unknown log level #{level.inspect} (Valid levels: #{levels.map(&:inspect).join(', ')})"
           end
         end
 

data/lib/test_bench/fixture/session.rb

@@ -114,7 +114,7 @@ module TestBench
       end
 
       def assert(value, caller_location: nil)
-        caller_location ||= caller_locations.first
+        caller_location ||= caller[0]
 
         result = value ? true : false
 
@@ -135,13 +135,15 @@ module TestBench
       def load(path)
         output.enter_file(path)
 
-        action = proc { Kernel.load(path) }
+        result = false
 
-        result = evaluate(action)
+        Kernel.load(path)
 
-        output.exit_file(path, result)
+        result = true
 
-        result
+      ensure
+
+        output.exit_file(path, result)
       end
 
       def test(title=nil, &block)
@@ -198,9 +200,10 @@ module TestBench
         output.start_fixture(fixture)
 
         action = proc { actions.each(&:call) }
-        result = evaluate(action)
 
-        output.finish_fixture(fixture, result)
+        result = evaluate(action) do |result|
+          output.finish_fixture(fixture, result)
+        end
 
         result
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_bench-fixture
 version: !ruby/object:Gem::Version
-  version: 1.2.2.2
+  version: 1.3.1.1
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench-bootstrap
@@ -74,5 +74,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Test object framework
+summary: Test object framework for Ruby and MRuby
 test_files: []