Merge pull request #1017 from magento-qmt/mavericks-pr

[Mavericks] Fix functional tests fails on Jenkins: - MAGETWO-65091: [FT] Magento\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityFromProductPageTest fails on CI - MAGETWO-65135: Incorrect link/sample sorting for downloadable product while creating it by WebAPI - MAGETWO-58019: [FT] Incorrect selector for Tier price - MAGETWO-66310: [FT] Magento\Captcha\Test\TestCase\CaptchaOnAdminLoginTest is failing - MAGETWO-65405: [FT] Magento\Sales\Test\TestCase\CreateInvoiceEntityTest fails on Jenkins - MAGETWO-58066: [FT] Incorrect dataset data in PrintOrderFrontendGuestTestVariation1 - MTA-4134: Ignore functional test failures caused by Magento issues
magento · Apr 18, 2017 · f86fa3f · f86fa3f
2 parents c30a05a + 09ab03f
commit f86fa3f
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 115 deletions.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
@@ -201,11 +201,11 @@
                     </item>
                     <item name="9" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_10</item>
-                        <item name="value" xsi:type="string">12/12/2016</item>
+                        <item name="value" xsi:type="string">12/12/2017</item>
                     </item>
                     <item name="10" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_11</item>
-                        <item name="value" xsi:type="string">12/12/2016/12/30/AM</item>
+                        <item name="value" xsi:type="string">12/12/2017/12/30/AM</item>
                     </item>
                     <item name="11" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_12</item>
@@ -330,11 +330,11 @@
                     </item>
                     <item name="7" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_7</item>
-                        <item name="value" xsi:type="string">12/12/2016</item>
+                        <item name="value" xsi:type="string">12/12/2017</item>
                     </item>
                     <item name="8" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_8</item>
-                        <item name="value" xsi:type="string">12/12/2016/12/30/AM</item>
+                        <item name="value" xsi:type="string">12/12/2017/12/30/AM</item>
                     </item>
                     <item name="9" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_9</item>

diff --git a/...tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/...tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
@@ -172,7 +172,7 @@
             <data name="product/data/price/dataset" xsi:type="string">dynamic-50</data>
             <data name="product/data/weight_type" xsi:type="string">No</data>
             <data name="product/data/weight" xsi:type="string">10</data>
-            <data name="product/data/tier_price/dataset" xsi:type="string">default</data>
+            <data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
             <data name="product/data/price_view" xsi:type="string">As Low as</data>
             <data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
             <data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>
@@ -349,7 +349,7 @@
             <data name="product/data/price/dataset" xsi:type="string">fixed-100</data>
             <data name="product/data/weight_type" xsi:type="string">No</data>
             <data name="product/data/weight" xsi:type="string">10</data>
-            <data name="product/data/tier_price/dataset" xsi:type="string">default</data>
+            <data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
             <data name="product/data/price_view" xsi:type="string">As Low as</data>
             <data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
             <data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>
@@ -374,7 +374,7 @@
             <data name="product/data/price/dataset" xsi:type="string">dynamic-50</data>
             <data name="product/data/weight_type" xsi:type="string">No</data>
             <data name="product/data/weight" xsi:type="string">10</data>
-            <data name="product/data/tier_price/dataset" xsi:type="string">default</data>
+            <data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
             <data name="product/data/price_view" xsi:type="string">As Low as</data>
             <data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
             <data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>

diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.php
@@ -6,12 +6,13 @@
 
 namespace Magento\Captcha\Test\TestCase;
 
-use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
-use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnBackend;
-use Magento\Captcha\Test\Page\Captcha\AdminAuthLoginWithCaptcha;
+use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\User\Test\Fixture\User;
+use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnBackend;
+use Magento\Captcha\Test\Page\Captcha\AdminAuthLoginWithCaptcha;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
 
 /**
  * Check CAPTCHA on Admin Login Page.
@@ -30,82 +31,81 @@
 class CaptchaOnAdminLoginTest extends Injectable
 {
     /**
-     * Step factory.
+     * Admin login page with Captcha.
      *
-     * @var TestStepFactory
+     * @var AdminAuthLoginWithCaptcha
      */
-    private $stepFactory;
+    private $adminAuthWithCaptcha;
 
     /**
-     * Assert Captcha.
+     * System configuration page.
      *
-     * @var AssertCaptchaFieldOnBackend
+     * @var SystemConfigEdit
      */
-    private $assertCaptcha;
+    private $systemConfigEditPage;
 
     /**
-     * Admin login page.
+     * Login page for Admin.
      *
-     * @var AdminAuthLoginWithCaptcha
+     * @var AdminAuthLogin
      */
-    protected $adminAuthWithCaptcha;
+    private $adminAuthLogin;
 
     /**
-     * System configuration page.
+     * Factory for Test Steps.
      *
-     * @var SystemConfigEdit
+     * @var TestStepFactory
      */
-    private $systemConfigEditPage;
+    private $stepFactory;
 
     /**
-     * Configuration setting.
+     * Assert captcha on backend login page.
      *
-     * @var string
+     * @var AssertCaptchaFieldOnBackend
      */
-    private $configData;
+    private $assertCaptcha;
 
     /**
      * Injection data.
      *
+     * @param SystemConfigEdit $systemConfigEditPage
      * @param AdminAuthLoginWithCaptcha $adminAuthWithCaptcha
      * @param TestStepFactory $stepFactory
+     * @param AdminAuthLogin $adminAuthLogin
      * @param AssertCaptchaFieldOnBackend $assertCaptcha
-     * @param SystemConfigEdit $systemConfigEditPage
      * @return void
      */
     public function __inject(
+        SystemConfigEdit $systemConfigEditPage,
         AdminAuthLoginWithCaptcha $adminAuthWithCaptcha,
         TestStepFactory $stepFactory,
-        AssertCaptchaFieldOnBackend $assertCaptcha,
-        SystemConfigEdit $systemConfigEditPage
+        AdminAuthLogin $adminAuthLogin,
+        AssertCaptchaFieldOnBackend $assertCaptcha
     ) {
-        $this->stepFactory = $stepFactory;
+        $this->systemConfigEditPage = $systemConfigEditPage;
         $this->adminAuthWithCaptcha = $adminAuthWithCaptcha;
+        $this->stepFactory = $stepFactory;
+        $this->adminAuthLogin = $adminAuthLogin;
         $this->assertCaptcha = $assertCaptcha;
-        $this->systemConfigEditPage = $systemConfigEditPage;
     }
 
     /**
-     * Login user on backend.
+     * Log in user to Admin.
      *
      * @param User $customAdmin
      * @param string $configData
      * @return void
      */
-    public function test(
-        User $customAdmin,
-        $configData
-    ) {
-        $this->configData = $configData;
+    public function test(User $customAdmin, $configData)
+    {
         $customAdmin->persist();
 
         // Preconditions
         $this->stepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
-            ['configData' => $this->configData]
+            ['configData' => $configData]
         )->run();
-
-        $this->adminAuthWithCaptcha->open();
+        $this->adminAuthLogin->open();
         $this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->fill($customAdmin);
         $this->assertCaptcha->processAssert($this->adminAuthWithCaptcha);
         $this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->submit();

diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
@@ -12,7 +12,7 @@
             <data name="customAdmin/data/captcha" xsi:type="string">111</data>
             <data name="pageTitle" xsi:type="string">Dashboard</data>
             <data name="configData" xsi:type="string">captcha_backend_login</data>
-            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
+            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
     </testCase>
 </config>
diff --git a/...ctional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/...ctional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -83,9 +83,9 @@ public function assertPrice(FixtureInterface $product, View $productViewBlock)
             if (!$noError) {
                 break;
             }
-            if (count($match) < 2
-                && $match[1] != $tierPrice['price_qty']
-                || $match[2] !== number_format($tierPrice['price'], $this->priceFormat)
+            $tierPriceValue = isset($tierPrice['price']) ? $tierPrice['price'] : $tierPrice['percentage_value'];
+            if ($match[1] !== $tierPrice['price_qty']
+                || $match[2] !== number_format($tierPriceValue, $this->priceFormat)
             ) {
                 $noError = false;
                 break;

diff --git a/...functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml b/...functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\DuplicateProductEntityTest" summary="Duplicate Product" ticketId="MAGETWO-23294">
         <variation name="DuplicateProductEntityTestVariation1">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productType" xsi:type="string">catalogProductSimple::default</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" />
@@ -17,4 +16,4 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateIsNotDisplayingOnFrontend" />
         </variation>
     </testCase>
-</config>
+</config>
diff --git a/...nto/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Links.php b/...nto/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Links.php
@@ -79,7 +79,7 @@ public function fillLinks(array $fields, SimpleElement $element = null)
             }
 
             if (isset($link['sort_order'])) {
-                $currentSortOrder = (int)$link['sort_order'];
+                $currentSortOrder = (int)$link['sort_order'] - 1;
                 unset($link['sort_order']);
             } else {
                 $currentSortOrder = 0;
@@ -109,7 +109,7 @@ public function getDataLinks(array $fields = null, SimpleElement $element = null
             unset($link['sort_order']);
             $processedLink = $this->getRowBlock($index, $element)
                 ->getDataLinkRow($link);
-            $processedLink['sort_order'] = $index;
+            $processedLink['sort_order'] = $index + 1;
             $newFields['downloadable']['link'][$index] = $processedLink;
         }
         return $newFields;

diff --git a/...o/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php b/...o/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
@@ -66,7 +66,7 @@ public function fillSamples(array $fields = null, SimpleElement $element = null)
             $element->find($this->addNewSampleRow)->click();
 
             if (isset($sample['sort_order'])) {
-                $currentSortOrder = (int)$sample['sort_order'];
+                $currentSortOrder = (int)$sample['sort_order'] - 1;
                 unset($sample['sort_order']);
             } else {
                 $currentSortOrder = 0;
@@ -94,7 +94,7 @@ public function getDataSamples(array $fields = null, SimpleElement $element = nu
             unset($sample['sort_order']);
             $processedSample = $this->getRowBlock($index, $element)
                 ->getDataSampleRow($sample);
-            $processedSample['sort_order'] = $index;
+            $processedSample['sort_order'] = $index + 1;
             $newFields['downloadable']['sample'][$index] = $processedSample;
         }
         return $newFields;

diff --git a/...tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/...tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -111,7 +111,7 @@ public function getLinks()
         $linksData = [];
 
         $choiceLinks = $this->_rootElement->getElements($this->choiceLink, Locator::SELECTOR_XPATH);
-        foreach ($choiceLinks as $choiceLink) {
+        foreach ($choiceLinks as $key => $choiceLink) {
             $link = $choiceLink->find($this->linkForChoice);
             $sample = $choiceLink->find($this->sampleLinkForChoice);
             $price = $choiceLink->find($this->priceForChoice);
@@ -129,7 +129,7 @@ public function getLinks()
                     : null,
             ];
 
-            $linksData[] = array_filter($linkData);
+            $linksData[$key + 1] = array_filter($linkData);
         }
 
         return $linksData;

diff --git a/...sts/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php b/...sts/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
@@ -49,8 +49,8 @@ public function getLinks()
         $links = $this->_rootElement->getElements($this->linkTitle);
         $linksData = [];
 
-        foreach ($links as $link) {
-            $linksData[] = [
+        foreach ($links as $key => $link) {
+            $linksData[$key + 1] = [
                 'title' => $link->getText(),
             ];
         }

diff --git a/...s/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml b/...s/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml
@@ -17,7 +17,7 @@
                         <item name="price" xsi:type="string">2</item>
                         <item name="is_shareable" xsi:type="string">Use config</item>
                         <item name="number_of_downloads" xsi:type="string">2</item>
-                        <item name="sort_order" xsi:type="string">1</item>
+                        <item name="sort_order" xsi:type="number">1</item>
                         <item name="sample" xsi:type="array">
                             <item name="sample_type" xsi:type="string">URL</item>
                             <item name="sample_url" xsi:type="string">http://example.com</item>
@@ -39,7 +39,7 @@
                         <item name="price" xsi:type="string">2</item>
                         <item name="is_shareable" xsi:type="string">Use config</item>
                         <item name="number_of_downloads" xsi:type="string">2</item>
-                        <item name="sort_order" xsi:type="string">1</item>
+                        <item name="sort_order" xsi:type="number">1</item>
                         <item name="sample" xsi:type="array">
                             <item name="sample_type" xsi:type="string">URL</item>
                             <item name="sample_url" xsi:type="string">http://example.com</item>
@@ -67,7 +67,7 @@
                         <item name="file_type" xsi:type="string">URL</item>
                         <item name="file_link_url" xsi:type="string">http://example.com</item>
                         <item name="is_shareable" xsi:type="string">No</item>
-                        <item name="sort_order" xsi:type="string">0</item>
+                        <item name="sort_order" xsi:type="number">1</item>
                     </item>
                     <item name="1" xsi:type="array">
                         <item name="title" xsi:type="string">link-2-%isolation%</item>
@@ -80,7 +80,7 @@
                         <item name="file_type" xsi:type="string">URL</item>
                         <item name="file_link_url" xsi:type="string">http://example.com</item>
                         <item name="is_shareable" xsi:type="string">Yes</item>
-                        <item name="sort_order" xsi:type="string">1</item>
+                        <item name="sort_order" xsi:type="number">2</item>
                     </item>
                 </item>
             </field>
@@ -102,7 +102,7 @@
                         <item name="file_type" xsi:type="string">URL</item>
                         <item name="file_link_url" xsi:type="string">http://example.com</item>
                         <item name="is_shareable" xsi:type="string">No</item>
-                        <item name="sort_order" xsi:type="string">0</item>
+                        <item name="sort_order" xsi:type="number">1</item>
                     </item>
                     <item name="1" xsi:type="array">
                         <item name="title" xsi:type="string">link-2-%isolation%</item>
@@ -115,7 +115,7 @@
                         <item name="file_type" xsi:type="string">URL</item>
                         <item name="file_link_url" xsi:type="string">http://example.com</item>
                         <item name="is_shareable" xsi:type="string">Yes</item>
-                        <item name="sort_order" xsi:type="string">2</item>
+                        <item name="sort_order" xsi:type="number">3</item>
                     </item>
                     <item name="2" xsi:type="array">
                         <item name="title" xsi:type="string">link-3-%isolation%</item>
@@ -128,7 +128,7 @@
                         <item name="file_type" xsi:type="string">URL</item>
                         <item name="file_link_url" xsi:type="string">http://example.com</item>
                         <item name="is_shareable" xsi:type="string">Yes</item>
-                        <item name="sort_order" xsi:type="string">1</item>
+                        <item name="sort_order" xsi:type="number">2</item>
                     </item>
                 </item>
             </field>

diff --git a/...functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml b/...functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml
@@ -15,13 +15,13 @@
                         <item name="title" xsi:type="string">sample1%isolation%</item>
                         <item name="sample_type" xsi:type="string">URL</item>
                         <item name="sample_url" xsi:type="string">http://example.com</item>
-                        <item name="sort_order" xsi:type="string">1</item>
+                        <item name="sort_order" xsi:type="number">2</item>
                     </item>
                     <item name="1" xsi:type="array">
                         <item name="title" xsi:type="string">sample2%isolation%</item>
                         <item name="sample_type" xsi:type="string">URL</item>
                         <item name="sample_url" xsi:type="string">http://example.com</item>
-                        <item name="sort_order" xsi:type="string">0</item>
+                        <item name="sort_order" xsi:type="number">1</item>
                     </item>
                 </item>
             </field>
@@ -35,19 +35,19 @@
                         <item name="title" xsi:type="string">sample1%isolation%</item>
                         <item name="sample_type" xsi:type="string">URL</item>
                         <item name="sample_url" xsi:type="string">http://example.com</item>
-                        <item name="sort_order" xsi:type="string">0</item>
+                        <item name="sort_order" xsi:type="number">1</item>
                     </item>
                     <item name="1" xsi:type="array">
                         <item name="title" xsi:type="string">sample2%isolation%</item>
                         <item name="sample_type" xsi:type="string">URL</item>
                         <item name="sample_url" xsi:type="string">http://example.com</item>
-                        <item name="sort_order" xsi:type="string">2</item>
+                        <item name="sort_order" xsi:type="number">3</item>
                     </item>
                     <item name="2" xsi:type="array">
                         <item name="title" xsi:type="string">sample3%isolation%</item>
                         <item name="sample_type" xsi:type="string">URL</item>
                         <item name="sample_url" xsi:type="string">http://example.com</item>
-                        <item name="sort_order" xsi:type="string">1</item>
+                        <item name="sort_order" xsi:type="number">2</item>
                     </item>
                 </item>
             </field>