More readable code

ZhangHanDong · Nov 18, 2008 · 2c6582c · 2c6582c
1 parent 276665d
commit 2c6582c
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/lib/cucumber/executor.rb b/lib/cucumber/executor.rb
@@ -97,11 +97,9 @@ def execute_scenario(scenario)
     end
 
     def accept_scenario?(scenario)
-      accept = true
-      accept &&= scenario_at_specified_line?(scenario)
-      accept &&= scenario.at_line?(@line) if @line
-      accept &&= scenario_has_specified_name?(scenario)
-      accept
+      scenario_at_specified_line?(scenario) &&
+      scenario_at_specified_line_old?(scenario) &&
+      scenario_has_specified_name?(scenario)
     end
 
     def accept_feature?(feature)
@@ -177,6 +175,14 @@ def scenario_at_specified_line?(scenario)
       end
     end
 
+    def scenario_at_specified_line_old?(scenario)
+      if @line
+        scenario.at_line?(@line)
+      else
+        true
+      end
+    end
+
     def scenario_has_specified_name?(scenario)
       if @scenario_names && !@scenario_names.empty?
         @scenario_names.include?(scenario.name)