Merge branch 'MQE-398' into sprint-develop

Author: tomreece

dev/tests/verification/TestModule/Page/SamplePage.xml

@@ -7,8 +7,8 @@
 -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="SamplePage" urlPath="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
+        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="SamplePage" url="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
         <section name="SampleSection"/>
     </page>
 </config>

src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php

@@ -18,8 +18,8 @@ class PageObjectHandler implements ObjectHandlerInterface
 {
     const TYPE = 'page';
     const SUB_TYPE = 'section';
-    const URL_PATH_ATTR = 'urlPath';
-    const MODULE_ATTR = 'module';
+    const URL = 'url';
+    const MODULE = 'module';
     const PARAMETERIZED = 'parameterized';
 
     /**
@@ -102,12 +102,12 @@ private function initPageObjects()
         }
 
         foreach ($parsedObjs as $pageName => $pageData) {
-            $urlPath = $pageData[PageObjectHandler::URL_PATH_ATTR];
-            $module = $pageData[PageObjectHandler::MODULE_ATTR];
-            $sections = array_keys($pageData[PageObjectHandler::SUB_TYPE]);
-            $parameterized = $pageData[PageObjectHandler::PARAMETERIZED] ?? false;
+            $url = $pageData[self::URL];
+            $module = $pageData[self::MODULE];
+            $sections = array_keys($pageData[self::SUB_TYPE]);
+            $parameterized = $pageData[self::PARAMETERIZED] ?? false;
 
-            $this->pages[$pageName] = new PageObject($pageName, $urlPath, $module, $sections, $parameterized);
+            $this->pages[$pageName] = new PageObject($pageName, $url, $module, $sections, $parameterized);
         }
     }
 }

src/Magento/FunctionalTestingFramework/Page/Objects/PageObject.php

@@ -52,15 +52,15 @@ class PageObject
     /**
      * PageObject constructor.
      * @param string $name
-     * @param string $urlPath
+     * @param string $url
      * @param string $module
      * @param array $sections
      * @param bool $parameterized
      */
-    public function __construct($name, $urlPath, $module, $sections, $parameterized)
+    public function __construct($name, $url, $module, $sections, $parameterized)
     {
         $this->name = $name;
-        $this->url = $urlPath;
+        $this->url = $url;
         $this->module = $module;
         $this->sectionNames = $sections;
         $this->parameterized = $parameterized;

src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd

@@ -48,10 +48,10 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute type="notEmptyType" name="urlPath" use="required">
+            <xs:attribute type="notEmptyType" name="url" use="required">
                 <xs:annotation>
                     <xs:documentation>
-                        Url path (excluding the base url) for the page. Use "%s" for placeholders for variables.
+                        URL for the page. Do not include the hostname. For example: "/admin/customer/index/"
                     </xs:documentation>
                 </xs:annotation>
             </xs:attribute>