MTA-1247: Sync qmt repository with mainline - Sprint 2

Dmytro Aponasenko · Dmytro Aponasenko · commit 0f9cd5e6a607 · 2014-12-25T09:51:35.000+02:00
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc10",
+        "magento/mtf": "1.0.0-rc11",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -121,9 +121,11 @@ public function selectCategory(FixtureInterface $category, $fullPath = true)
     protected function prepareFullCategoryPath(CatalogCategory $category)
     {
         $path = [];
-        $parentCategory = $category->getDataFieldConfig('parent_id')['source']->getParentCategory();
+        $parentCategory = $category->hasData('parent_id')
+            ? $category->getDataFieldConfig('parent_id')['source']->getParentCategory()
+            : null;
 
-        if ($parentCategory != null) {
+        if ($parentCategory !== null) {
             $path = $this->prepareFullCategoryPath($parentCategory);
         }
         return array_filter(array_merge($path, [$category->getPath(), $category->getName()]));

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,11 @@ public function selectCategory(FixtureInterface $category, $fullPath = true)`
`121`	`121`	`protected function prepareFullCategoryPath(CatalogCategory $category)`
`122`	`122`	`{`
`123`	`123`	`$path = [];`
`124`		`- $parentCategory = $category->getDataFieldConfig('parent_id')['source']->getParentCategory();`
	`124`	`+ $parentCategory = $category->hasData('parent_id')`
	`125`	`+ ? $category->getDataFieldConfig('parent_id')['source']->getParentCategory()`
	`126`	`+ : null;`
`125`	`127`
`126`		`- if ($parentCategory != null) {`
	`128`	`+ if ($parentCategory !== null) {`
`127`	`129`	`$path = $this->prepareFullCategoryPath($parentCategory);`
`128`	`130`	`}`
`129`	`131`	`return array_filter(array_merge($path, [$category->getPath(), $category->getName()]));`