Merge remote-tracking branch 'origin/develop' into MQE-2016

Author: tomreece

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());
     }
 
     /**

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

@@ -72,7 +72,9 @@ private function __construct()
 
             $module = $pageData[self::MODULE] ?? null;
             $sectionNames = array_keys($pageData[self::SECTION] ?? []);
-            $parameterized = $pageData[self::PARAMETERIZED] ?? false;
+            $urlContainsMustaches = strpos($url, "{{") !== false && strpos($url, "}}") !== false;
+            $parameterized = $pageData[self::PARAMETERIZED] ?? $urlContainsMustaches ?? false;
+            $filename = $pageData[self::FILENAME] ?? null;
             $deprecated = $pageData[self::OBJ_DEPRECATED] ?? null;
 
             if ($deprecated !== null) {

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

@@ -420,7 +420,7 @@ private function resolveUrlReference()
             $allPages = PageObjectHandler::getInstance()->getAllObjects();
             if ($replacement === $url && array_key_exists(trim($url, "{}"), $allPages)
             ) {
-                LoggingUtil::getInstance()->getLogger(ActionObject::class)->warning(
+                throw new TestReferenceException(
                     "page url attribute not found and is required",
                     ["action" => $this->type, "url" => $url, "stepKey" => $this->stepKey]
                 );