changed api for running multiple steps

fesor · Nov 6, 2015 · afe3f71 · afe3f71
1 parent 8d3c76e
commit afe3f71
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 32 deletions.
diff --git a/src/Controller/SteplerController.php b/src/Controller/SteplerController.php
@@ -48,11 +48,13 @@ public function configure(SymfonyCommand $command)
     {
         $command
             ->addOption(
-                '--run-step', null, InputOption::VALUE_REQUIRED,
-                'Run single step'
+                '--run-steps',
+                null,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Run steps'
             )
             ->addOption(
-                '--return-step-results', null, InputOption::VALUE_NONE,
+                '--return-steps-results', null, InputOption::VALUE_NONE,
                 'Returns results of step execution'
             );
     }
@@ -62,43 +64,44 @@ public function configure(SymfonyCommand $command)
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        if (null === $step = $input->getOption('run-step')) {
+        $steps = $input->getOption('run-steps');
+        if (empty($steps) || !is_array($steps)) {
             return null;
         }
-        
+
         // try to find correct suite
-        $result = $this->stepRunner->run($step, $this->findSuite());
+        $result = $this->stepRunner->run($steps, $this->findSuite());
         if (!$result->isPassed()) {
-            $output->writeln('<error>Step not passed</error>');
-            
+            $output->writeln('<error>Steps not passed</error>');
+
             return 1;
         }
 
-        if ($input->getOption('return-step-results')) {
+        if ($input->getOption('return-steps-results')) {
             $output->writeln(json_encode($result->getCallResult()->getReturn()));
         } else {
-            $output->writeln('<info>Step passed</info>');
+            $output->writeln('<info>Steps passed</info>');
         }
 
         return 0;
     }
-    
+
     private function findSuite()
     {
         $suites = $this->suiteRepository->getSuites();
-        
+
         if (count($suites) > 0 && null === $this->suite) {
             return $suites[0];
         }
-        
+
         foreach ($suites as $suite) {
             if ($this->suite === $suite->getName()) {
                 return $suite;
             }
         }
-        
+
         throw new \RuntimeException(sprintf('Suite %s not found', $this->suite));
     }
 
 
-}
+}
diff --git a/src/Generator/DummyFeatureGenerator.php b/src/Generator/DummyFeatureGenerator.php
@@ -19,21 +19,27 @@ public function __construct(Parser $parser)
     }
 
 
-    public function generate($rawStep)
+    public function generate($steps)
     {
-        $feature = $this->generateFeatureForStep($rawStep);
+        $feature = $this->generateFeatureForSteps($steps);
         $featureNode = $this->parser->parse($feature);
-        
+
         return new DummyFeatureNode($featureNode);
     }
-    
-    private function generateFeatureForStep($rawStep)
+
+    private function generateFeatureForSteps($steps)
     {
         return implode("\n", [
             'Feature: dummy',
             'Scenario: dummy',
-            sprintf('Given %s', $rawStep)
+            $this->generateRawSteps($steps)
         ]);
     }
-
-}
+
+    private function generateRawSteps($steps)
+    {
+        return implode("\n", array_map(function($step) {
+            return sprintf('Given %s', $step);
+        }, $steps));
+    }
+}
diff --git a/src/Runner/StepRunner.php b/src/Runner/StepRunner.php
@@ -30,8 +30,8 @@ final class StepRunner
      * @param DummyFeatureGenerator $generator
      */
     public function __construct(
-        StepTester $stepTester, 
-        EnvironmentManager $environmentManager, 
+        StepTester $stepTester,
+        EnvironmentManager $environmentManager,
         DummyFeatureGenerator $generator
     ) {
         $this->stepTester = $stepTester;
@@ -40,25 +40,25 @@ public function __construct(
     }
 
     /**
-     * @param $step
+     * @param array $steps
      * @param Suite $suite
      * @return \Behat\Behat\Tester\Result\StepResult
      */
-    public function run($step, Suite $suite)
+    public function run($steps, Suite $suite)
     {
         $env = $this->environmentManager->buildEnvironment($suite);
         $env = $this->environmentManager->isolateEnvironment($env);
 
-        $dummyFeatureNode = $this->generator->generate($step);
-        
+        $dummyFeatureNode = $this->generator->generate($steps);
+
         $featureNode = $dummyFeatureNode->getFeatureNode();
         $stepNode = $dummyFeatureNode->getStepNode();
 
         $this->stepTester->setUp($env, $featureNode, $stepNode, false);
         $result = $this->stepTester->test($env, $featureNode, $stepNode, false);
         $this->stepTester->tearDown($env, $featureNode, $stepNode, false, $result);
-        
+
         return $result;
     }
-    
-}
+
+}