lib/lopata/scenario.rb in lopata-0.1.29 vs lib/lopata/scenario.rb in lopata-0.1.30

@@ -66,10 +66,11 @@
     attr_reader :scenario, :current_step, :top, :title, :base_metadata
 
     def initialize(title, metadata = {})
       @title = title
       @base_metadata = metadata
+      @top = Lopata::GroupExecution.new(Lopata::TopStep.new(title, metadata: base_metadata), nil, steps: [])
       setup
     end
 
     # Provide a human-readable representation of this class
     def inspect
@@ -80,20 +81,22 @@
     def steps
       top.steps
     end
 
     def run
-      setup unless @scenario # for second run if need
+      unless @scenario # for second run if need
+        setup
+        top.reset_status
+      end
       world.notify_observers(:scenario_started, self)
       run_step(top)
       world.notify_observers(:scenario_finished, self)
       cleanup
     end
 
     def setup
       @scenario = Lopata::Scenario.new(self)
-      @top = Lopata::GroupExecution.new(Lopata::TopStep.new(title, metadata: base_metadata), nil, steps: [])
       @current_step = @top
     end
 
     def run_step(step)
       @current_step = step
@@ -162,10 +165,9 @@
       let_base.add_let_method(method_name, LetBangMethod.new(&block))
     end
 
     def cleanup
       @scenario = nil
-      @top = nil
       @current_step = nil
     end
   end
 
   # @private