test_bench-fixture 1.1.0.0 → 1.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5425757a0a1df7ff324c56ee6ed9386bf44505bb15988c5f9c361c2176c20b
-  data.tar.gz: '08372dfda8292c5af8dd73dd25fcc0b6beee852b8622851a6669bbdb48d90309'
+  metadata.gz: 25ed7c441f8a38313a029f48a268840e7ae74715ed1f1ef0a1ea6fbd0ba240f4
+  data.tar.gz: ea2a1c7371ab289c3c9ed010e5b8d0c3306d925dec0915754111440b6fef93a1
 SHA512:
-  metadata.gz: 86bcd8feb376f3a59ee4155d7083a62e4c059ed4622a29b1b367b154b9458c7167a3dc1e3bfd0c46e00a7570269b366b6a367a1d334697e15fc5ddcb859e9838
-  data.tar.gz: '099fc04bf6ee10c305c3a10efe4e281cb0cebf283fdb14aa6740125215f9e8381b3003bd9b42a33b1815f22b442f692ddaca5bc2c827266248e8043742da8793'
+  metadata.gz: fcefd55166731aca176114c3261ba2fac9f7100d8899cb9b46e444c42a671bb1900744209dc2e44ce776d4da922a6d6ed9a6bfb28beb4d2574ae4a437185ebcd
+  data.tar.gz: cf4b521d231e475e57348ee4b9c832c2b0c35cd0e73212e676345d1de041911c4b45298bb64f624ee05d682a27fc7444e2c90cb7ff905e7cc93e36bd690adb25

data/lib/test_bench/fixture.rb

@@ -6,13 +6,14 @@ require 'test_bench/fixture/assertion_failure'
 require 'test_bench/fixture/output'
 require 'test_bench/fixture/output/null'
 require 'test_bench/fixture/output/log'
+require 'test_bench/fixture/output/capture'
 require 'test_bench/fixture/output/substitute'
+require 'test_bench/fixture/output/substitute/scope'
 require 'test_bench/fixture/output/multiple'
 
 require 'test_bench/fixture/error_policy'
 
 require 'test_bench/fixture/session'
 require 'test_bench/fixture/session/substitute'
-require 'test_bench/fixture/session/substitute/match_tests'
 
 require 'test_bench/fixture/fixture'

data/lib/test_bench/fixture/controls.rb

@@ -8,3 +8,4 @@ require 'test_bench/fixture/controls/result'
 require 'test_bench/fixture/controls/test_file'
 
 require 'test_bench/fixture/controls/output'
+require 'test_bench/fixture/controls/output/log'

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

@@ -34,27 +34,27 @@ module TestBench
             caller_location = Controls::CallerLocation.example
             error = Controls::Error.example
             comment_text = 'Some comment'
+            detail_text = 'Some detail'
             test_title = 'Some test'
             context_title = 'Some Context'
 
             {
               :start => [],
-              :finish => [result],
               :enter_file => [path],
               :exit_file => [path, result],
               :start_fixture => [fixture],
               :finish_fixture => [fixture, result],
               :assert => [result, caller_location],
-              :enter_assert_block => [caller_location],
-              :exit_assert_block => [caller_location, result],
               :comment => [comment_text],
+              :detail => [detail_text],
               :error => [error],
               :start_test => [test_title],
               :finish_test => [test_title, result],
               :skip_test => [test_title],
               :enter_context => [context_title],
               :exit_context => [context_title, result],
-              :skip_context => [context_title]
+              :skip_context => [context_title],
+              :finish => [result]
             }.each(&block)
           end
         end

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

@@ -0,0 +1,45 @@
+module TestBench
+  module Fixture
+    module Controls
+      module Output
+        module Log
+          module Level
+            def self.example
+              fatal
+            end
+
+            def self.unknown
+              :unknown
+            end
+
+            def self.fatal
+              :fatal
+            end
+
+            def self.error
+              :error
+            end
+
+            def self.warning
+              :warning
+            end
+
+            def self.info
+              :info
+            end
+
+            def self.debug
+              :debug
+            end
+
+            module Invalid
+              def self.example
+                :not_a_log_level
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/test_bench/fixture/fixture.rb

@@ -3,6 +3,8 @@ module TestBench
     Error = Class.new(RuntimeError)
 
     def self.build(cls, *args, session: nil, output: nil, error_policy: nil, factory_method: nil, **kwargs, &block)
+      assure_fixture(cls)
+
       factory_method = factory_method(cls)
 
       if kwargs.empty?
@@ -16,6 +18,12 @@ module TestBench
       instance
     end
 
+    def self.assure_fixture(cls)
+      unless cls.included_modules.include?(self)
+        raise Error, "Not a fixture class (Class: #{cls.inspect})"
+      end
+    end
+
     def self.factory_method(cls)
       if cls.respond_to?(:build)
         cls.method(:build)
@@ -54,19 +62,14 @@ module TestBench
       test_session.comment(text)
     end
 
-    ArgumentOmitted = Object.new
-    def assert(value=ArgumentOmitted, caller_location: nil, &block)
-      caller_location ||= caller_locations.first
+    def detail(text)
+      test_session.detail(text)
+    end
 
-      unless value == ArgumentOmitted
-        unless block.nil?
-          raise ArgumentError, "Must supply a boolean value or a block (but not both)"
-        end
+    def assert(value, caller_location: nil)
+      caller_location ||= caller_locations.first
 
-        test_session.assert(value, caller_location: caller_location)
-      else
-        test_session.assert_block(caller_location: caller_location, &block)
-      end
+      test_session.assert(value, caller_location: caller_location)
     end
 
     def refute(value, caller_location: nil)
@@ -85,24 +88,30 @@ module TestBench
 
       caller_location ||= caller_locations.first
 
-      assert(caller_location: caller_location) do
-        comment "Expected Error: #{error_class}#{' (strict)' if strict}"
-        comment "Expected Message: #{message.inspect}" unless message.nil?
+      detail "Expected Error: #{error_class}#{' (strict)' if strict}"
+      detail "Expected Message: #{message.inspect}" unless message.nil?
+
+      block.()
 
-        block.()
+      detail "(No error was raised)"
 
-        comment "(No error was raised)"
+      assert(false, caller_location: caller_location)
 
-      rescue error_class => error
+    rescue error_class => error
 
-        comment "Raised error: #{error.inspect}#{" (subclass of #{error_class})" if error.class < error_class}"
+      detail "Raised error: #{error.inspect}#{" (subclass of #{error_class})" if error.class < error_class}"
 
-        if strict && !error.instance_of?(error_class)
-          raise error
-        end
+      if strict && !error.instance_of?(error_class)
+        raise error
+      end
 
-        assert(message.nil? || error.message == message)
+      if message.nil?
+        result = true
+      else
+        result = error.message == message
       end
+
+      assert(result, caller_location: caller_location)
     end
 
     def refute_raises(error_class=nil, strict: nil, caller_location: nil, &block)
@@ -115,22 +124,27 @@ module TestBench
 
       caller_location ||= caller_locations.first
 
-      assert(caller_location: caller_location) do
-        comment "Prohibited Error: #{error_class}#{' (strict)' if strict}"
+      detail "Prohibited Error: #{error_class}#{' (strict)' if strict}"
+
+      block.()
 
-        block.()
+      detail "(No error was raised)"
 
-        comment "(No error was raised)"
+      result = true
 
-        assert(true)
+    rescue error_class => error
 
-      rescue error_class => error
+      detail "Raised Error: #{error.inspect}"
+
+      if strict && !error.instance_of?(error_class)
+        raise error
+      end
 
-        comment "Raised Error: #{error.inspect}"
+      result = false
 
-        if strict && !error.instance_of?(error_class)
-          raise error
-        end
+    ensure
+      unless result.nil?
+        assert(result, caller_location: caller_location)
       end
     end
 

data/lib/test_bench/fixture/output.rb

@@ -1,6 +1,10 @@
 module TestBench
   module Fixture
     module Output
+      def self.signals
+        instance_methods(false)
+      end
+
       def start
       end
 
@@ -22,13 +26,10 @@ module TestBench
       def assert(result, caller_location)
       end
 
-      def enter_assert_block(caller_location)
-      end
-
-      def exit_assert_block(result, caller_location)
+      def comment(text)
       end
 
-      def comment(text)
+      def detail(text)
       end
 
       def error(error)

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

@@ -0,0 +1,113 @@
+module TestBench
+  module Fixture
+    module Output
+      class Capture
+        include Fixture::Output
+
+        def records
+          @records ||= []
+        end
+
+        def current_context
+          @current_context ||= []
+        end
+
+        def start
+          record(:start)
+        end
+
+        def finish(result)
+          record(:finish, result)
+        end
+
+        def enter_file(path)
+          record(:enter_file, path)
+        end
+
+        def exit_file(path, result)
+          record(:exit_file, path, result)
+        end
+
+        def start_fixture(fixture)
+          record(:start_fixture, fixture)
+        end
+
+        def finish_fixture(fixture, result)
+          record(:finish_fixture, fixture, result)
+        end
+
+        def assert(result, caller_location)
+          record(:assert, result, caller_location)
+        end
+
+        def comment(text)
+          record(:comment, text)
+        end
+
+        def detail(text)
+          record(:detail, text)
+        end
+
+        def error(error)
+          record(:error, error)
+        end
+
+        def start_test(title)
+          record(:start_test, title)
+        end
+
+        def finish_test(title, result)
+          record(:finish_test, title, result)
+        end
+
+        def skip_test(title)
+          record(:skip_test, title)
+        end
+
+        def enter_context(title)
+          record = record(:enter_context, title)
+
+          unless title.nil?
+            current_context.push(title)
+          end
+
+          record
+        end
+
+        def exit_context(title, result)
+          unless title.nil?
+            current_context.pop
+          end
+
+          record(:exit_context, title, result)
+        end
+
+        def skip_context(title)
+          record(:skip_context, title)
+        end
+
+        def each_record(&block)
+          records.each(&block)
+        end
+
+        def record(signal, *data)
+          record = new_record(signal, data)
+          records << record
+          record
+        end
+
+        def new_record(signal, data)
+          context = current_context.dup
+
+          record = Record.new(signal, data, context)
+        end
+
+        Record = Struct.new(:signal, :data, :context) do
+          def forward(receiver)
+            receiver.public_send(signal, *data)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,28 +4,65 @@ module TestBench
       class Log
         include Output
 
+        Error = Class.new(RuntimeError)
+
         attr_reader :logger
 
         def initialize(logger)
           @logger = logger
         end
 
-        def self.build(device=nil)
+        def self.build(device=nil, level: nil)
           device ||= $stderr
+          level ||= self.default_level
+
+          level_ordinal = level_ordinal(level)
 
           logger = Logger.new(device)
+          logger.level = level_ordinal
 
           new(logger)
         end
 
-        def self.configure(receiver, device=nil, attr_name: nil)
+        def self.configure(receiver, device=nil, level: nil, attr_name: nil)
           attr_name ||= :output
 
-          instance = build(device)
+          instance = build(device, level: level)
           receiver.public_send(:"#{attr_name}=", instance)
           instance
         end
 
+        def self.default_level
+          :debug
+        end
+
+        def self.levels
+          level_ordinals.keys
+        end
+
+        def self.level_ordinal(level)
+          assure_level(level)
+
+          level_ordinals.fetch(level)
+        end
+
+        def self.level_ordinals
+          {
+            :unknown => Logger::Severity::UNKNOWN,
+            :fatal => Logger::Severity::FATAL,
+            :error => Logger::Severity::ERROR,
+            :warning => Logger::Severity::WARN,
+            :info => Logger::Severity::INFO,
+            :debug => Logger::Severity::DEBUG
+          }
+        end
+
+        def self.assure_level(level)
+          unless level_ordinals.key?(level)
+            raise Error, "Unknown log level #{level.inspect} (Valid levels: #{levels.map(&:inspect) * ', '})"
+          end
+        end
+
         def start
           logger.debug { "Start" }
         end
@@ -54,18 +91,14 @@ module TestBench
           logger.info { "Assertion (Result: #{result}, Caller Location: #{caller_location})" }
         end
 
-        def enter_assert_block(caller_location)
-          logger.debug { "Entering assert block (Caller Location: #{caller_location})" }
-        end
-
-        def exit_assert_block(caller_location, result)
-          logger.info { "Exited assert block (Caller Location: #{caller_location}, Result: #{result})" }
-        end
-
         def comment(text)
           logger.info { "Comment (Text: #{text})" }
         end
 
+        def detail(text)
+          logger.debug { "Detail (Text: #{text})" }
+        end
+
         def error(error)
           logger.error { "Error (Error: #{error})" }
         end

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

@@ -8,132 +8,105 @@ module TestBench
 
         MatchError = Class.new(RuntimeError)
 
-        class Output
-          include Fixture::Output
+        class Output < Capture
+          alias_method :raw_records, :records
 
-          def records
-            @records ||= []
-          end
-
-          def start
-            record(:start)
-          end
+          def scope(*contexts, &block)
+            records = records(*contexts, &block)
 
-          def finish(result)
-            record(:finish, result)
+            Scope.build(records)
           end
 
-          def enter_file(path)
-            record(:enter_file, path)
-          end
+          def recorded_once?(*contexts, &block)
+            record = one_record(*contexts, &block)
 
-          def exit_file(path, result)
-            record(:exit_file, path, result)
+            record ? true : false
           end
 
-          def start_fixture(fixture)
-            record(:start_fixture, fixture)
-          end
+          def recorded?(*contexts, &block)
+            records = match_records(*contexts, &block)
 
-          def finish_fixture(fixture, result)
-            record(:finish_fixture, fixture, result)
+            records.any?
           end
 
-          def assert(result, caller_location)
-            record(:assert, result, caller_location)
-          end
+          def one_record(*contexts, &block)
+            matching_records = match_records(*contexts, &block)
 
-          def enter_assert_block(caller_location)
-            record(:enter_assert_block, caller_location)
-          end
-
-          def exit_assert_block(caller_location, result)
-            record(:exit_assert_block, caller_location, result)
-          end
-
-          def comment(text)
-            record(:comment, text)
-          end
+            return if matching_records.empty?
 
-          def error(error)
-            record(:error, error)
-          end
+            unless matching_records.one?
+              raise MatchError, "More than one records match"
+            end
 
-          def start_test(title)
-            record(:start_test, title)
+            matching_records.shift
           end
 
-          def finish_test(title, result)
-            record(:finish_test, title, result)
-          end
+          def records(*contexts, &block)
+            if contexts.empty? && block.nil?
+              return raw_records
+            end
 
-          def skip_test(title)
-            record(:skip_test, title)
+            match_records(*contexts, &block)
           end
 
-          def enter_context(title)
-            record(:enter_context, title)
-          end
+          def match_records(*contexts, &block)
+            block ||= proc { true }
 
-          def exit_context(title, result)
-            record(:exit_context, title, result)
-          end
+            raw_records.select do |record|
+              context_iterator = record.context.to_enum
 
-          def skip_context(title)
-            record(:skip_context, title)
-          end
+              contexts_match = contexts.all? do |context|
+                until context_iterator.peek == context
+                  context_iterator.next
+                end
+                true
 
-          def record(signal, *data)
-            record = Record.new(signal, data)
-            records << record
-            record
-          end
+              rescue StopIteration
+                false
+              end
 
-          def replay_records(output)
-            records.each do |record|
-              output.public_send(record.signal, *record.data)
+              contexts_match &&
+                block.(record.signal, *record.data, record.context)
             end
           end
 
-          def recorded?(signal=nil, &block)
-            matching_records(signal, &block).any?
-          end
-
-          def recorded_once?(signal=nil, &block)
-            one_record(signal, &block) ? true : false
-          end
-
-          def one_record(signal=nil, &block)
-            matching_records = matching_records(signal, &block)
-
-            return if matching_records.empty?
-
-            unless matching_records.one?
-              raise MatchError, "More than one records match"
+          Fixture::Output.signals.each do |signal|
+            signal_records_method = :"#{signal}_records" # e.g. comment_records
+            define_method(signal_records_method) do |*contexts, &block|
+              match_records(*contexts) do |recorded_signal, *data|
+                if recorded_signal == signal
+                  block.nil? || block.(*data)
+                end
+              end
             end
 
-            matching_records.shift
-          end
-
-          def matching_records(signal=nil, &block)
-            unless signal.nil?
-              inner_block = block || proc { true }
+            one_signal_method = :"one_#{signal}_record" # e.g. one_comment_record
+            define_method(one_signal_method) do |*contexts, &block|
+              one_record(*contexts) do |recorded_signal, *data|
+                if recorded_signal == signal
+                  block.nil? || block.(*data)
+                end
+              end
+            end
 
-              block = proc { |sig, *data|
-                if sig == signal
-                  inner_block.(*data)
-                else
-                  false
+            signal_recorded_method = :"#{signal}_recorded?" # e.g. comment_recorded?
+            define_method(signal_recorded_method) do |*contexts, &block|
+              recorded?(*contexts) do |recorded_signal, *data|
+                if recorded_signal == signal
+                  block.nil? || block.(*data)
                 end
-              }
+              end
             end
 
-            records.select do |record|
-              block.(record.signal, *record.data)
+            signal_recorded_once_method = :"#{signal}_recorded_once?" # e.g. comment_recorded_once?
+            define_method(signal_recorded_once_method) do |*contexts, &block|
+              recorded_once?(*contexts) do |recorded_signal, *data|
+                if recorded_signal == signal
+                  block.nil? || block.(*data)
+                end
+              end
             end
           end
-
-          Record = Struct.new(:signal, :data)
         end
       end
     end

data/lib/test_bench/fixture/output/substitute/scope.rb

@@ -0,0 +1,26 @@
+module TestBench
+  module Fixture
+    module Output
+      module Substitute
+        class Output
+          class Scope < Output
+            attr_writer :records
+
+            def self.build(records)
+              instance = new
+              instance.records = records
+              instance
+            end
+
+            def combine(scope)
+              combined_records = self.records + scope.records
+
+              Scope.build(combined_records)
+            end
+            alias_method :+, :combine
+          end
+        end
+      end
+    end
+  end
+end

data/lib/test_bench/fixture/session.rb

@@ -95,6 +95,10 @@ module TestBench
         output.comment(text)
       end
 
+      def detail(text)
+        output.detail(text)
+      end
+
       def error(error)
         fail!
 
@@ -122,35 +126,6 @@ module TestBench
         result
       end
 
-      def assert_block(caller_location: nil, &block)
-        caller_location ||= caller_locations.first
-
-        previous_error_counter = self.error_counter
-        previous_assertion_counter = self.assertion_counter
-
-        output.enter_assert_block(caller_location)
-
-        begin
-          block.()
-
-        ensure
-          if self.error_counter > previous_error_counter
-            result = false
-          elsif self.assertion_counter == previous_assertion_counter
-            result = false
-          else
-            result = true
-          end
-
-          output.exit_assert_block(caller_location, result)
-
-          current_exception = $!
-          if current_exception.nil? || current_exception.instance_of?(AssertionFailure)
-            assert(result, caller_location: caller_location)
-          end
-        end
-      end
-
       def load(path)
         output.enter_file(path)
 
@@ -171,7 +146,17 @@ module TestBench
 
         output.start_test(title)
 
-        evaluate(block) do |result|
+        previous_assertion_counter = self.assertion_counter
+
+        action = proc {
+          block.()
+
+          unless assertion_counter > previous_assertion_counter
+            raise Error, "Test did not perform an assertion"
+          end
+        }
+
+        evaluate(action) do |result|
           output.finish_test(title, result)
         end
       end
@@ -235,6 +220,7 @@ module TestBench
       end
 
       def fail!
+        self.assertion_counter += 1
         self.error_counter += 1
       end
 

data/lib/test_bench/fixture/session/substitute.rb

@@ -7,115 +7,116 @@ module TestBench
         end
 
         class Session < Session
-          Error = Class.new(RuntimeError)
+          def scope(*contexts)
+            scoped_output = output.scope(*contexts)
 
-          attr_accessor :load_failure
+            scoped_session = self.class.new
+            scoped_session.output = scoped_output
+            scoped_session
+          end
+          alias_method :[], :scope
 
-          def commented?(text)
-            output.recorded?(:comment) do |t|
-              t == text
+          def context?(*outer_contexts, title)
+            output.exit_context_recorded_once?(*outer_contexts) do |t|
+              t == title
             end
           end
 
-          def asserted?(result=nil, caller_location: nil)
-            output.recorded?(:assert) do |r, cl|
-              (result.nil? || r == result) &&
-              (caller_location.nil? || cl == caller_location)
+          def one_test_passed?(*contexts, title)
+            one_test?(*contexts, title) do |_, result|
+              result == true
             end
           end
 
-          def load_failure!
-            self.load_failure = true
+          def one_test_failed?(*contexts, title)
+            one_test?(*contexts, title) do |_, result|
+              result == false
+            end
           end
 
-          def load(path)
-            result = load_failure ? false : true
-
-            output.enter_file(path)
+          def one_test?(*contexts, title, &block)
+            test_scope = test_scope(*contexts, title)
 
-            output.exit_file(path, result)
-
-            result
+            test_scope.finish_test_recorded_once?(&block)
           end
 
-          def loaded?(path)
-            output.recorded?(:exit_file) do |p|
-              p == path
+          def any_test_passed?(*contexts, title)
+            any_test?(*contexts, title) do |_, result|
+              result == true
             end
           end
+          alias_method :test_passed?, :any_test_passed?
 
-          def test?(title)
-            output.recorded?(:finish_test) do |t|
-              t == title
+          def any_test_failed?(*contexts, title)
+            any_test?(*contexts, title) do |_, result|
+              result == false
             end
           end
+          alias_method :test_failed?, :any_test_failed?
 
-          def context?(title)
-            output.recorded?(:exit_context) do |t|
-              t == title
-            end
-          end
+          def any_test?(*contexts, title, &block)
+            test_scope = test_scope(*contexts, title)
 
-          def fixture?(fixture)
-            output.recorded?(:finish_fixture) do |f|
-              f == fixture
-            end
+            test_scope.finish_test_recorded?(&block)
           end
+          alias_method :test?, :any_test?
 
-          def test_passed?(*titles)
-            !pass(*titles).nil?
+          def commented?(*contexts, text)
+            output.comment_recorded?(*contexts) do |t|
+              t == text
+            end
           end
 
-          def test_failed?(*titles)
-            !failure(*titles).nil?
+          def detail?(*contexts, text)
+            output.detail_recorded?(*contexts) do |t|
+              t == text
+            end
           end
 
-          def one_pass(*titles)
-            passes = passes(*titles)
+          def asserted?(*contexts, result: nil, caller_location: nil)
+            output.assert_recorded?(*contexts) do |r, cl|
+              result_match = result.nil? || r == result
+              caller_location_match = caller_location.nil? || cl == caller_location
 
-            if passes.count > 1
-              raise Error, "Multiple passing tests match (Titles: #{titles.inspect})"
+              result_match && caller_location_match
             end
-
-            passes.first
           end
 
-          def one_passed?(*titles)
-            one_pass(*titles) ? true : false
-          end
+          def load(path)
+            output.enter_file(path)
 
-          def pass(*titles)
-            passes(*titles).first
-          end
+            inert_action = proc { }
+            result = evaluate(inert_action)
 
-          def passes(*titles)
-            match_tests(*titles, result: true)
-          end
+            output.exit_file(path, result)
 
-          def one_failure(*titles)
-            failures = failures(*titles)
+            result
+          end
 
-            if failures.count > 1
-              raise Error, "Multiple failing tests match (Titles: #{titles.inspect})"
+          def loaded?(path=nil)
+            output.enter_file_recorded? do |p|
+              path.nil? || p == path
             end
-
-            failures.first
           end
 
-          def one_failed?(*titles)
-            one_failure(*titles) ? true : false
+          def fixture?(fixture)
+            output.finish_fixture_recorded? do |f|
+              f == fixture
+            end
           end
 
-          def failure(*titles)
-            failures(*titles).first
-          end
+          def test_scope(*contexts, title)
+            context_scope = output.scope(*contexts)
 
-          def failures(*titles)
-            match_tests(*titles, result: false)
-          end
+            titled_test_scope = context_scope.scope do |signal, t|
+              signal == :finish_test && t == title
+            end
+
+            untitled_test_scope = context_scope.scope(title) do |signal, t|
+              signal == :finish_test && t.nil?
+            end
 
-          def match_tests(*titles, result: nil)
-            MatchTests.(self, *titles, result: result)
+            titled_test_scope + untitled_test_scope
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_bench-fixture
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 1.2.0.0
 platform: ruby
 authors:
 - Nathan Ladd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench-bootstrap
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: nathanladd+github@gmail.com
 executables: []
 extensions: []
@@ -38,23 +38,25 @@ files:
 - lib/test_bench/fixture/controls/error/backtrace.rb
 - lib/test_bench/fixture/controls/fixture.rb
 - lib/test_bench/fixture/controls/output.rb
+- lib/test_bench/fixture/controls/output/log.rb
 - lib/test_bench/fixture/controls/result.rb
 - lib/test_bench/fixture/controls/test_file.rb
 - lib/test_bench/fixture/error_policy.rb
 - lib/test_bench/fixture/fixture.rb
 - lib/test_bench/fixture/output.rb
+- lib/test_bench/fixture/output/capture.rb
 - lib/test_bench/fixture/output/log.rb
 - lib/test_bench/fixture/output/multiple.rb
 - lib/test_bench/fixture/output/null.rb
 - lib/test_bench/fixture/output/substitute.rb
+- lib/test_bench/fixture/output/substitute/scope.rb
 - lib/test_bench/fixture/session.rb
 - lib/test_bench/fixture/session/substitute.rb
-- lib/test_bench/fixture/session/substitute/match_tests.rb
 homepage: https://github.com/test-bench/test-bench-fixture
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Test object framework
 test_files: []

data/lib/test_bench/fixture/session/substitute/match_tests.rb

@@ -1,131 +0,0 @@
-module TestBench
-  module Fixture
-    class Session
-      module Substitute
-        class MatchTests
-          include Output
-
-          attr_reader :output_substitute
-          attr_reader :patterns
-          attr_reader :result
-
-          def matches
-            @matches ||= []
-          end
-
-          def stack
-            @stack ||= []
-          end
-
-          def pattern_index
-            @pattern_index ||= 0
-          end
-          attr_writer :pattern_index
-
-          def initialize(output_substitute, result, *patterns)
-            @output_substitute = output_substitute
-            @result = result
-            @patterns = patterns
-          end
-
-          def self.build(run, *patterns, result: nil)
-            output_substitute = run.output
-
-            patterns.map! do |pattern|
-              if pattern.is_a?(String)
-                Regexp.new("\\A#{Regexp.escape(pattern)}\\z")
-              else
-                pattern
-              end
-            end
-
-            new(output_substitute, result, *patterns)
-          end
-
-          def self.call(run, *patterns, result: nil)
-            instance = build(run, *patterns, result: result)
-            instance.()
-          end
-
-          def call
-            output_substitute.replay_records(self)
-
-            matches
-          end
-
-          def enter_context(title)
-            push(title)
-          end
-
-          def exit_context(_, _)
-            pop
-          end
-
-          def finish_test(title, result)
-            push(title)
-
-            if match?(result)
-              text = stack.join("\t")
-
-              matches << text
-            end
-
-            pop unless title.nil?
-          end
-
-          def skip_test(title)
-            push(title)
-
-            pop
-          end
-
-          def push(title)
-            return if title.nil?
-
-            if next_pattern.match?(title)
-              self.pattern_index += 1
-            end
-
-            stack.push(title)
-          end
-
-          def pop
-            title = stack.pop
-
-            if previous_pattern.match?(title)
-              self.pattern_index -= 1
-            end
-          end
-
-          def match?(result)
-            return false unless pattern_index == patterns.count
-
-            if self.result.nil?
-              true
-            else
-              result == self.result
-            end
-          end
-
-          def next_pattern
-            return Pattern.none if pattern_index == patterns.count
-
-            patterns.fetch(pattern_index)
-          end
-
-          def previous_pattern
-            return Pattern.none if pattern_index.zero?
-
-            patterns[pattern_index - 1]
-          end
-
-          module Pattern
-            def self.none
-              %r{\z\A}
-            end
-          end
-        end
-      end
-    end
-  end
-end