Merge branch 'MQE-659-alex-edition' of github.com:magento/magento2-functional-testing-framework into MQE-1234-alex-edition

Author: okolesnyk

src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php

@@ -115,6 +115,7 @@ private function sanitizeGroupName($group)
      * Override of parent method:
      *     prevent replacing of . to •
      *     strips control characters
+     *     inserts stepKey into step name
      *
      * @param StepEvent $stepEvent
      * @return void
@@ -207,7 +208,7 @@ public function testEnd()
                 $step->setName(str_replace(ActionGroupObject::ACTION_GROUP_CONTEXT_START, '', $step->getName()));
                 $actionGroupStepContainer = $step;
 
-                preg_match('/\[(?<actionGroupStepKey>.*)\]/', $step->getName(), $matches);
+                preg_match(TestGenerator::ACTION_GROUP_STEP_KEY_REGEX, $step->getName(), $matches);
                 if (!empty($matches['actionGroupStepKey'])) {
                     $actionGroupStepKey = ucfirst($matches['actionGroupStepKey']);
                 }
@@ -266,7 +267,7 @@ private function retrieveStepKey($stepLine)
             $this->testFiles[$filePath] = explode(PHP_EOL, file_get_contents($filePath));
         }
 
-        preg_match("/\/\/ stepKey: (?<stepKey>.*)/", $this->testFiles[$filePath][$stepLine], $matches);
+        preg_match(TestGenerator::ACTION_STEP_KEY_REGEX, $this->testFiles[$filePath][$stepLine], $matches);
         if (!empty($matches['stepKey'])) {
             $stepKey = $matches['stepKey'];
         }

src/Magento/FunctionalTestingFramework/Codeception/Subscriber/Console.php

@@ -12,6 +12,7 @@
 use Codeception\Step\Comment;
 use Codeception\Test\Interfaces\ScenarioDriven;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionGroupObject;
+use Magento\FunctionalTestingFramework\Util\TestGenerator;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 
 class Console extends \Codeception\Subscriber\Console
@@ -85,7 +86,7 @@ private function printStepKeys(Step $step)
 
         $isActionGroup = (strpos($step->__toString(), ActionGroupObject::ACTION_GROUP_CONTEXT_START) !== false);
         if ($isActionGroup) {
-            preg_match('/\[(?<actionGroupStepKey>.*)\]/', $step->__toString(), $matches);
+            preg_match(TestGenerator::ACTION_GROUP_STEP_KEY_REGEX, $step->__toString(), $matches);
             if (!empty($matches['actionGroupStepKey'])) {
                 $this->actionGroupStepKey = ucfirst($matches['actionGroupStepKey']);
             }
@@ -152,7 +153,7 @@ private function retrieveStepKey($stepLine)
             $this->testFiles[$filePath] = explode(PHP_EOL, file_get_contents($filePath));
         }
 
-        preg_match("/\/\/ stepKey: (?<stepKey>.*)/", $this->testFiles[$filePath][$stepLine], $matches);
+        preg_match(TestGenerator::ACTION_STEP_KEY_REGEX, $this->testFiles[$filePath][$stepLine], $matches);
         if (!empty($matches['stepKey'])) {
             $stepKey = $matches['stepKey'];
         }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -31,6 +31,8 @@
  */
 class TestGenerator
 {
+    const ACTION_GROUP_STEP_KEY_REGEX = "/\[(?<actionGroupStepKey>.*)\]/";
+    const ACTION_STEP_KEY_REGEX = "/\/\/ stepKey: (?<stepKey>.*)/";
     const REQUIRED_ENTITY_REFERENCE = 'createDataKey';
     const GENERATED_DIR = '_generated';
     const DEFAULT_DIR = 'default';