From 2c6582c204349117b490e6261b9fcd2f80b82728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aslak=20Helles=C3=B8y?= Date: Tue, 18 Nov 2008 12:28:49 +0100 Subject: [PATCH] More readable code --- lib/cucumber/executor.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/cucumber/executor.rb b/lib/cucumber/executor.rb index d017ef1394..82c66f7011 100644 --- 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)