Merge pull request #39 from magento-qmt/develop

[Mavericks] Create acceptance functional tests plan and re-factor end-to-end tests

Author: Dmytro Aponasenko

dev/tests/functional/bootstrap.php

@@ -6,6 +6,7 @@
 
 session_start();
 defined('MTF_BOOT_FILE') || define('MTF_BOOT_FILE', __FILE__);
+defined('MTF_BP') || define('MTF_BP', str_replace('\\', '/', (__DIR__)));
 require_once __DIR__ . '/../../../app/bootstrap.php';
 restore_error_handler();
 require_once __DIR__ . '/vendor/autoload.php';

dev/tests/functional/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc11",
+        "magento/mtf": "1.0.0-rc12",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",

dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php

@@ -10,27 +10,26 @@
 use Mtf\Client\Element\Locator;
 
 /**
- * Class SelectstoreElement
- * Typified element class for option group selectors
+ * Typified element class for option group selectors.
  */
 class SelectstoreElement extends SelectElement
 {
     /**
-     * Store option group selector
+     * Store option group selector.
      *
      * @var string
      */
     protected $storeGroup = 'optgroup[option[contains(.,"%s")]]';
 
     /**
-     * Website option group selector
+     * Website option group selector.
      *
      * @var string
      */
     protected $website = 'optgroup[following-sibling::optgroup[option[contains(.,"%s")]]]';
 
     /**
-     * Get the value of form element
+     * Get the value of form element.
      *
      * @return string
      */
@@ -49,22 +48,28 @@ public function getValue()
     }
 
     /**
-     * Select value in dropdown which has option groups
+     * Select value in dropdown which has option groups.
      *
      * @param string $value
      * @throws \Exception
      * @return void
      */
     public function setValue($value)
     {
-        $group = explode('/', $value);
-        $optionLocator = './/optgroup[contains(@label,"'
-            . $group[0] . '")]/following-sibling::optgroup[contains(@label,"'
-            . $group[1] . '")]/option[contains(text(), "'
-            . $group[2] . '")]';
+        $pieces = explode('/', $value);
+
+        if (1 == count($pieces)) {
+            $optionLocator = './/option[contains(text(),"' . $pieces[0] . '")]';
+        } else {
+            $optionLocator = './/optgroup[contains(@label,"'
+                . $pieces[0] . '")]/following-sibling::optgroup[contains(@label,"'
+                . $pieces[1] . '")]/option[contains(text(), "'
+                . $pieces[2] . '")]';
+        }
+
         $option = $this->_context->find($optionLocator, Locator::SELECTOR_XPATH);
         if (!$option->isVisible()) {
-            throw new \Exception('[' . implode('/', $value) . '] option is not visible in store switcher.');
+            throw new \Exception('[' . implode('/', $pieces) . '] option is not visible in store switcher.');
         }
         $option->click();
     }

dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php

@@ -41,6 +41,13 @@ class SuggestElement extends Element
      */
     protected $resultItem = './/ul/li/a[text()="%s"]';
 
+    /**
+     * Suggest state loader
+     *
+     * @var string
+     */
+    protected $suggestStateLoader = '.mage-suggest-state-loading';
+
     /**
      * Set value
      *
@@ -52,9 +59,16 @@ public function setValue($value)
         $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         $this->clear();
-        $this->find($this->suggest)->_getWrappedElement()->value($value);
-        $this->waitResult();
-        $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->click();
+        foreach (str_split($value) as $symbol) {
+            $this->find($this->suggest)->click();
+            $this->_driver->keys($symbol);
+            $this->waitResult();
+            $searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
+            if ($searchedItem->isVisible()) {
+                $searchedItem->click();
+                break;
+            }
+        }
     }
 
     /**
@@ -77,11 +91,12 @@ protected function clear()
      */
     public function waitResult()
     {
-        $browser = $this;
-        $selector = $this->searchResult;
+        $browser = clone $this;
+        $selector = $this->suggestStateLoader;
         $browser->waitUntil(
             function () use ($browser, $selector) {
-                return $browser->find($selector)->isVisible() ? true : null;
+                $element = $browser->find($selector);
+                return $element->isVisible() == false ? true : null;
             }
         );
     }

dev/tests/functional/lib/Mtf/ObjectManagerFactory.php

@@ -42,10 +42,6 @@ class ObjectManagerFactory
      */
     public function create(array $sharedInstances = [])
     {
-        if (!defined('MTF_BP')) {
-            $basePath = str_replace('\\', '/', dirname(dirname(__DIR__)));
-            define('MTF_BP', $basePath);
-        }
         if (!defined('MTF_TESTS_PATH')) {
             define('MTF_TESTS_PATH', MTF_BP . '/tests/app/');
         }

dev/tests/functional/phpunit.xml.dist

@@ -36,7 +36,8 @@
         <env name="server_config_path" value="config/server.yml.dist" />
         <env name="isolation_config_path" value="config/isolation.yml.dist" />
         <env name="handlers_config_path" value="config/handler.yml.dist" />
-        <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic" />
+        <env name="testsuite_rule" value="basic" />
+        <env name="testsuite_rule_path" value="Mtf/TestSuite/InjectableTests" />
         <env name="log_directory" value="var/log" />
         <env name="events_preset" value="base" />
         <env name="module_whitelist" value="Magento_Install" />

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/ProductForm.xml

@@ -7,7 +7,7 @@
 -->
 <tabs>
     <product-details>
-        <class>\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab</class>
+        <class>\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails</class>
         <selector>#product_info_tabs_product-details</selector>
         <strategy>css selector</strategy>
         <wrapper>product</wrapper>

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php

@@ -7,13 +7,13 @@
 namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
-use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertProductInCategory
+ * Check bundle product on the category page.
  */
 class AssertBundleInCategory extends AbstractConstraint
 {
@@ -22,19 +22,19 @@ class AssertBundleInCategory extends AbstractConstraint
     /* end tags */
 
     /**
-     * Check bundle product on the category page
+     * Check bundle product on the category page.
      *
      * @param CatalogCategoryView $catalogCategoryView
      * @param CmsIndex $cmsIndex
      * @param BundleProduct $product
-     * @param CatalogCategory $category
+     * @param Category $category
      * @return void
      */
     public function processAssert(
         CatalogCategoryView $catalogCategoryView,
         CmsIndex $cmsIndex,
         BundleProduct $product,
-        CatalogCategory $category
+        Category $category
     ) {
         //Open category view page
         $cmsIndex->open();
@@ -45,7 +45,7 @@ public function processAssert(
     }
 
     /**
-     * Verify product price on category view page
+     * Verify product price on category view page.
      *
      * @param BundleProduct $bundle
      * @param CatalogCategoryView $catalogCategoryView
@@ -57,9 +57,13 @@ protected function assertPrice(BundleProduct $bundle, CatalogCategoryView $catal
         //Price from/to verification
         $priceBlock = $catalogCategoryView->getListProductBlock()->getProductPriceBlock($bundle->getName());
 
-        $priceLow = ($bundle->getPriceView() == 'Price Range')
-            ? $priceBlock->getPriceFrom()
-            : $priceBlock->getRegularPrice();
+        if ($bundle->hasData('special_price') || $bundle->hasData('group_price')) {
+            $priceLow = $priceBlock->getFinalPrice();
+        } else {
+            $priceLow = ($bundle->getPriceView() == 'Price Range')
+                ? $priceBlock->getPriceFrom()
+                : $priceBlock->getRegularPrice();
+        }
 
         \PHPUnit_Framework_Assert::assertEquals(
             $priceData['price_from'],
@@ -76,7 +80,7 @@ protected function assertPrice(BundleProduct $bundle, CatalogCategoryView $catal
     }
 
     /**
-     * Text of Visible in category assert
+     * Text of Visible in category assert.
      *
      * @return string
      */

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php

@@ -12,7 +12,7 @@
 use Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertBundlePriceView
+ * Check displayed price view for bundle product on product page.
  */
 class AssertBundlePriceView extends AbstractConstraint
 {
@@ -41,7 +41,7 @@ public function processAssert(
     }
 
     /**
-     * Assert prices on the product view Page
+     * Assert prices on the product view Page.
      *
      * @param BundleProduct $product
      * @param CatalogProductView $catalogProductView
@@ -50,19 +50,22 @@ public function processAssert(
     protected function assertPrice(BundleProduct $product, CatalogProductView $catalogProductView)
     {
         $priceData = $product->getDataFieldConfig('price')['source']->getPreset();
+        $priceView = $product->getPriceView();
         $priceBlock = $catalogProductView->getViewBlock()->getPriceBlock();
 
-        $priceLow = ($product->getPriceView() == 'Price Range')
-            ? $priceBlock->getPriceFrom()
-            : $priceBlock->getRegularPrice();
+        if ($product->hasData('special_price') || $product->hasData('group_price')) {
+            $priceLow = $priceBlock->getFinalPrice();
+        } else {
+            $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getRegularPrice();
+        }
 
         \PHPUnit_Framework_Assert::assertEquals(
             $priceData['price_from'],
             $priceLow,
             'Bundle price From on product view page is not correct.'
         );
 
-        if ($product->getPriceView() == 'Price Range') {
+        if ($priceView == 'Price Range') {
             \PHPUnit_Framework_Assert::assertEquals(
                 $priceData['price_to'],
                 $priceBlock->getPriceTo(),
@@ -72,7 +75,7 @@ protected function assertPrice(BundleProduct $product, CatalogProductView $catal
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductPage.php

@@ -9,28 +9,35 @@
 use Magento\Catalog\Test\Constraint\AssertProductPage;
 
 /**
- * Class AssertBundleProductPage
+ * Check displayed product price on product page(front-end).
  */
 class AssertBundleProductPage extends AssertProductPage
 {
     /**
-     * Verify displayed product price on product page(front-end) equals passed from fixture
+     * Verify displayed product price on product page(front-end) equals passed from fixture.
      *
      * @return string|null
+     *
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function verifyPrice()
     {
         $priceData = $this->product->getDataFieldConfig('price')['source']->getPreset();
+        $priceView = $this->product->getPriceView();
         $priceBlock = $this->productView->getPriceBlock();
-        $priceLow = ($this->product->getPriceView() == 'Price Range')
-            ? $priceBlock->getPriceFrom()
-            : $priceBlock->getRegularPrice();
+
+        if ($this->product->hasData('special_price') || $this->product->hasData('group_price')) {
+            $priceLow = $priceBlock->getFinalPrice();
+        } else {
+            $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getRegularPrice();
+        }
+
         $errors = [];
 
         if ($priceData['price_from'] != $priceLow) {
             $errors[] = 'Bundle price "From" on product view page is not correct.';
         }
-        if ($this->product->getPriceView() == 'Price Range' && $priceData['price_to'] != $priceBlock->getPriceTo()) {
+        if ($priceView == 'Price Range' && $priceData['price_to'] != $priceBlock->getPriceTo()) {
             $errors[] = 'Bundle price "To" on product view page is not correct.';
         }
 

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php

@@ -16,6 +16,10 @@
  */
 class BundleDynamicTest extends Functional
 {
+    /* tags */
+    const TEST_TYPE = 'acceptance_test';
+    /* end tags */
+
     /**
      * Login into backend area before test
      *

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php

@@ -16,6 +16,10 @@
  */
 class BundleFixedTest extends Functional
 {
+    /* tags */
+    const TEST_TYPE = 'acceptance_test';
+    /* end tags */
+
     /**
      * Login into backend area before test
      *