MTA-1502: Sync qmt repository with mainline - Sprint 5

Dmytro Aponasenko · Dmytro Aponasenko · commit a9142862a1f9 · 2015-01-28T09:57:27.000+02:00
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
@@ -48,7 +48,7 @@ public function processAssert(
         $fixtureData = $this->prepareFixtureData($category->getData());
         $formData = $catalogCategoryEdit->getEditForm()->getData($category);
         $error = $this->verifyData($this->sortData($fixtureData), $this->sortData($formData));
-        \PHPUnit_Framework_Assert::assertEmpty($error);
+        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
@@ -16,11 +16,12 @@
     <handler_interface>Magento\Catalog\Test\Handler\Category\CategoryInterface</handler_interface>
     <dataset name="default">
         <field name="name" xsi:type="string">Category%isolation%</field>
-        <field name="path" xsi:type="string">Default Category</field>
         <field name="url_key" xsi:type="string">category%isolation%</field>
         <field name="is_active" xsi:type="string">Yes</field>
         <field name="include_in_menu" xsi:type="string">Yes</field>
-        <field name="parent_id" xsi:type="string">2</field>
+        <field name="parent_id" xsi:type="array">
+            <item name="dataSet" xsi:type="string">default_category</item>
+        </field>
     </dataset>
     <fields>
         <field name="entity_id">
@@ -50,6 +51,7 @@
             <is_required>0</is_required>
             <default_value xsi:type="null" />
             <input>textarea</input>
+            <group>general_information</group>
         </field>
         <field name="parent_id">
             <attribute_code>parent_id</attribute_code>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv
@@ -1,4 +1,4 @@
-"category/data/name";"category/data/is_active";"category/data/url_key";"category/data/description";"category/data/meta_title";"category/data/include_in_menu";"category/data/available_product_listing_config";"category/data/available_sort_by/sort_2";"category/data/available_sort_by/sort_1";"category/data/default_product_listing_config";"category/data/default_sort_by";"constraint"
-"Name%isolation%";"Yes";"UrlKey%isolation%";"-";"-";"Yes";"Yes";"-";"-";"No";"Name";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryRedirect, assertCategoryPage"
-"Name%isolation%";"Yes";"UrlKey%isolation%";"Category Description";"Category Title";"Yes";"No";"Position";"Price";"Yes";"-";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryPage"
-"Name%isolation%";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm"
+"category/data/parent_id/dataSet";"category/data/name";"category/data/is_active";"category/data/url_key";"category/data/description";"category/data/meta_title";"category/data/include_in_menu";"category/data/available_product_listing_config";"category/data/available_sort_by/sort_2";"category/data/available_sort_by/sort_1";"category/data/default_product_listing_config";"category/data/default_sort_by";"constraint"
+"default_category";"Name%isolation%";"Yes";"UrlKey%isolation%";"-";"-";"Yes";"Yes";"-";"-";"No";"Name";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryRedirect, assertCategoryPage"
+"default_category";"Name%isolation%";"Yes";"UrlKey%isolation%";"Category Description";"Category Title";"Yes";"No";"Position";"Price";"Yes";"-";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryPage"
+"default_category";"Name%isolation%";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
@@ -13,6 +13,7 @@ class BackendCustomerCreateTest extends Functional
 {
     /* tags */
     const TEST_TYPE = 'acceptance_test';
+    const STABLE = 'no';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
@@ -220,7 +220,7 @@ function () use ($element, $inputSelector) {
                         return $input->isVisible() ? true : null;
                     }
                 );
-                $element->find($this->addNewInput)->setValue($taxClass);
+                $element->find($this->addNewInput)->keys([$taxClass]);
                 $element->find($this->saveButton)->click();
                 $this->waitUntilOptionIsVisible($element, $taxClass);
             }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function processAssert(`
`48`	`48`	`$fixtureData = $this->prepareFixtureData($category->getData());`
`49`	`49`	`$formData = $catalogCategoryEdit->getEditForm()->getData($category);`
`50`	`50`	`$error = $this->verifyData($this->sortData($fixtureData), $this->sortData($formData));`
`51`		`- \PHPUnit_Framework_Assert::assertEmpty($error);`
	`51`	`+ \PHPUnit_Framework_Assert::assertEmpty($error, $error);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class BackendCustomerCreateTest extends Functional`
`13`	`13`	`{`
`14`	`14`	`/* tags */`
`15`	`15`	`const TEST_TYPE = 'acceptance_test';`
	`16`	`+ const STABLE = 'no';`
`16`	`17`	`/* end tags */`
`17`	`18`
`18`	`19`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ function () use ($element, $inputSelector) {`
`220`	`220`	`return $input->isVisible() ? true : null;`
`221`	`221`	`}`
`222`	`222`	`);`
`223`		`- $element->find($this->addNewInput)->setValue($taxClass);`
	`223`	`+ $element->find($this->addNewInput)->keys([$taxClass]);`
`224`	`224`	`$element->find($this->saveButton)->click();`
`225`	`225`	`$this->waitUntilOptionIsVisible($element, $taxClass);`
`226`	`226`	`}`