Merge branch 'develop' into CD-develop

okolesnyk · web-flow · commit 9fff8f2dc680 · 2018-03-29T22:00:04.000+03:00
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt
@@ -57,7 +57,6 @@ class ActionGroupWithDataOverrideTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt
@@ -57,7 +57,6 @@ class ActionGroupWithDataTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt
@@ -57,7 +57,6 @@ class ActionGroupWithNoDefaultTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt
@@ -57,7 +57,6 @@ class ActionGroupWithPersistedDataCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt
@@ -57,7 +57,6 @@ class ActionGroupWithTopLevelPersistedDataCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt
@@ -57,7 +57,6 @@ class ArgumentWithSameNameAsElementCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/BasicFunctionalTest.txt b/dev/tests/verification/Resources/BasicFunctionalTest.txt
@@ -46,7 +46,6 @@ class BasicFunctionalTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
@@ -60,6 +59,8 @@ class BasicFunctionalTestCest
 	 */
 	public function BasicFunctionalTest(AcceptanceTester $I)
 	{
+		$I->comment("");
+		$I->comment("");
 		$someVarDefinition = $I->grabValueFrom();
 		$I->acceptPopup();
 		$I->amOnPage("/test/url");
@@ -70,6 +71,8 @@ class BasicFunctionalTestCest
 		$I->click(".functionalTestSelector");
 		$I->clickWithLeftButton(".functionalTestSelector");
 		$I->clickWithRightButton(".functionalTestSelector");
+		$I->clickWithLeftButton("#element#element .200", 200, 300);
+		$I->clickWithRightButton("#element .4123#element", 200, 300);
 		$I->closeTab();
 		$I->conditionalClick(".functionalTestSelector", ".functionalDependentTestSelector", true);
 		$I->dontSee("someInput", ".functionalTestSelector");
diff --git a/dev/tests/verification/Resources/BasicMergeTest.txt b/dev/tests/verification/Resources/BasicMergeTest.txt
@@ -48,7 +48,6 @@ class BasicMergeTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/HookActionsTest.txt b/dev/tests/verification/Resources/HookActionsTest.txt
@@ -73,7 +73,6 @@ class HookActionsTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/MergedActionGroupTest.txt b/dev/tests/verification/Resources/MergedActionGroupTest.txt
@@ -57,7 +57,6 @@ class MergedActionGroupTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/MergedReferencesTest.txt b/dev/tests/verification/Resources/MergedReferencesTest.txt
@@ -46,7 +46,6 @@ class MergedReferencesTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt
@@ -57,7 +57,6 @@ class MultipleActionGroupsTestCest
 	public function _failed(AcceptanceTester $I)
 	{
 		$I->saveScreenshot();
-		$this->_after($I);
 	}
 
 	/**
diff --git a/dev/tests/verification/TestModule/Data/ReplacementData.xml b/dev/tests/verification/TestModule/Data/ReplacementData.xml
@@ -26,4 +26,12 @@
         <data key="sampleField2">moreData</data>
         <requiredEntity type="test2">originalValue2</requiredEntity>
     </entity>
+    <entity name="offset" type="simpleData">
+        <data key="x">200</data>
+        <data key="y">300</data>
+    </entity>
+    <entity name="emptyData" type="backend">
+        <data key="noData"></data>
+        <data key="definitelyNoData"/>
+    </entity>
 </entities>
diff --git a/dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml b/dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml
@@ -22,6 +22,8 @@
         <after>
             <amOnPage url="/afterUrl" stepKey="afterAmOnPageKey"/>
         </after>
+        <comment stepKey="basicCommentWithNoData" userInput="{{emptyData.noData}}"/>
+        <comment stepKey="basicCommentWithDefinitelyNoData" userInput="{{emptyData.definitelyNoData}}"/>
         <grabValueFrom stepKey="someVarDefinition"/>
         <acceptPopup stepKey="acceptPopupKey1"/>
         <amOnPage stepKey="amOnPageKey1" url="/test/url"/>
@@ -32,6 +34,8 @@
         <click selector=".functionalTestSelector" stepKey="clickKey1"/>
         <clickWithLeftButton selector=".functionalTestSelector" stepKey="clickWithLeftButtonKey1"/>
         <clickWithRightButton selector=".functionalTestSelector" stepKey="clickWithRightButtonKey1"/>
+        <clickWithLeftButton selector="{{SampleSection.simpleElement}}{{SampleSection.simpleElementOneParam(offset.x)}}" x="{{offset.x}}" y="{{offset.y}}" stepKey="clickWithLeftButtonKeyXY1" />
+        <clickWithRightButton selector="{{SampleSection.simpleElementOneParam('4123')}}{{SampleSection.simpleElement}}" x="{{offset.x}}" y="{{offset.y}}" stepKey="clickWithRightButtonKeyXY1" />
         <closeTab stepKey="closeTabKey1"/>
         <conditionalClick selector=".functionalTestSelector" dependentSelector=".functionalDependentTestSelector" visible="true" stepKey="conditionalClickKey1"/>
         <dontSee userInput="someInput" selector=".functionalTestSelector" stepKey="dontSeeKey1" />
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -206,7 +206,7 @@ private function resolveUrlReference($urlIn, $entityObjects)
                         EntityDataObject::CEST_UNIQUE_VALUE
                     );
                     if (null !== $param) {
-                        $urlOut = str_replace($paramValue, $param, $urlIn);
+                        $urlOut = str_replace($paramValue, $param, $urlOut);
                         continue;
                     }
                 }
diff --git a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\Extension;
+
+use \Codeception\Events;
+
+/**
+ * Class TestContextExtension
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ */
+class TestContextExtension extends \Codeception\Extension
+{
+    const TEST_PHASE_AFTER = "_after";
+
+    /**
+     * Codeception Events Mapping to methods
+     * @var array
+     */
+    public static $events = [
+        Events::TEST_FAIL => 'testFail',
+    ];
+
+    /**
+     * Codeception event listener function, triggered on test failure.
+     * @param \Codeception\Event\FailEvent $e
+     * @return void
+     */
+    public function testFail(\Codeception\Event\FailEvent $e)
+    {
+        $cest = $e->getTest();
+        $context = $this->extractContext($e->getFail()->getTrace(), $cest->getTestMethod());
+        // Do not attempt to run _after if failure was in the _after block
+        // Try to run _after but catch exceptions to prevent them from overwriting original failure.
+        if ($context != TestContextExtension::TEST_PHASE_AFTER) {
+            try {
+                $actorClass = $e->getTest()->getMetadata()->getCurrent('actor');
+                $I = new $actorClass($cest->getScenario());
+                call_user_func(\Closure::bind(
+                    function () use ($cest, $I) {
+                        $cest->executeHook($I, 'after');
+                    },
+                    null,
+                    $cest
+                ));
+            } catch (\Exception $e) {
+                // Do not rethrow Exception
+            }
+        }
+    }
+
+    /**
+     * Extracts hook method from trace, looking specifically for the cest class given.
+     * @param array $trace
+     * @param string $class
+     * @return string
+     */
+    public function extractContext($trace, $class)
+    {
+        foreach ($trace as $entry) {
+            $traceClass = $entry["class"] ?? null;
+            if (strpos($traceClass, $class) != 0) {
+                return $entry["function"];
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -20,7 +20,7 @@
 class ActionObject
 {
     const __ENV = "_ENV";
-    const DATA_ENABLED_ATTRIBUTES = ["userInput", "parameterArray", "expected", "actual"];
+    const DATA_ENABLED_ATTRIBUTES = ["userInput", "parameterArray", "expected", "actual", "x", "y"];
     const SELECTOR_ENABLED_ATTRIBUTES = [
         'selector',
         'dependentSelector',
@@ -40,8 +40,7 @@ class ActionObject
     const ACTION_ATTRIBUTE_URL = 'url';
     const ACTION_ATTRIBUTE_SELECTOR = 'selector';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w]+\.[\w\[\]]+}}/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS= '/{{[\w]+\.[\w]+\(.+\)}}/';
+    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\(.+\)}})/';
 
     /**
      * The unique identifier for the action
@@ -371,7 +370,7 @@ private function resolveDataInputReferences()
         foreach ($relevantDataAttributes as $dataAttribute) {
             $varInput = $this->actionAttributes[$dataAttribute];
             $replacement = $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $varInput);
-            if ($replacement != null) {
+            if ($replacement !== null) {
                 $this->resolvedCustomAttributes[$dataAttribute] = $replacement;
             }
         }
@@ -444,7 +443,7 @@ private function stripAndReturnParameters($reference)
     private function findAndReplaceReferences($objectHandler, $inputString)
     {
         //look for parameter area, if so use different regex
-        $regex = $this->resolveRegexPatternForReference($inputString);
+        $regex = ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
 
         preg_match_all($regex, $inputString, $matches);
 
@@ -482,7 +481,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                 $replacement = $this->resolveEntityDataObjectReference($obj, $match);
             }
 
-            if ($replacement == null) {
+            if ($replacement === null) {
                 if (get_class($objectHandler) != DataObjectHandler::class) {
                     return $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $outputString);
                 } else {
@@ -514,20 +513,6 @@ private function validateUrlAreaAgainstActionType($obj)
         }
     }
 
-    /**
-     * Determines whether the given $inputString has (params), and returns the appropriate regex for use in matching.
-     * @param string $inputString
-     * @return string
-     */
-    private function resolveRegexPatternForReference($inputString)
-    {
-        if (preg_match(ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS, $inputString) === 1) {
-            return ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS;
-        } else {
-            return ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
-        }
-    }
-
     /**
      * Gets the object's dataByName with given $match, differentiating behavior between <array> and <data> nodes.
      * @param string $obj
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -871,7 +871,7 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                     break;
                 case "switchToNextTab":
                 case "switchToPreviousTab":
-                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $this->stripWrappedQuotes($input));
+                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $input);
                     break;
                 case "clickWithLeftButton":
                 case "clickWithRightButton":
@@ -1405,6 +1405,7 @@ private function stripAndSplitReference($reference, $delimiter)
      * @return string
      * @throws TestReferenceException
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function generateHooksPhp($hookObjects)
     {
@@ -1446,12 +1447,6 @@ private function generateHooksPhp($hookObjects)
                 throw new TestReferenceException($e->getMessage() . " in Element \"" . $type . "\"");
             }
 
-            if ($hookObject->getType() == TestObjectExtractor::TEST_FAILED_HOOK) {
-                $steps.="\t\t";
-                $steps.='$this->_after($I);';
-                $steps.="\n";
-            }
-
             $hooks .= sprintf("\tpublic function _{$type}(%s)\n", $dependencies);
             $hooks .= "\t{\n";
             $hooks .= $steps;
@@ -1627,6 +1622,9 @@ private function wrapFunctionCall($actor, $action, ...$args)
             if (!$isFirst) {
                 $output .= ', ';
             }
+            if ($args[$i] === "") {
+                $args[$i] = '"' . $args[$i] . '"';
+            }
             $output .= $args[$i];
             $isFirst = false;
         }
@@ -1658,6 +1656,9 @@ private function wrapFunctionCallWithReturnValue($returnVariable, $actor, $actio
             if (!$isFirst) {
                 $output .= ', ';
             }
+            if ($args[$i] === "") {
+                $args[$i] = '"' . $args[$i] . '"';
+            }
             $output .= $args[$i];
             $isFirst = false;
         }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ class ActionGroupWithDataOverrideTestCest`
`57`	`57`	`public function _failed(AcceptanceTester $I)`
`58`	`58`	`{`
`59`	`59`	`$I->saveScreenshot();`
`60`		`- $this->_after($I);`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ class ArgumentWithSameNameAsElementCest`
`57`	`57`	`public function _failed(AcceptanceTester $I)`
`58`	`58`	`{`
`59`	`59`	`$I->saveScreenshot();`
`60`		`- $this->_after($I);`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ class BasicMergeTestCest`
`48`	`48`	`public function _failed(AcceptanceTester $I)`
`49`	`49`	`{`
`50`	`50`	`$I->saveScreenshot();`
`51`		`- $this->_after($I);`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ class HookActionsTestCest`
`73`	`73`	`public function _failed(AcceptanceTester $I)`
`74`	`74`	`{`
`75`	`75`	`$I->saveScreenshot();`
`76`		`- $this->_after($I);`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ class MergedActionGroupTestCest`
`57`	`57`	`public function _failed(AcceptanceTester $I)`
`58`	`58`	`{`
`59`	`59`	`$I->saveScreenshot();`
`60`		`- $this->_after($I);`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`/**`