Root group builder should not inherit from nested

src/spectator/dsl/builder.cr

@@ -2,7 +2,7 @@ module Spectator::DSL
   module Builder
     extend self
 
-    @@group_stack = Array(NestedExampleGroupBuilder).new(1, root_group)
+    @@group_stack = Array(ExampleGroupBuilder).new(1, root_group)
 
     private class_getter root_group = RootExampleGroupBuilder.new()
 

src/spectator/dsl/example_group_builder.cr

@@ -0,0 +1,46 @@
+module Spectator::DSL
+  abstract class ExampleGroupBuilder
+    alias Child = ExampleFactory | NestedExampleGroupBuilder
+
+    @children = [] of Child
+    @before_all_hooks = [] of ->
+    @before_each_hooks = [] of ->
+    @after_all_hooks = [] of ->
+    @after_each_hooks = [] of ->
+    @around_each_hooks = [] of Proc(Nil) ->
+
+    def add_child(child : Child)
+      @children << child
+    end
+
+    def add_before_all_hook(block : ->) : Nil
+      @before_all_hooks << block
+    end
+
+    def add_before_each_hook(block : ->) : Nil
+      @before_each_hooks << block
+    end
+
+    def add_after_all_hook(block : ->) : Nil
+      @after_all_hooks << block
+    end
+
+    def add_after_each_hook(block : ->) : Nil
+      @after_each_hooks << block
+    end
+
+    def add_around_each_hook(block : Proc(Nil) ->) : Nil
+      @around_each_hooks << block
+    end
+
+    private def build_hooks
+      ExampleHooks.new(
+        @before_all_hooks,
+        @before_each_hooks,
+        @after_all_hooks,
+        @after_each_hooks,
+        @around_each_hooks
+      )
+    end
+  end
+end

src/spectator/dsl/nested_example_group_builder.cr

@@ -1,14 +1,5 @@
 module Spectator::DSL
-  class NestedExampleGroupBuilder
+  class NestedExampleGroupBuilder < ExampleGroupBuilder
-    alias Child = ExampleFactory | NestedExampleGroupBuilder
-
-    @children = [] of Child
-    @before_all_hooks = [] of ->
-    @before_each_hooks = [] of ->
-    @after_all_hooks = [] of ->
-    @after_each_hooks = [] of ->
-    @around_each_hooks = [] of Proc(Nil) ->
-
     def initialize(@what : String)
     end
 
@@ -16,42 +7,12 @@ module Spectator::DSL
       @children << child
     end
 
-    def add_before_all_hook(block : ->) : Nil
+    def build(parent : ExampleGroup, sample_values : Internals::SampleValues) : NestedExampleGroup
-      @before_all_hooks << block
-    end
-
-    def add_before_each_hook(block : ->) : Nil
-      @before_each_hooks << block
-    end
-
-    def add_after_all_hook(block : ->) : Nil
-      @after_all_hooks << block
-    end
-
-    def add_after_each_hook(block : ->) : Nil
-      @after_each_hooks << block
-    end
-
-    def add_around_each_hook(block : Proc(Nil) ->) : Nil
-      @around_each_hooks << block
-    end
-
-    def build(parent : ExampleGroup, sample_values : Internals::SampleValues) : ExampleGroup
       NestedExampleGroup.new(@what, parent, build_hooks).tap do |group|
         group.children = @children.map do |child|
           child.build(group, sample_values).as(ExampleComponent)
         end
       end
     end
-
-    private def build_hooks
-      ExampleHooks.new(
-        @before_all_hooks,
-        @before_each_hooks,
-        @after_all_hooks,
-        @after_each_hooks,
-        @around_each_hooks
-      )
-    end
   end
 end

src/spectator/dsl/root_example_group_builder.cr

@@ -1,9 +1,5 @@
 module Spectator::DSL
-  class RootExampleGroupBuilder < NestedExampleGroupBuilder
+  class RootExampleGroupBuilder < ExampleGroupBuilder
-    def initialize
-      super("ROOT")
-    end
-
     def build(sample_values : Internals::SampleValues) : RootExampleGroup
       RootExampleGroup.new(build_hooks).tap do |group|
         group.children = @children.map do |child|