Fixed failing test due to mismatch between fixture layout and template layout

davidalger · davidalger · commit 0ffb53228a93 · 2017-03-23T13:29:05.000-05:00
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php
@@ -17,7 +17,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
      * Fixture XML instruction(s) to be used in tests
      */
     // @codingStandardsIgnoreStart
-    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>';
+    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>';
     // @codingStandardsIgnoreEnd
 
     /**
@@ -230,10 +230,10 @@ public function testLoadFileSystem()
         $expectedResult = '
             <root>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
                 </body>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_two.phtml"/>
                 </body>
             </root>
         ';
@@ -249,7 +249,7 @@ public function testLoadFileSystemWithPageLayout()
             <root>
                 <body>
                     <referenceContainer name="main.container">
-                        <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+                        <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
                     </referenceContainer>
                 </body>
             </root>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -10,7 +10,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
     /**
      * Fixture XML instruction(s) to be used in tests
      */
-    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture.phtml"/>';
+    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture.phtml"/>';
 
     /**
      * @var \Magento\Framework\View\Model\Layout\Merge
@@ -32,7 +32,7 @@ protected function setUp()
         $layoutUpdate1->setHandle('fixture_handle_one');
         $layoutUpdate1->setXml(
             '<body>
-                <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+                <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
             </body>'
         );
         $layoutUpdate1->setHasDataChanges(true);
@@ -49,7 +49,7 @@ protected function setUp()
         $layoutUpdate2->setHandle('fixture_handle_two');
         $layoutUpdate2->setXml(
             '<body>
-                <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+                <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_two.phtml"/>
             </body>'
         );
         $layoutUpdate2->setHasDataChanges(true);
@@ -74,10 +74,10 @@ public function testLoadDbApp()
         $expectedResult = '
             <root>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
                 </body>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_two.phtml"/>
                 </body>
             </root>
         ';
