Skip to content

Commit 2626feb

Browse files
KevinBKozanKevinBKozan
authored
Merge branch 'develop' into MQE-1087
2 parents 7ea11f2 + 00f473b commit 2626feb

File tree

19 files changed

+247
-26
lines changed

19 files changed

+247
-26
lines changed

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"require": {
1212
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
1313
"allure-framework/allure-codeception": "~1.2.6",
14-
"codeception/codeception": "~2.3.4",
14+
"codeception/codeception": "~2.3.4 || ~2.4.0",
1515
"consolidation/robo": "^1.0.0",
1616
"epfremme/swagger-php": "^2.0",
1717
"flow/jsonpath": ">0.2",
@@ -23,7 +23,7 @@
2323
},
2424
"require-dev": {
2525
"squizlabs/php_codesniffer": "~3.2",
26-
"sebastian/phpcpd": "~3.0",
26+
"sebastian/phpcpd": "~3.0 || ~4.0",
2727
"brainmaestro/composer-git-hooks": "^2.3",
2828
"doctrine/cache": "<1.7.0",
2929
"codeception/aspect-mock": "^3.0",

‎composer.lock

Lines changed: 55 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/_bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// set mftf appplication context
3131
\Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::create(
3232
true,
33-
\Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::GENERATION_PHASE,
33+
\Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::UNIT_TEST_PHASE,
3434
true,
3535
false
3636
);

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/AnnotationExtractorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function testMissingAnnotations()
114114
// Asserts
115115
TestLoggingUtil::getInstance()->validateMockLogStatement(
116116
'warning',
117-
'Test testFileName is missing required annotations.',
117+
'DEPRECATION: Test testFileName is missing required annotations.',
118118
[
119119
'testName' => 'testFileName',
120120
'missingAnnotations' => "title, description, severity"

‎dev/tests/unit/Util/TestLoggingUtil.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
use AspectMock\Test as AspectMock;
1010
use Magento\FunctionalTestingFramework\Util\Logger\LoggingUtil;
11+
use Magento\FunctionalTestingFramework\Util\Logger\MftfLogger;
1112
use Monolog\Handler\TestHandler;
1213
use Monolog\Logger;
1314
use PHPUnit\Framework\Assert;
@@ -54,7 +55,7 @@ public static function getInstance()
5455
public function setMockLoggingUtil()
5556
{
5657
$this->testLogHandler = new TestHandler();
57-
$testLogger = new Logger('testLogger');
58+
$testLogger = new MftfLogger('testLogger');
5859
$testLogger->pushHandler($this->testLogHandler);
5960
$mockLoggingUtil = AspectMock::double(
6061
LoggingUtil::class,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ class BasicFunctionalTestCest
9999
$executeJSKey1 = $I->executeJS("someJSFunction");
100100
$I->fillField(".functionalTestSelector", "someInput");
101101
$I->fillField(".functionalTestSelector", "0");
102+
$date = new \DateTime();
103+
$date->setTimestamp(strtotime("Now"));
104+
$date->setTimezone(new \DateTimeZone("America/Los_Angeles"));
105+
$generateDateKey = $date->format("H:i:s");
102106
$grabAttributeFromKey1 = $I->grabAttributeFrom(".functionalTestSelector", "someInput");
103107
$grabCookieKey1 = $I->grabCookie("grabCookieInput", ['domain' => 'www.google.com']);
104108
$grabFromCurrentUrlKey1 = $I->grabFromCurrentUrl("/grabCurrentUrl");

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
namespace Magento\AcceptanceTest\_default\Backend;
3+
4+
use Magento\FunctionalTestingFramework\AcceptanceTester;
5+
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
6+
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
7+
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
9+
use \Codeception\Util\Locator;
10+
use Yandex\Allure\Adapter\Annotation\Features;
11+
use Yandex\Allure\Adapter\Annotation\Stories;
12+
use Yandex\Allure\Adapter\Annotation\Title;
13+
use Yandex\Allure\Adapter\Annotation\Description;
14+
use Yandex\Allure\Adapter\Annotation\Parameter;
15+
use Yandex\Allure\Adapter\Annotation\Severity;
16+
use Yandex\Allure\Adapter\Model\SeverityLevel;
17+
use Yandex\Allure\Adapter\Annotation\TestCaseId;
18+
19+
/**
20+
*/
21+
class ExecuteJsEscapingTestCest
22+
{
23+
/**
24+
* @Features({"TestModule"})
25+
* @Parameter(name = "AcceptanceTester", value="$I")
26+
* @param AcceptanceTester $I
27+
* @return void
28+
* @throws \Exception
29+
*/
30+
public function ExecuteJsEscapingTest(AcceptanceTester $I)
31+
{
32+
$javaVariableEscape = $I->executeJS("return \$javascriptVariable");
33+
$mftfVariableNotEscaped = $I->executeJS("return {$doNotEscape}");
34+
}
35+
}

‎dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<executeJS function="someJSFunction" stepKey="executeJSKey1"/>
6161
<fillField selector=".functionalTestSelector" userInput="someInput" stepKey="fillFieldKey1" />
6262
<fillField selector=".functionalTestSelector" userInput="0" stepKey="fillFieldKey2" />
63+
<generateDate date="Now" format="H:i:s" stepKey="generateDateKey"/>
6364
<grabAttributeFrom selector=".functionalTestSelector" userInput="someInput" stepKey="grabAttributeFromKey1" />
6465
<grabCookie userInput="grabCookieInput" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookieKey1" />
6566
<grabFromCurrentUrl regex="/grabCurrentUrl" stepKey="grabFromCurrentUrlKey1" />

‎dev/tests/verification/TestModule/Test/ExecuteJsTest.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11+
<test name="ExecuteJsEscapingTest">
12+
<executeJS function="return $javascriptVariable" stepKey="javaVariableEscape"/>
13+
<executeJS function="return {$doNotEscape}" stepKey="mftfVariableNotEscaped"/>
14+
</test>
15+
</tests>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace tests\verification\Tests;
7+
8+
use tests\util\MftfTestCase;
9+
10+
class ExecuteJsTest extends MftfTestCase
11+
{
12+
/**
13+
* Tests escaping of $javascriptVariable => \$javascriptVariable in the executeJs function
14+
*
15+
* @throws \Exception
16+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
17+
*/
18+
public function testExecuteJsTest()
19+
{
20+
$this->generateAndCompareTest('ExecuteJsEscapingTest');
21+
}
22+
}

‎etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<!-- Entity value gets replaced in Dom.php before reading $xml -->
1010
<!DOCTYPE config [
11-
<!ENTITY commonTestActions "acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArrayIsSorted|assertArraySubset|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|closeAdminNotification|closeTab|comment|conditionalClick|createData|deleteData|updateData|getData|dontSee|dontSeeJsError|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInFormFields|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|executeInSelenium|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|magentoCLI|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pauseExecution|parseFloat|performOn|pressKey|reloadPage|resetCookie|submitForm|resizeWindow|saveSessionSnapshot|scrollTo|scrollToTopOfPage|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|submitForm|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText|assertArrayHasKey|assertArrayNotHasKey|assertArraySubset|assertContains|assertCount|assertEmpty|assertEquals|assertFalse|assertFileExists|assertFileNotExists|assertGreaterOrEquals|assertGreaterThan|assertGreaterThanOrEqual|assertInstanceOf|assertInternalType|assertIsEmpty|assertLessOrEquals|assertLessThan|assertLessThanOrEqual|assertNotContains|assertNotEmpty|assertNotEquals|assertNotInstanceOf|assertNotNull|assertNotRegExp|assertNotSame|assertNull|assertRegExp|assertSame|assertStringStartsNotWith|assertStringStartsWith|assertTrue|expectException|fail|dontSeeFullUrlEquals|dontSee|dontSeeFullUrlMatches|dontSeeInFullUrl|seeFullUrlEquals|seeFullUrlMatches|seeInFullUrl|grabFromFullUrl">
11+
<!ENTITY commonTestActions "acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArrayIsSorted|assertArraySubset|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|closeAdminNotification|closeTab|comment|conditionalClick|createData|deleteData|updateData|getData|dontSee|dontSeeJsError|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInFormFields|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|executeInSelenium|fillField|formatMoney|generateDate|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|magentoCLI|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pauseExecution|parseFloat|performOn|pressKey|reloadPage|resetCookie|submitForm|resizeWindow|saveSessionSnapshot|scrollTo|scrollToTopOfPage|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|submitForm|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText|assertArrayHasKey|assertArrayNotHasKey|assertArraySubset|assertContains|assertCount|assertEmpty|assertEquals|assertFalse|assertFileExists|assertFileNotExists|assertGreaterOrEquals|assertGreaterThan|assertGreaterThanOrEqual|assertInstanceOf|assertInternalType|assertIsEmpty|assertLessOrEquals|assertLessThan|assertLessThanOrEqual|assertNotContains|assertNotEmpty|assertNotEquals|assertNotInstanceOf|assertNotNull|assertNotRegExp|assertNotSame|assertNull|assertRegExp|assertSame|assertStringStartsNotWith|assertStringStartsWith|assertTrue|expectException|fail|dontSeeFullUrlEquals|dontSee|dontSeeFullUrlMatches|dontSeeInFullUrl|seeFullUrlEquals|seeFullUrlMatches|seeInFullUrl|grabFromFullUrl">
1212
]>
1313

1414
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../src/Magento/FunctionalTestingFramework/ObjectManager/etc/config.xsd">

‎src/Magento/FunctionalTestingFramework/Config/MftfApplicationConfig.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class MftfApplicationConfig
1111
{
1212
const GENERATION_PHASE = "generation";
1313
const EXECUTION_PHASE = "execution";
14-
const MFTF_PHASES = [self::GENERATION_PHASE, self::EXECUTION_PHASE];
14+
const UNIT_TEST_PHASE = "testing";
15+
const MFTF_PHASES = [self::GENERATION_PHASE, self::EXECUTION_PHASE, self::UNIT_TEST_PHASE];
1516

1617
/**
1718
* Determines whether the user has specified a force option for generation

‎src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataExtensionUtil.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ public function extendEntity($entityObject)
5252
PHP_EOL
5353
);
5454
}
55-
if (MftfApplicationConfig::getConfig()->verboseEnabled()) {
56-
echo("Extending Data: " . $parentEntity->getName() . " => " . $entityObject->getName() . PHP_EOL);
55+
if (MftfApplicationConfig::getConfig()->verboseEnabled() &&
56+
MftfApplicationConfig::getConfig()->getPhase() !== MftfApplicationConfig::UNIT_TEST_PHASE) {
57+
print("Extending Data: " . $parentEntity->getName() . " => " . $entityObject->getName() . PHP_EOL);
5758
}
5859

5960
//get parent entity type if child does not have a type

‎src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ class ActionObject
3939
"expectedResult",
4040
"actualResult",
4141
"command",
42-
"regex"
42+
"regex",
43+
"date",
44+
"format"
4345
];
4446
const SELECTOR_ENABLED_ATTRIBUTES = [
4547
'selector',
@@ -280,7 +282,7 @@ public function trimAssertionAttributes()
280282
if (!empty($oldAttributes)) {
281283
$appConfig = MftfApplicationConfig::getConfig();
282284
if ($appConfig->getPhase() == MftfApplicationConfig::GENERATION_PHASE && $appConfig->verboseEnabled()) {
283-
LoggingUtil::getInstance()->getLogger(ActionObject::class)->warning(
285+
LoggingUtil::getInstance()->getLogger(ActionObject::class)->deprecation(
284286
"use of one line Assertion actions will be deprecated in MFTF 3.0.0, please use nested syntax",
285287
["action" => $this->type, "stepKey" => $this->stepKey]
286288
);

‎src/Magento/FunctionalTestingFramework/Test/Util/AnnotationExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private function validateMissingAnnotations($annotationObjects, $filename)
114114

115115
if (!empty($missingAnnotations)) {
116116
$message = "Test {$filename} is missing required annotations.";
117-
LoggingUtil::getInstance()->getLogger(ActionObject::class)->warning(
117+
LoggingUtil::getInstance()->getLogger(ActionObject::class)->deprecation(
118118
$message,
119119
["testName" => $filename, "missingAnnotations" => implode(", ", $missingAnnotations)]
120120
);

‎src/Magento/FunctionalTestingFramework/Test/etc/Actions/customActions.xsd

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<xs:element type="scrollToTopOfPageType" name="scrollToTopOfPage" minOccurs="0" maxOccurs="unbounded"/>
2323
<xs:element type="clearFieldType" name="clearField" minOccurs="0" maxOccurs="unbounded"/>
2424
<xs:element type="assertArrayIsSortedType" name="assertArrayIsSorted" minOccurs="0" maxOccurs="unbounded"/>
25+
<xs:element type="generateDateType" name="generateDate" minOccurs="0" maxOccurs="unbounded"/>
2526
</xs:choice>
2627
</xs:group>
2728

@@ -219,6 +220,41 @@
219220
<xs:attributeGroup ref="commonActionAttributes"/>
220221
</xs:complexType>
221222

223+
<xs:complexType name="generateDateType">
224+
<xs:annotation>
225+
<xs:documentation>
226+
Generates a date according to input and format.
227+
</xs:documentation>
228+
</xs:annotation>
229+
<xs:simpleContent>
230+
<xs:extension base="xs:string">
231+
<xs:attribute name="date" use="required" type="xs:string">
232+
<xs:annotation>
233+
<xs:documentation>
234+
Date input to parse, uses same functionality as php strtotime() function.
235+
</xs:documentation>
236+
</xs:annotation>
237+
</xs:attribute>
238+
<xs:attribute name="format" use="required" type="xs:string">
239+
<xs:annotation>
240+
<xs:documentation>
241+
Format to save given date in, uses same functionality as php date() function.
242+
</xs:documentation>
243+
</xs:annotation>
244+
</xs:attribute>
245+
<xs:attribute name="timezone" use="optional" type="xs:string">
246+
<xs:annotation>
247+
<xs:documentation>
248+
Timezone to generate date in, defaults to "America/Los_Angeles".
249+
</xs:documentation>
250+
</xs:annotation>
251+
</xs:attribute>
252+
<xs:attributeGroup ref="commonActionAttributes"/>
253+
</xs:extension>
254+
</xs:simpleContent>
255+
</xs:complexType>
256+
257+
222258
<xs:complexType name="arrayType">
223259
<xs:simpleContent>
224260
<xs:extension base="xs:string">

0 commit comments

Comments
 (0)