Skip to content

Commit e05e5e7

Browse files
okolesnykokolesnyk
committed
Merge branch 'develop' of github.com:magento/magento2-functional-testing-framework into 'CD-develop'
2 parents bdd366d + cfb142b commit e05e5e7

File tree

47 files changed

+277
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+277
-104
lines changed

‎dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithDataTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithNoArguments.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithPersistedData.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/AssertTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/BasicActionGroupTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/BasicFunctionalTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/BasicMergeTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/CharacterReplacementTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/DataReplacementTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/HookActionsTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/LocatorFunctionTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/MergedActionGroupTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/MergedReferencesTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/MultipleActionGroupsTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/PageReplacementTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/ParameterArrayTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/PersistedReplacementTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Resources/SectionReplacementTest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Magento\AcceptanceTest\_generated\Backend;
2+
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;

‎dev/tests/verification/Tests/SuiteGenerationTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace tests\verification\Tests;
88

9+
use Magento\Framework\Module\Dir;
910
use Magento\FunctionalTestingFramework\Suite\SuiteGenerator;
1011
use Magento\FunctionalTestingFramework\Util\TestManifest;
1112
use Symfony\Component\Yaml\Yaml;
@@ -79,7 +80,7 @@ public function testSuiteGeneration1()
7980
DIRECTORY_SEPARATOR;
8081

8182
// Validate test manifest contents
82-
$actualManifest = $suiteResultBaseDir . 'testManifest.txt';
83+
$actualManifest = dirname($suiteResultBaseDir). DIRECTORY_SEPARATOR . 'testManifest.txt';
8384
$actualTestReferences = explode(PHP_EOL, file_get_contents($actualManifest));
8485

8586
for ($i = 0; $i < count($actualTestReferences); $i++) {

‎etc/di.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@
358358
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\SuiteData</argument>
359359
<argument name="idAttributes" xsi:type="array">
360360
<item name="/suites/suite" xsi:type="string">name</item>
361+
<item name="/suites/suite/(before|after)/remove" xsi:type="string">keyForRemoval</item>
362+
<item name="/suites/suite/(before|after)/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
363+
<item name="/suites/suite/(before|after)/createData/requiredEntity" xsi:type="string">createDataKey</item>
364+
<item name="/suites/suite/(before|after)/createData/field" xsi:type="string">key</item>
361365
<item name="/suites/suite/include/(group|test|module)" xsi:type="string">name</item>
362366
<item name="/suites/suite/exclude/(group|test|module)" xsi:type="string">name</item>
363367
</argument>
@@ -370,8 +374,10 @@
370374
<arguments>
371375
<argument name="assocArrayAttributes" xsi:type="array">
372376
<item name="/suites/suite" xsi:type="string">name</item>
373-
<item name="/suites/suite/(before|after)/(createData|deleteData)" xsi:type="string">stepKey</item>
377+
<item name="/suites/suite/(before|after)/remove" xsi:type="string">keyForRemoval</item>
378+
<item name="/suites/suite/(before|after)/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
374379
<item name="/suites/suite/(before|after)/createData/requiredEntity" xsi:type="string">createDataKey</item>
380+
<item name="/suites/suite/(before|after)/createData/field" xsi:type="string">key</item>
375381
<item name="/suites/suite/include/(group|test|module)" xsi:type="string">name</item>
376382
<item name="/suites/suite/exclude/(group|test|module)" xsi:type="string">name</item>
377383
</argument>

‎src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

+11-3
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public function scrollToTopOfPage()
435435
* @param string $command
436436
* @returns string
437437
*/
438-
public function executeMagentoCLICommand($command)
438+
public function magentoCLI($command)
439439
{
440440

441441
$apiURL = $this->config['url'] . getenv('MAGENTO_CLI_COMMAND_PATH');
@@ -527,6 +527,10 @@ public function _failed(TestInterface $test, $fail)
527527
$this->saveScreenshot();
528528
}
529529

530+
if ($this->current_test == null) {
531+
throw new \RuntimeException("Suite condition failure: \n" . $fail->getMessage());
532+
}
533+
530534
$this->addAttachment($this->pngReport, $test->getMetadata()->getName() . '.png', 'image/png');
531535
$this->addAttachment($this->htmlReport, $test->getMetadata()->getName() . '.html', 'text/html');
532536

@@ -540,8 +544,12 @@ public function _failed(TestInterface $test, $fail)
540544
*/
541545
public function saveScreenshot()
542546
{
543-
$test = $this->current_test;
544-
$filename = preg_replace('~\W~', '.', Descriptor::getTestSignature($test));
547+
$testDescription = "unknown." . uniqid();
548+
if ($this->current_test != null) {
549+
$testDescription = Descriptor::getTestSignature($this->current_test);
550+
}
551+
552+
$filename = preg_replace('~\W~', '.', $testDescription);
545553
$outputDir = codecept_output_dir();
546554
$this->_saveScreenshot($this->pngReport = $outputDir . mb_strcut($filename, 0, 245, 'utf-8') . '.fail.png');
547555
$this->_savePageSource($this->htmlReport = $outputDir . mb_strcut($filename, 0, 244, 'utf-8') . '.fail.html');

0 commit comments

Comments
 (0)