Merge remote-tracking branch 'origin/MAGETWO-87963' into MPI-PR24

viktym · viktym · commit 555f7035d7ba · 2018-03-03T12:51:18.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/RouteConfigFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/RouteConfigFilesTest.php
@@ -61,7 +61,7 @@ public function testRouteConfigsValidation()
             $files = array_merge($files, glob($mask));
         }
         $mergedConfig = new \Magento\Framework\Config\Dom(
-            '<config></config>',
+            '<config><router/></config>',
             $this->validationStateMock,
             $this->_idAttributes
         );

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function testRouteConfigsValidation()`
`61`	`61`	`$files = array_merge($files, glob($mask));`
`62`	`62`	`}`
`63`	`63`	`$mergedConfig = new \Magento\Framework\Config\Dom(`
`64`		`- '<config></config>',`
	`64`	`+ '<config><router/></config>',`
`65`	`65`	`$this->validationStateMock,`
`66`	`66`	`$this->_idAttributes`
`67`	`67`	`);`