Don't create test as part of run method

src/spectator/runnable_example.cr

@@ -25,7 +25,7 @@ module Spectator
       # Capture how long it takes to run the test code.
       result.elapsed = Time.measure do
         begin
-          test_wrapper.run {} # Actually run the example code.
+          test_wrapper.run # Actually run the example code.
         rescue ex # Catch all errors and handle them later.
           result.error = ex
         end

src/spectator/spec_builder.cr

@@ -45,8 +45,7 @@ module Spectator
     def add_example(description : String, source : Source,
       example_type : ::SpectatorTest.class, &runner : ::SpectatorTest ->) : Nil
       builder = ->{ example_type.new.as(::SpectatorTest) }
-      wrapper = TestWrapper.new(description, source, builder, runner)
+      factory = ExampleBuilder.new(description, source, builder, runner)
-      factory = ExampleBuilder.new(wrapper)
       @@stack.current.add_child(factory)
     end
 

src/spectator/spec_builder/example_builder.cr

@@ -1,10 +1,17 @@
+require "../../spectator_test"
+require "../test_wrapper"
+
 module Spectator::SpecBuilder
   class ExampleBuilder
-    def initialize(@wrapper : TestWrapper)
+    alias FactoryMethod = -> ::SpectatorTest
+
+    def initialize(@description : String, @source : Source, @builder : FactoryMethod, @runner : TestMethod)
     end
 
     def build(group)
-      RunnableExample.new(group, @wrapper).as(ExampleComponent)
+      test = @builder.call
+      wrapper = TestWrapper.new(@description, @source, test, @runner)
+      RunnableExample.new(group, wrapper).as(ExampleComponent)
     end
   end
 end

src/spectator/test_wrapper.cr

@@ -7,26 +7,22 @@ module Spectator
   # Stores information about a end-user test.
   # Used to instantiate tests and run them.
   struct TestWrapper
-    # Location of the test in source code.
-    getter source : Source
-
     # Description the user provided for the test.
-    getter description : String
+    getter description
+
+    # Location of the test in source code.
+    getter source
 
     # Creates a wrapper for the test.
-    # The *builder* creates an instance of the test.
+    def initialize(@description : String, @source : Source, @test : ::SpectatorTest, @runner : TestMethod)
-    # The *runner* takes the test created by *builder* and runs it.
-    def initialize(@description, @source, @builder : -> ::SpectatorTest, @runner : TestMethod)
     end
 
-    # Instantiates and runs the test.
+    def run
-    # This method yields twice - before and after the test.
+      call(@runner)
-    # The test instance is yielded.
+    end
-    def run : Nil
+
-      test = @builder.call
+    def call(method : TestMethod) : Nil
-      yield test
+      method.call(@test)
-      @runner.call(test)
-      yield test
     end
   end
 end