Merge branch 'develop' into MQE-683

Author: KevinBKozan

.travis.yml

@@ -1,7 +1,5 @@
 language: php
 php:
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
 install: composer install --no-interaction --prefer-source

composer.json

@@ -9,10 +9,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
+        "php": "~7.2.0||~7.3.0",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-openssl": "*",
+        "ext-dom": "*",
         "allure-framework/allure-codeception": "~1.3.0",
         "aws/aws-sdk-php": "^3.132",
         "codeception/codeception": "~2.4.5",

composer.lock

@@ -35,7 +35,7 @@
     true,
     \Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::UNIT_TEST_PHASE,
     true,
-    \Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::LEVEL_NONE,
+    \Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::LEVEL_DEFAULT,
     false
 );
 
@@ -102,28 +102,6 @@
     require($unitUtilFile);
 }
 
-
-// Mocks suite files location getter return to get files in verification/_suite Directory
-// This mocks the paths of the suite files but still parses the xml files
-$suiteDirectory =  TESTS_BP . DIRECTORY_SEPARATOR . "verification" . DIRECTORY_SEPARATOR . "_suite";
-
-$paths = [
-    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuite.xml',
-    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml',
-    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteExtends.xml'
-];
-
-// create and return the iterator for these file paths
-$iterator = new Magento\FunctionalTestingFramework\Util\Iterator\File($paths);
-try {
-    AspectMock\Test::double(
-        Magento\FunctionalTestingFramework\Config\FileResolver\Root::class,
-        ['get' => $iterator]
-    )->make();
-} catch (Exception $e) {
-    echo "Suite directory not mocked.";
-}
-
 function sortInterfaces($files)
 {
     $bottom = [];

dev/tests/_bootstrap.php

@@ -51,7 +51,7 @@
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
 
     defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
-    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
 
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);

dev/tests/functional/standalone_bootstrap.php

@@ -233,6 +233,8 @@ public function testResolveUrl()
      */
     public function testResolveUrlWithNoAttribute()
     {
+        $this->expectException(TestReferenceException::class);
+
         // Set up mocks
         $actionObject = new ActionObject('merge123', 'amOnPage', [
             'url' => '{{PageObject}}'
@@ -247,19 +249,6 @@ public function testResolveUrlWithNoAttribute()
 
         // Call the method under test
         $actionObject->resolveReferences();
-
-        // Expect this warning to get generated
-        TestLoggingUtil::getInstance()->validateMockLogStatement(
-            "warning",
-            "page url attribute not found and is required",
-            ['action' => $actionObject->getType(), 'url' => '{{PageObject}}', 'stepKey' => $actionObject->getStepKey()]
-        );
-
-        // Verify
-        $expected = [
-            'url' => '{{PageObject}}'
-        ];
-        $this->assertEquals($expected, $actionObject->getCustomActionAttributes());
     }
 
     /**

dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupContainsStepKeyInArgText.xml<br>")
  */
 class ActionGroupContainsStepKeyInArgTextCest
 {

dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupMergedViaInsertAfter.xml<br>")
  */
 class ActionGroupMergedViaInsertAfterCest
 {

dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupMergedViaInsertBefore.xml<br>")
  */
 class ActionGroupMergedViaInsertBeforeCest
 {

dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupSkipReadiness.xml<br>")
  */
 class ActionGroupSkipReadinessCest
 {