diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php index 302139354092fc6fdc2cb429056cbadfc1b016b3..1b8a503460cb66420e9bdd96081ec270807a7201 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php @@ -49,7 +49,7 @@ class FormPageActions extends PageActions * * @var string */ - protected $deleteButton = '#delete'; + protected $deleteButton = '.delete'; /** * Magento loader diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php index eec1be1fcf543149fbcc08a034fa02628c4065c2..ea1a27a09e26292c9a81f23f6cb9f7f07e4c407e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php @@ -32,13 +32,6 @@ class Sidebar extends ListCompare */ protected $clearAll = '#compare-clear-all'; - /** - * Selector for alert. - * - * @var string - */ - protected $alertModal = '._show[data-role=modal]'; - /** * Get compare products block content. * @@ -86,9 +79,6 @@ class Sidebar extends ListCompare } ); $this->_rootElement->find($this->clearAll)->click(); - $element = $this->browser->find($this->alertModal); - /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */ - $modal = $this->blockFactory->create('Magento\Ui\Test\Block\Adminhtml\Modal', ['element' => $element]); - $modal->acceptAlert(); + $this->browser->acceptAlert(); } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml index f46eff7dac4b8327c03897fbc0a3cbf41d78c166..97aee8c72ce214831cfb85b0cf9364031e8b3060 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml @@ -271,7 +271,6 @@ <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" /> - <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" /> </variation> <variation name="CreateSimpleProductEntityTestVariation16"> <data name="description" xsi:type="string">Create product with tax class and check absent special price</data> diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml index 395b421268e0bf96b0be6b9210fc3522e4e8ce54..dc3aadb36e7f531a80690bd9be70883b2f792d75 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml @@ -76,7 +76,6 @@ <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" /> - <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" /> </variation> <variation name="CreateVirtualProductEntityTestVariation6"> diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml index 3c3dda5716404d0881365783bb907a9536359bdf..b967e6f87b9f6aef7248b117e07ec8da47d7c4cb 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml @@ -118,7 +118,6 @@ <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" /> - <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" /> </variation> @@ -210,7 +209,6 @@ <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage" /> - <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" /> diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php index b6a01ebf559c7138dba4bb600ae6fa81c960a087..8b2bfcbd56d4f4f3b90a03d9ecdad7b39d322efd 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php @@ -10,83 +10,82 @@ use Magento\Mtf\Block\Block; use Magento\Mtf\Client\Locator; /** - * Class Totals - * Cart totals block + * Cart totals block. */ class Totals extends Block { /** - * Grand total search mask + * Grand total search mask. * * @var string */ protected $grandTotal = '.grand.totals .price'; /** - * Grand total search mask + * Grand total search mask. * * @var string */ protected $grandTotalExclTax = '.totals.grand.excl span'; /** - * Grand total search mask + * Grand total search mask. * * @var string */ protected $grandTotalInclTax = '.totals.grand.incl span'; /** - * Subtotal search mask + * Subtotal search mask. * * @var string */ protected $subtotal = '.totals.sub .price'; /** - * Subtotal search mask + * Subtotal search mask. * * @var string */ protected $subtotalExclTax = '.totals.sub.excl .price'; /** - * Subtotal search mask + * Subtotal search mask. * * @var string */ protected $subtotalInclTax = '.totals.sub.incl .price'; /** - * Tax search mask + * Tax search mask. * * @var string */ protected $tax = '.totals-tax span'; /** - * Get shipping price selector + * Get shipping price selector. * * @var string */ protected $shippingPriceSelector = '.shipping.excl .price'; /** - * Get discount + * Get discount. * * @var string */ protected $discount = '[class=totals] .amount .price'; /** - * Get shipping price including tax selector + * Get shipping price including tax selector. * * @var string */ protected $shippingPriceInclTaxSelector = '.shipping.incl .price'; /** - * Get shipping price block selector + * Get shipping price block selector. * * @var string */ @@ -100,7 +99,7 @@ class Totals extends Block protected $blockWaitElement = '.loading-mask'; /** - * Get Grand Total Text + * Get Grand Total Text. * * @return string */ @@ -111,7 +110,7 @@ class Totals extends Block } /** - * Get Grand Total Text + * Get Grand Total Text. * * @return string|null */ @@ -122,7 +121,7 @@ class Totals extends Block } /** - * Get Grand Total Text + * Get Grand Total Text. * * @return string|null */ @@ -133,7 +132,7 @@ class Totals extends Block } /** - * Get Tax text from Order Totals + * Get Tax text from Order Totals. * * @return string|null */ @@ -144,7 +143,7 @@ class Totals extends Block } /** - * Check that Tax is visible + * Check that Tax is visible. * * @return bool */ @@ -154,7 +153,7 @@ class Totals extends Block } /** - * Get Subtotal text + * Get Subtotal text. * * @return string */ @@ -165,7 +164,7 @@ class Totals extends Block } /** - * Get Subtotal text + * Get Subtotal text. * * @return string|null */ @@ -176,7 +175,7 @@ class Totals extends Block } /** - * Get Subtotal text + * Get Subtotal text. * * @return string|null */ @@ -187,7 +186,7 @@ class Totals extends Block } /** - * Method that escapes currency symbols + * Method that escapes currency symbols. * * @param string $price * @return string|null @@ -199,7 +198,7 @@ class Totals extends Block } /** - * Get discount + * Get discount. * * @return string|null */ @@ -210,7 +209,7 @@ class Totals extends Block } /** - * Get shipping price + * Get shipping price. * * @return string|null */ @@ -221,7 +220,7 @@ class Totals extends Block } /** - * Get shipping price + * Get shipping price. * * @return string|null */ @@ -232,7 +231,7 @@ class Totals extends Block } /** - * Is visible shipping price block + * Is visible shipping price block. * * @return bool */ 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 5c8e12cbb0e1a2ed8bb50c24311a3af37987acb0..89234e4b9a12c71824d2c7017e485202f061a813 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 @@ -276,7 +276,6 @@ <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" /> <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" /> <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" /> - <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" /> </variation> <variation name="CreateDownloadableProductEntityTestVariation15"> <data name="description" xsi:type="string">Create product with tier price</data> diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml index cb1a5aca17524aae46a1fa235d0c31b6c0a353a5..580de1cac6f912292b16b8973f23376f4aad5282 100644 --- a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml +++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml @@ -18,6 +18,7 @@ <data name="cart/data/shipping_method" xsi:type="string">International Economy</data> <data name="payment/method" xsi:type="string">checkmo</data> <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data> + <data name="tag" xsi:type="string">test_type:3rd_party_test</data> <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" /> <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" /> <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" /> diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php deleted file mode 100644 index e3c8e2bd1dbd4dc687469b7fe8a005419c5c0bd9..0000000000000000000000000000000000000000 --- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php +++ /dev/null @@ -1,51 +0,0 @@ -<?php -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ - -namespace Magento\GroupedProduct\Test\Constraint; - -use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage; -use Magento\Catalog\Test\Page\Product\CatalogProductView; -use Magento\GroupedProduct\Test\Fixture\GroupedProduct; -use Magento\Mtf\Client\BrowserInterface; - -/** - * Class AssertGroupedPriceOnGroupedProductPage - * Assert that displayed grouped price on grouped product page equals passed from fixture - */ -class AssertGroupedPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage -{ - /** - * Format error message - * - * @var string - */ - protected $errorMessage = 'This "%s" product\'s grouped price on product page NOT equals passed from fixture.'; - - /** - * Successful message - * - * @var string - */ - protected $successfulMessage = 'Displayed grouped price on grouped product page equals to passed from a fixture.'; - - /** - * Assert that displayed grouped price on grouped product page equals passed from fixture - * - * @param CatalogProductView $catalogProductView - * @param GroupedProduct $product - * @param AssertProductGroupedPriceOnProductPage $groupedPrice - * @param BrowserInterface $browser - * @return void - */ - public function processAssert( - CatalogProductView $catalogProductView, - GroupedProduct $product, - AssertProductGroupedPriceOnProductPage $groupedPrice, - BrowserInterface $browser - ) { - $this->processAssertPrice($product, $catalogProductView, $groupedPrice, $browser); - } -} diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php index 237220b311476199a9e5af93598c3f4f89c34d5a..f034bbb2c52b7b34ed7e061a882a71d78a8e67fa 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php @@ -10,104 +10,103 @@ use Magento\Mtf\Block\Block; use Magento\Mtf\Client\Locator; /** - * Class Actions - * Order actions block + * Order actions block. */ class Actions extends Block { /** - * 'Back' button + * 'Back' button. * * @var string */ protected $back = '#back'; /** - * 'Edit' button + * 'Edit' button. * * @var string */ protected $edit = '#order_edit'; /** - * 'Cancel' button + * 'Cancel' button. * * @var string */ - protected $cancel = '#order_cancel'; + protected $cancel = '[id$=cancel-button]'; /** - * 'Send Email' button + * 'Send Email' button. * * @var string */ protected $sendEmail = '#send_notification'; /** - * 'Void' button + * 'Void' button. * * @var string */ protected $void = '#void_payment'; /** - * 'Hold' button + * 'Hold' button. * * @var string */ - protected $hold = '#order_hold'; + protected $hold = '[id$=hold-button]'; /** - * 'Invoice' button + * 'Invoice' button. * * @var string */ protected $invoice = '#order_invoice'; /** - * 'Reorder' button + * 'Reorder' button. * * @var string */ protected $reorder = '#order_reorder'; /** - * 'Ship' button + * 'Ship' button. * * @var string */ protected $ship = '#order_ship'; /** - * 'Credit Memo' button on the order page + * 'Credit Memo' button on the order page. * * @var string */ protected $orderCreditMemo = '#order_creditmemo'; /** - * 'Credit Memo' button on the order invoice page + * 'Credit Memo' button on the order invoice page. * * @var string */ protected $orderInvoiceCreditMemo = '#capture'; /** - * 'Refund' button + * 'Refund' button. * * @var string */ protected $refund = '.submit-button.refund'; /** - * 'Refund Offline' button + * 'Refund Offline' button. * * @var string */ protected $refundOffline = '.submit-button'; /** - * General button selector + * General button selector. * * @var string */ @@ -121,7 +120,7 @@ class Actions extends Block protected $confirmModal = '.confirm._show[data-role=modal]'; /** - * Ship order + * Ship order. * * @return void */ @@ -131,7 +130,7 @@ class Actions extends Block } /** - * Invoice order + * Invoice order. * * @return void */ @@ -141,7 +140,7 @@ class Actions extends Block } /** - * Reorder order + * Reorder order. * * @return void */ @@ -151,7 +150,7 @@ class Actions extends Block } /** - * Go back + * Go back. * * @return void */ @@ -161,7 +160,7 @@ class Actions extends Block } /** - * Edit order + * Edit order. * * @return void */ @@ -171,7 +170,7 @@ class Actions extends Block } /** - * Cancel order + * Cancel order. * * @return void */ @@ -185,7 +184,7 @@ class Actions extends Block } /** - * Send email + * Send email. * * @return void */ @@ -195,7 +194,7 @@ class Actions extends Block } /** - * Void order + * Void order. * * @return void */ @@ -205,7 +204,7 @@ class Actions extends Block } /** - * Hold order + * Hold order. * * @return void */ @@ -215,7 +214,7 @@ class Actions extends Block } /** - * Order credit memo + * Order credit memo. * * @return void */ @@ -225,7 +224,7 @@ class Actions extends Block } /** - * Order invoice credit memo + * Order invoice credit memo. * * @return void */ @@ -235,7 +234,7 @@ class Actions extends Block } /** - * Refund order + * Refund order. * * @return void */ @@ -245,7 +244,7 @@ class Actions extends Block } /** - * Refund offline order + * Refund offline order. * * @return void */ @@ -255,7 +254,7 @@ class Actions extends Block } /** - * Check if action button is visible + * Check if action button is visible. * * @param string $buttonName * @return bool diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php index 30ee53017146c24b9afebd9546848862a80fa03b..4c06dede0433d327fc106acfc7cb45fa4f3b55c2 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php @@ -9,20 +9,19 @@ namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit; use Magento\Mtf\Block\Form as FormInterface; /** - * Class TaxRate - * Tax rate block + * Tax rate block. */ class TaxRate extends FormInterface { /** - * 'Save' button on dialog window for creating new tax rate + * 'Save' button on dialog window for creating new tax rate. * * @var string */ - protected $saveTaxRate = '#tax-rule-edit-apply-button'; + protected $saveTaxRate = '.action-save'; /** - * Clicking 'Save' button on dialog window for creating new tax rate + * Clicking 'Save' button on dialog window for creating new tax rate. * * @return void */ diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php index 51caa4822fa60fd38b18c1df6c132bfa8ec876e0..e66cdb00918e84cfe6d415ca30a4284220203c54 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php @@ -17,65 +17,65 @@ use Magento\Mtf\Constraint\AbstractConstraint; use Magento\Mtf\Fixture\FixtureFactory; /** - * Abstract class for implementing assert applying + * Abstract class for implementing assert applying. */ abstract class AssertTaxRuleApplying extends AbstractConstraint { /** - * Initial tax rule + * Initial tax rule. * * @var TaxRule */ protected $initialTaxRule; /** - * Tax rule + * Tax rule. * * @var TaxRule */ protected $taxRule; /** - * Product simple + * Product simple. * * @var CatalogProductSimple */ protected $productSimple; /** - * Checkout cart page + * Checkout cart page. * * @var CheckoutCart */ protected $checkoutCart; /** - * Shipping carrier and method + * Shipping carrier and method. * * @var array */ protected $shipping; /** - * Tax Rule name + * Tax Rule name. * * @var string */ protected $taxRuleCode; /** - * Implementation assert + * Implementation assert. * * @return void */ abstract protected function assert(); /** - * 1. Creating product simple with custom tax product class - * 2. Log In as customer - * 3. Add product to shopping cart - * 4. Estimate Shipping and Tax - * 5. Implementation assert + * 1. Creating product simple with custom tax product class. + * 2. Log In as customer. + * 3. Add product to shopping cart. + * 4. Estimate Shipping and Tax. + * 5. Implementation assert. * * @param FixtureFactory $fixtureFactory * @param TaxRule $taxRule @@ -136,9 +136,7 @@ abstract class AssertTaxRuleApplying extends AbstractConstraint $catalogProductView->getMessagesBlock()->waitSuccessMessage(); // Estimate Shipping and Tax $checkoutCart->open(); - $checkoutCart->getShippingBlock()->openEstimateShippingAndTax(); - $checkoutCart->getShippingBlock()->fill($address); - $checkoutCart->getShippingBlock()->clickGetQuote(); + $checkoutCart->getShippingBlock()->fillEstimateShippingAndTax($address); $checkoutCart->getShippingBlock()->selectShippingMethod($shipping); $this->assert(); }