Merge branch 'develop' into MQE-1581

Author: soumyau

dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml

@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeprecatedCommentActionGroup" deprecated="This Action Group is outdated and will be deleted next release.">
         <comment userInput="Action group to demonstrate deprecation notices." stepKey="comment" />
     </actionGroup>

dev/tests/functional/tests/MFTF/DevDocs/Data/DeprecatedMessageData.xml

@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DeprecatedMessageData" deprecated="Entity is deprecated. Please use 'MessageData'.">
         <data key="message">Introduction to the Magento Functional Testing Framework</data>
     </entity>

dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml

@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="MessageData">
         <data key="message">Introduction to the Magento Functional Testing Framework</data>
     </entity>

dev/tests/functional/tests/MFTF/DevDocs/Page/DeprecatedMFTFDocPage.xml

@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="DeprecatedMFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs" deprecated="New page was introduced. Please use 'MFTFDocPage'">
         <section name="contentSection" />
     </page>

dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml

@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="MFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs">
         <section name="contentSection" />
     </page>

dev/tests/functional/tests/MFTF/DevDocs/Section/ContentSection.xml

@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="contentSection">
         <element name="pageIntro" type="text" selector=".page-intro"/>
         <element name="deprecatedPageIntro" type="text" selector=".page-intro-old" deprecated="New element was introduced. Please use 'contentSection.pageIntro'"/>

dev/tests/functional/tests/MFTF/DevDocs/Section/DeprecatedContentSection.xml

@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="DeprecatedContentSection" deprecated="New section was introduces. Please use 'contentSection'">
         <element name="pageIntro" type="text" selector=".page-intro"/>
     </section>

dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DeprecatedDevDocsTest" deprecated="Test is deprecated due to more stable test was introduces. Please use 'DevDocsTest'.">
         <annotations>
             <!--   Comment in Annotations for DevDocs Test are not affecting test generation  -->

dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DevDocsTest">
         <annotations>
             <!--   Comment in Annotations for DevDocs Test are not affecting test generation  -->

dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.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());
     }
 
     /**