From 37084af9f971aaa25f0af5bd2e959f64fc5eb0d3 Mon Sep 17 00:00:00 2001
From: Oriol Gual <oriol.gual@gmail.com>
Date: Sun, 12 Feb 2012 20:11:23 +0100
Subject: [PATCH] Don't use 'else' keyword

---
 lib/spinach/runner/scenario_runner.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/spinach/runner/scenario_runner.rb b/lib/spinach/runner/scenario_runner.rb
index 9dff8dbc..dad452fa 100644
--- a/lib/spinach/runner/scenario_runner.rb
+++ b/lib/spinach/runner/scenario_runner.rb
@@ -56,18 +56,22 @@ def run
 
       def run_scenario_steps
         steps.each do |step|
-          Spinach.hooks.run_before_step step
-          skip_or_run_step(step)
-          Spinach.hooks.run_after_step step
+          run_step_with_hooks(step)
         end
       end
 
-      def skip_or_run_step(step)
+      def run_step_with_hooks(step)
+        Spinach.hooks.run_before_step step
+        run_step(step) unless skip_step?(step)
+        Spinach.hooks.run_after_step step
+      end
+
+      def skip_step?(step)
         if @exception
           Spinach.hooks.run_on_skipped_step step
-        else
-          run_step(step)
+          return true
         end
+        return false
       end
 
       # Runs a particular step.