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 index fc33d28419ed4..017149176b70e 100644 --- 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 @@ attribute_key_10 - 12/12/2016 + 12/12/2017 attribute_key_11 - 12/12/2016/12/30/AM + 12/12/2017/12/30/AM attribute_key_12 @@ -330,11 +330,11 @@ attribute_key_7 - 12/12/2016 + 12/12/2017 attribute_key_8 - 12/12/2016/12/30/AM + 12/12/2017/12/30/AM attribute_key_9 diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml index ec5008baf04ea..79634a826a6ba 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml @@ -172,7 +172,7 @@ dynamic-50 No 10 - default + custom_with_percentage_discount As Low as No No @@ -349,7 +349,7 @@ fixed-100 No 10 - default + custom_with_percentage_discount As Low as No No @@ -374,7 +374,7 @@ dynamic-50 No 10 - default + custom_with_percentage_discount As Low as No No 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 index f49048496f4ce..9c7ef29a226b9 100644 --- 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 index 8beae73601534..186439bb9f157 100644 --- 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 @@ 111 Dashboard captcha_backend_login - + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php index 9382debdde19a..e962127774e8f 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php +++ b/dev/tests/functional/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/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml index 45d8abc4d183b..76fe61855de19 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml @@ -8,7 +8,6 @@ - to_maintain:yes catalogProductSimple::default @@ -17,4 +16,4 @@ - + \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Links.php index 41d78d5a6de24..cae22f1b9b0b7 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Links.php +++ b/dev/tests/functional/tests/app/Magento/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/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php index a788c6a0f68c8..98c7e1abf0d88 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php +++ b/dev/tests/functional/tests/app/Magento/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/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php index 5e303a0e572ec..3d3920f28a733 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php +++ b/dev/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/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php index 400091d9fa882..445a087b11ff9 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php +++ b/dev/tests/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/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml index 707a94a6712e9..7c0647f64eeeb 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml @@ -17,7 +17,7 @@ 2 Use config 2 - 1 + 1 URL http://example.com @@ -39,7 +39,7 @@ 2 Use config 2 - 1 + 1 URL http://example.com @@ -67,7 +67,7 @@ URL http://example.com No - 0 + 1 link-2-%isolation% @@ -80,7 +80,7 @@ URL http://example.com Yes - 1 + 2 @@ -102,7 +102,7 @@ URL http://example.com No - 0 + 1 link-2-%isolation% @@ -115,7 +115,7 @@ URL http://example.com Yes - 2 + 3 link-3-%isolation% @@ -128,7 +128,7 @@ URL http://example.com Yes - 1 + 2 diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml index 6c62a7d00cfaa..de508b901d57a 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml @@ -15,13 +15,13 @@ sample1%isolation% URL http://example.com - 1 + 2 sample2%isolation% URL http://example.com - 0 + 1 @@ -35,19 +35,19 @@ sample1%isolation% URL http://example.com - 0 + 1 sample2%isolation% URL http://example.com - 2 + 3 sample3%isolation% URL http://example.com - 1 + 2 diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml index c240a28161516..5afe815edad45 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml @@ -23,9 +23,7 @@ - - stable:no - Create product with default set links + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 100 @@ -42,8 +40,9 @@ - - Create product with default sets samples and links + + to_maintain:yes + MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins DownloadableProduct_%isolation% DownloadableProduct_%isolation% 1 @@ -54,7 +53,6 @@ with_two_samples with_two_separately_links downloadableproduct-%isolation% - to_maintain:yes @@ -62,8 +60,7 @@ - - Create product with custom options + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 33 @@ -81,8 +78,9 @@ - - Create product without category + + to_maintain:yes + MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins DownloadableProduct_%isolation% DownloadableProduct_%isolation% 55 @@ -93,7 +91,6 @@ with_three_links two_options downloadableproduct-%isolation% - to_maintain:yes @@ -104,8 +101,7 @@ - - Create product with out of stock status + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 100 @@ -120,9 +116,7 @@ - - stable:no - Create product with manage stock + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 9999 @@ -138,9 +132,7 @@ - - stable:no - Create product without tax class id + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 98 @@ -156,8 +148,8 @@ - - Create product with import custom options + + MAGETWO-59316: Sort order of Customizable Options isn't taken into account while creating Product via Webapi DownloadableProduct_%isolation% DownloadableProduct_%isolation% 57 @@ -171,7 +163,6 @@ default catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option downloadableproduct-%isolation% - to_maintain:yes @@ -180,8 +171,9 @@ - - Create product with three links + + to_maintain:yes + MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins DownloadableProduct_%isolation% DownloadableProduct_%isolation% 65 @@ -195,7 +187,6 @@ with_three_links default downloadableproduct-%isolation% - to_maintain:yes @@ -204,8 +195,9 @@ - - Create product with three links without description + + to_maintain:yes + MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins DownloadableProduct_%isolation% DownloadableProduct_%isolation% 65 @@ -217,7 +209,6 @@ with_three_links default downloadableproduct-%isolation% - to_maintain:yes @@ -225,8 +216,7 @@ - - Create product without filling quantity and stock + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 100 @@ -240,8 +230,7 @@ - - Create product with special price + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 10 @@ -258,8 +247,7 @@ - - Create product with group price + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 365 @@ -274,8 +262,7 @@ - - Create product with tier price + DownloadableProduct_%isolation% DownloadableProduct_%isolation% 250 @@ -286,7 +273,6 @@ with_two_separately_links default downloadableproduct-%isolation% - to_maintain:yes @@ -294,7 +280,6 @@ - to_maintain:yes DownloadableProduct_%isolation% DownloadableProduct_%isolation% 350 diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml index a28532e81423f..3207e4efb5de1 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DuplicateProductEntityTest.xml @@ -6,14 +6,13 @@ */ --> - - + + downloadableProduct::default - to_maintain:yes - - - - + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml index 1a06bbbf21257..1526e9cba13be 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml @@ -8,6 +8,7 @@ + MAGETWO-65659: [FT] Magento\Sales\Test\TestCase\CreateCreditMemoEntityTest fails randomly on Jenkins 0 diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml index df44083200e40..dabacdb73c2b9 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.xml @@ -8,7 +8,6 @@ - to_maintain:yes johndoe_with_addresses @@ -18,9 +17,9 @@ checkmo - bundleProduct::bundle_dynamic_product + downloadableProduct::default configurableProduct::default - downloadableProduct::default + bundleProduct::bundle_dynamic_product 602.43 25 -270 diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php index b814e3a1a8df0..0ba457fd3b668 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php @@ -107,7 +107,7 @@ public function run() $orderId = trim($this->salesOrderView->getTitleBlock()->getTitle(), '#'); $data = [ 'id' => $orderId, - 'customer_id' => ['customer' => $this->customer->getData()], + 'customer_id' => ['customer' => $this->customer], 'entity_id' => ['products' => $this->products], 'billing_address_id' => ['billingAddress' => $this->billingAddress], ]; diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml index df20d40200e12..079c2eff19f61 100644 --- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml +++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnLoginPageTest.xml @@ -8,7 +8,7 @@ - severity:S1, to_maintain:yes + severity:S1 customer_max_login_failures_number default incorrect password