Merge branch 'MTA-2210' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop

Dmytro Aponasenko · Dmytro Aponasenko · commit fc08506b287c · 2015-06-09T10:31:28.000Z
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
@@ -27,6 +27,13 @@ class MultiselectlistElement extends MultiselectElement
      */
     protected $optionCheckedElement = './/*[contains(@class, "mselect-checked")]/following-sibling::span';
 
+    /**
+     * Option locator by value.
+     *
+     * @var string
+     */
+    protected $optionByValue = './/*[contains(@class,"mselect-list-item")]/label[contains(normalize-space(.), %s)]';
+
     /**
      * Select options by values in multiple select list
      *
@@ -107,4 +114,16 @@ public function getAllValues()
 
         return $optionsValue;
     }
+
+    /**
+     * Check whether value is visible in the list.
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function isValueVisible($value)
+    {
+        $option = $this->find(sprintf($this->optionByValue, $this->escapeQuotes($value)), Locator::SELECTOR_XPATH);
+        return $option->isVisible();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
@@ -26,7 +26,7 @@ class Menu extends Block
      *
      * @var string
      */
-    protected $subMenu = './/li[@role="menu-item" and a[span="%s"]]/div[@class="submenu"]';
+    protected $subMenu = './/li[@role="menu-item" and a[span="%s"]]/div[contains(@class, "submenu")]';
 
     /**
      * Submenu item selector.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php
@@ -21,7 +21,7 @@ class NavigateMenuTest extends Injectable
 {
     /* tags */
     const MVP = 'no';
-    const DOMAIN = 'CS, MX, PS';
+    const DOMAIN = 'PS';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
@@ -14,6 +14,8 @@
 class AssertAttributeOptionsOnProductForm extends AbstractConstraint
 {
     /**
+     * Assert all product attribute options on product creation form.
+     *
      * @return void
      */
     public function processAssert()
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
@@ -14,6 +14,8 @@
 class AssertAttributeSearchableByLabel extends AbstractConstraint
 {
     /**
+     * Assert that product attribute is searchable on Frontend.
+     *
      * @return void
      */
     public function processAssert()
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
@@ -14,6 +14,8 @@
 class AssertProductAttributeIsUsedPromoRules extends AbstractConstraint
 {
     /**
+     * Assert that product attribute can be used on promo rules conditions.
+     *
      * @return void
      */
     public function processAssert()
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
@@ -18,7 +18,7 @@
  * Steps:
  * 1. Navigate through up-sell products.
  *
- * @ZephirId MAGETWO-12391
+ * @ZephyrId MAGETWO-12391
  * @group Up-sells_(MX)
  */
 class NavigateUpSellProductsTest extends AbstractProductPromotedProductsTest
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.php
@@ -23,7 +23,7 @@
  * 8. Clear cache.
  * 9. Perform all assertions.
  *
- * @ticketId MAGETWO-23036
+ * @ZephyrId MAGETWO-23036
  */
 class CreateCatalogRuleTest extends AbstractCatalogRuleEntityTest
 {
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Fixture/CmsBlock.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Fixture/CmsBlock.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
     <fixture name="cmsBlock" module="Magento_Cms" type="flat" entity_type="cms_block" collection="Magento\Cms\Model\Resource\Block\Grid\Collection" identifier="identifier"
-             handler_interface="Magento\Cms\Test\Handler\CmsBlock\CmsBlockInterface" class="Magento\Cms\Test\Fixture\CmsBlock">
+             handler_interface="Magento\Cms\Test\Handler\CmsBlock\CmsBlockInterface" repository_class="Magento\Cms\Test\Repository\CmsBlock" class="Magento\Cms\Test\Fixture\CmsBlock">
         <dataset name="default">
             <field name="title" xsi:type="string">block_%isolation%</field>
             <field name="identifier" xsi:type="string">identifier_%isolation%</field>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -21,7 +21,7 @@
  * 5. Click "Save Customer" button.
  * 6. Perform all assertions.
  *
- * @ticketId MAGETWO-23424
+ * @ZephyrId MAGETWO-23424
  */
 class CreateCustomerBackendEntityTest extends Injectable
 {
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
@@ -23,7 +23,7 @@
  * 5. Click 'Save' button
  * 6. Perform all assertions
  *
- * @ticketId MAGETWO-23881
+ * @ZephyrId MAGETWO-23881
  */
 class UpdateCustomerBackendEntityTest extends Injectable
 {
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
@@ -262,11 +262,26 @@ function () use ($browser) {
     }
 
     /**
-     * Getting all options in Tax Rate multi select list.
+     * Click 'Add New' button.
      *
-     * @return array
+     * @param SimpleElement $element
+     * @return void
      */
-    public function getAllTaxRates()
+    protected function clickAddNewButton(SimpleElement $element)
+    {
+        $addNewButton = $this->addNewButton;
+        $element->waitUntil(
+            function () use ($element, $addNewButton) {
+                return $element->find($addNewButton)->isVisible() ? true : null;
+            }
+        );
+        $element->find($this->addNewButton)->click();
+    }
+
+    /**
+     * Wait until tax rate element appears.
+     */
+    protected function waitForTaxRates()
     {
         $browser = $this->browser;
         $taxRateMultiSelectList = $this->taxRateMultiSelectList;
@@ -276,26 +291,32 @@ function () use ($browser, $taxRateMultiSelectList) {
                 return $element->isVisible() ? true : null;
             }
         );
+    }
+
+    /**
+     * Getting all options in Tax Rate multi select list.
+     *
+     * @return array
+     */
+    public function getAllTaxRates()
+    {
+        $this->waitForTaxRates();
         /** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRates */
         $taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
 
         return $taxRates->getAllValues();
     }
 
     /**
-     * Click 'Add New' button.
+     * Check whether tax rate is visible in the list.
      *
-     * @param SimpleElement $element
-     * @return void
+     * @param string $value
+     * @return bool
      */
-    protected function clickAddNewButton(SimpleElement $element)
+    public function isTaxRateAvailable($value)
     {
-        $addNewButton = $this->addNewButton;
-        $element->waitUntil(
-            function () use ($element, $addNewButton) {
-                return $element->find($addNewButton)->isVisible() ? true : null;
-            }
-        );
-        $element->find($this->addNewButton)->click();
+        /** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRate */
+        $taxRate = $taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
+        return $taxRate->isValueVisible($value);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
@@ -6,26 +6,43 @@
 
 namespace Magento\Tax\Test\Constraint;
 
+use Magento\Tax\Test\Fixture\TaxRate;
 use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
+use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 
 /**
- * Class AssertTaxRateInTaxRule
+ * Assert that required tax rate is present in tax rule.
  */
 class AssertTaxRateInTaxRule extends AbstractConstraint
 {
     /**
+     * Assert that required tax rate is present in "Tax Rule Information" on tax rule creation page.
+     *
+     * @param TaxRuleIndex $taxRuleIndex
+     * @param TaxRuleNew $taxRuleNew
+     * @param TaxRate $taxRate
      * @return void
      */
-    public function processAssert()
+    public function processAssert(TaxRuleIndex $taxRuleIndex, TaxRuleNew $taxRuleNew, TaxRate $taxRate)
     {
-        //
+        $taxRateCode = $taxRate->getCode();
+        $taxRuleIndex->open();
+        $taxRuleIndex->getGridPageActions()->addNew();
+
+        \PHPUnit_Framework_Assert::assertTrue(
+            $taxRuleNew->getTaxRuleForm()->isTaxRateAvailable($taxRateCode),
+            "$taxRateCode is not present in Tax Rates multiselect on tax rule creation page."
+        );
     }
 
     /**
+     * Returns string representation of object.
+     *
      * @return string
      */
     public function toString()
     {
-        //
+        return "Required tax rate is present on Tax Rule page.";
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/di.xml

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class Menu extends Block`
`26`	`26`	`*`
`27`	`27`	`* @var string`
`28`	`28`	`*/`
`29`		`- protected $subMenu = './/li[@role="menu-item" and a[span="%s"]]/div[@class="submenu"]';`
	`29`	`+ protected $subMenu = './/li[@role="menu-item" and a[span="%s"]]/div[contains(@class, "submenu")]';`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Submenu item selector.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class NavigateMenuTest extends Injectable`
`21`	`21`	`{`
`22`	`22`	`/* tags */`
`23`	`23`	`const MVP = 'no';`
`24`		`- const DOMAIN = 'CS, MX, PS';`
	`24`	`+ const DOMAIN = 'PS';`
`25`	`25`	`/* end tags */`
`26`	`26`
`27`	`27`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`class AssertAttributeOptionsOnProductForm extends AbstractConstraint`
`15`	`15`	`{`
`16`	`16`	`/**`
	`17`	`+ * Assert all product attribute options on product creation form.`
	`18`	`+ *`
`17`	`19`	`* @return void`
`18`	`20`	`*/`
`19`	`21`	`public function processAssert()`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* Steps:`
`19`	`19`	`* 1. Navigate through up-sell products.`
`20`	`20`	`*`
`21`		`- * @ZephirId MAGETWO-12391`
	`21`	`+ * @ZephyrId MAGETWO-12391`
`22`	`22`	`* @group Up-sells_(MX)`
`23`	`23`	`*/`
`24`	`24`	`class NavigateUpSellProductsTest extends AbstractProductPromotedProductsTest`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* 8. Clear cache.`
`24`	`24`	`* 9. Perform all assertions.`
`25`	`25`	`*`
`26`		`- * @ticketId MAGETWO-23036`
	`26`	`+ * @ZephyrId MAGETWO-23036`
`27`	`27`	`*/`
`28`	`28`	`class CreateCatalogRuleTest extends AbstractCatalogRuleEntityTest`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* 5. Click "Save Customer" button.`
`22`	`22`	`* 6. Perform all assertions.`
`23`	`23`	`*`
`24`		`- * @ticketId MAGETWO-23424`
	`24`	`+ * @ZephyrId MAGETWO-23424`
`25`	`25`	`*/`
`26`	`26`	`class CreateCustomerBackendEntityTest extends Injectable`
`27`	`27`	`{`