From a224e644edb335d1ae454c25bd447d0b9d7f0e7c Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Thu, 12 Mar 2020 08:46:15 -0500 Subject: [PATCH 1/3] MQE-683: [Deprecation] Only use more nested assertion syntax - Applied update script --- ...minAttributeTextSwatchesCanBeFiledTest.xml | 8 +- ...AndDeveloperConfigInProductionModeTest.xml | 4 +- .../Test/AdminDashboardWithChartsChart.xml | 5 +- .../BraintreeCreditCardOnCheckoutTest.xml | 10 +- .../StorefrontAddBundleOptionsToCartTest.xml | 5 +- .../Mftf/Test/StorefrontAdminEditDataTest.xml | 5 +- .../Test/StorefrontEditBundleProductTest.xml | 5 +- ...eckCustomizableOptionImportActionGroup.xml | 15 ++- .../CheckProductsOrderActionGroup.xml | 10 +- ...ctSpecialPriceOnProductPageActionGroup.xml | 5 +- .../AddOutOfStockProductToCompareListTest.xml | 10 +- .../AdminCloneProductWithDuplicateUrlTest.xml | 20 ++- .../Mftf/Test/AdminCreateCategoryTest.xml | 5 +- ...roductsImageInCaseOfMultipleStoresTest.xml | 10 +- ...edFieldsHaveRequiredFieldIndicatorTest.xml | 25 +++- ...eForProductOptionsWithoutTierPriceTest.xml | 5 +- .../Test/Mftf/Test/EndToEndB2CAdminTest.xml | 40 ++++-- .../Mftf/Test/EndToEndB2CGuestUserTest.xml | 90 ++++++++++--- .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml | 45 +++++-- ...goryHighlightedAndProductDisplayedTest.xml | 20 ++- ...heckDefaultNumberProductsToDisplayTest.xml | 12 +- ...ceForDifferentTimezonesForWebsitesTest.xml | 5 +- ...talogPriceRuleWithConditionActionGroup.xml | 5 +- ...tributeIsUndefinedCatalogPriceRuleTest.xml | 20 ++- .../Mftf/Test/EndToEndB2CGuestUserTest.xml | 40 ++++-- .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml | 20 ++- ...ltBillingAndShippingAddressActionGroup.xml | 5 +- ...refrontCheckoutCheckProductActionGroup.xml | 5 +- .../Mftf/Test/EndToEndB2CGuestUserTest.xml | 110 ++++++++++++---- .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml | 55 ++++++-- .../OnePageCheckoutUsingSignInLinkTest.xml | 5 +- ...OnePageCheckoutWithAllProductTypesTest.xml | 15 ++- ...ateShoppingCartWhileUpdateMinicartTest.xml | 10 +- ...ntOnePageCheckoutDataWhenChangeQtyTest.xml | 45 +++++-- ...tOnCheckoutPageDifferentStoreViewsTest.xml | 30 ++++- ...ConfigurableProductUpdateAttributeTest.xml | 5 +- .../Mftf/Test/EndToEndB2CGuestUserTest.xml | 110 ++++++++++++---- .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml | 55 ++++++-- ...minCurrencySymbolIsDisabledActionGroup.xml | 5 +- ...opUpPasswordAutoCompleteOffActionGroup.xml | 4 +- ...rontPasswordAutocompleteOffActionGroup.xml | 4 +- ...aultBillingShippingCustomerAddressTest.xml | 8 +- ...aultBillingShippingCustomerAddressTest.xml | 8 +- ...inSetCustomerDefaultBillingAddressTest.xml | 4 +- ...nSetCustomerDefaultShippingAddressTest.xml | 4 +- ...CountriesRestrictionApplyOnBackendTest.xml | 5 +- .../VerifyDisabledCustomerGroupFieldTest.xml | 4 +- ...utFieldsDisabledAfterAppConfigDumpTest.xml | 70 ++++++++-- .../AdminElasticConnectionTestActionGroup.xml | 5 +- ...utFieldsDisabledAfterAppConfigDumpTest.xml | 85 ++++++++++--- .../Test/AdminCreatingShippingLabelTest.xml | 10 +- ...hMapAssignedConfigProductIsCorrectTest.xml | 20 ++- .../CancelOrdersInOrderSalesReportTest.xml | 5 +- ...rtAdminCreditMemoGrandTotalActionGroup.xml | 5 +- ...rifyCreatedOrderInformationActionGroup.xml | 4 +- ...ectnessInvoicedItemInBundleProductTest.xml | 5 +- ...reateCreditMemoBankTransferPaymentTest.xml | 8 +- ...AdminCreateCreditMemoPartialRefundTest.xml | 8 +- ...CreateCreditMemoWithCashOnDeliveryTest.xml | 8 +- ...nCreateCreditMemoWithPurchaseOrderTest.xml | 8 +- ...minCreateOrderWithDateTimeOptionUITest.xml | 5 +- ...reateOrderWithMinimumAmountEnabledTest.xml | 4 +- ...nMassOrdersCancelCompleteAndClosedTest.xml | 8 +- ...assOrdersCancelProcessingAndClosedTest.xml | 8 +- .../AdminMassOrdersHoldOnCompleteTest.xml | 4 +- ...ssOrdersHoldOnPendingAndProcessingTest.xml | 8 +- ...AdminMassOrdersReleasePendingOrderTest.xml | 4 +- ...MassOrdersUpdateCancelPendingOrderTest.xml | 4 +- .../AdminOrdersReleaseInUnholdStatusTest.xml | 4 +- ...editMemoTotalAfterShippingDiscountTest.xml | 20 ++- .../Test/Mftf/Test/EndToEndB2CAdminTest.xml | 9 +- .../Test/StorefrontPrintOrderGuestTest.xml | 12 +- ...eatedShipmentInShipmentsTabActionGroup.xml | 4 +- ...utFieldsDisabledAfterAppConfigDumpTest.xml | 105 ++++++++++++--- ...tImageColorWhenFilterByColorFilterTest.xml | 10 +- .../AdminTaxCalcWithApplyTaxOnSettingTest.xml | 10 +- ...StorefrontCheckElementColorActionGroup.xml | 5 +- ...lementInTranslateInlineModeActionGroup.xml | 15 ++- ...utFieldsDisabledAfterAppConfigDumpTest.xml | 120 ++++++++++++++---- .../Mftf/Test/DefaultConfigForUPSTypeTest.xml | 5 +- ...utFieldsDisabledAfterAppConfigDumpTest.xml | 95 +++++++++++--- .../Test/EndToEndB2CGuestUserTest.xml | 20 ++- .../Test/EndToEndB2CLoggedInUserTest.xml | 10 +- 83 files changed, 1328 insertions(+), 342 deletions(-) diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml index 32201e03f92ec..851d2447dfc15 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml @@ -110,7 +110,11 @@ - - + + $grabSwatchForAdmin + + + $grabDescriptionForAdmin + diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml index ae7722b225cdd..16bde998b9fb3 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml @@ -28,7 +28,9 @@ - + + + diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml index e82d54280d4e1..84e6b59e01504 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml @@ -120,6 +120,9 @@ - + + $grabEndQuantity + $grabStartQuantity + diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml index 9a1110bfda29a..0747e785c4ae4 100644 --- a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml +++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml @@ -105,7 +105,13 @@ - - + + $billingAddr + $shippingAddr + + + $billingAddr + $additionalAddress + diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml index 38926ccfbb7d6..296ba31baa589 100644 --- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml +++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml @@ -108,7 +108,10 @@ - + + $grabProductsPrice + $123.00 + diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml index 05100284a3fe9..22b746ce69046 100644 --- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml +++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml @@ -103,7 +103,10 @@ - + + {$grabTotalAfter} + {$grabTotalBefore} + diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml index 3a40a1b7eeb71..fe6aa4ff1d928 100644 --- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml +++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml @@ -115,7 +115,10 @@ - + + {$grabTotalAfter} + {$grabTotalBefore} + diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml index efd0986efca06..d2d03600afbbd 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml @@ -20,8 +20,17 @@ - - - + + $grabOptionTitle + {{option.title}} + + + $grabOptionPrice + {{option.price}} + + + $grabOptionSku + {{option.title}} + diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml index 6f58299fe1446..d804958caad44 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml @@ -25,8 +25,14 @@ - + + ($grabFirstProductName1_1) + {{product_1.name}} + - + + ($grabFirstProductName2_2) + {{product_2.name}} + diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml index cb2753fa64fc6..39184c1c37cc9 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml @@ -20,6 +20,9 @@ - + + $grabProductSpecialPrice + {{specialPrice}} + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml index b34e73a7ede9f..777bbcbcf37aa 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml @@ -61,7 +61,10 @@ - + + ($grabTextFromSuccessMessage) + You added product $$product.name$$ to the comparison list. + @@ -83,7 +86,10 @@ - + + ($grabTextFromSuccessMessage) + You added product $$product.name$$ to the comparison list. + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml index a213f2af900cf..adda0e017cbec 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCloneProductWithDuplicateUrlTest.xml @@ -41,8 +41,14 @@ - - + + $grabDuplicatedProductUrlKey + $$createSimpleProduct.custom_attributes[url_key]$$ + + + $grabDuplicatedProductUrlKey + -1 + @@ -69,8 +75,14 @@ - - + + $grabSecondDuplicatedProductUrlKey + $$createSimpleProduct.custom_attributes[url_key]$$ + + + $grabSecondDuplicatedProductUrlKey + -2 + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml index 44a83f2dbadd4..72a44cb231b46 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml @@ -98,6 +98,9 @@ - + + getRequiredFieldIndicator + "*" + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml index 9ed0a8104faa1..bbeddf43aecff 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml @@ -174,13 +174,19 @@ - + + $grabAttributeFromImage + {{ProductImage.filename}} + - + + $grabAttributeFromImage2 + small_image + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml index 45c2c9d379033..d2822a53b1a73 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml @@ -28,10 +28,16 @@ - + + getRequiredFieldIndicator + "*" + - + + getRequiredFieldIndicatorColor + rgb(226, 38, 38) + @@ -39,16 +45,25 @@ - + + productNameRequiredFieldIndicator + "*" + - + + productSkuRequiredFieldIndicator + "*" + - + + pageTitleRequiredFieldIndicator + "*" + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml index b451c06176bc3..0ce506fe1918d 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml @@ -93,6 +93,9 @@ - + + $grabGrabPriceClass + .price-box .price-tier_price + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml index 0400de5227cf3..43208f336dbcd 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml @@ -48,7 +48,10 @@ - + + $getSimpleProductThumbnail + '/placeholder\/thumbnail\.jpg/' + @@ -114,9 +117,18 @@ - - - + + $getMinimumPriceInGrid + '/\$[0-9]{2}\.[0-9]{2}/' + + + $getMaximumPriceInGrid + '/\$[0-9]{2}\.[0-9]{2}/' + + + $getMinimumPriceInGrid + $getMaximumPriceInGrid + @@ -135,23 +147,35 @@ - + + $getFirstPriceSortAsc + $getSecondPriceSortAsc + - + + $getFirstPriceSortDesc + $getSecondPriceSortDesc + - + + $getFirstProductIdSortAsc + $getSecondProductIdSortAsc + - + + $getFirstProductIdSortDesc + $getSecondProductIdSortDesc + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml index f7ebb090124d6..a89f49b3db346 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml @@ -81,7 +81,10 @@ - + + $browseGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -89,7 +92,10 @@ - + + $browseGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -100,7 +106,10 @@ - + + $browseGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -112,7 +121,10 @@ - + + $browseGrabSimpleProduct2PageImageSrc + '/placeholder\/image\.jpg/' + @@ -130,7 +142,10 @@ - + + $compareGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -138,7 +153,10 @@ - + + $compareGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -156,7 +174,10 @@ - + + $compareGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -182,7 +203,10 @@ - + + $compareGrabSimpleProduct1ImageSrcInComparison + '/placeholder\/small_image\.jpg/' + @@ -190,7 +214,10 @@ - + + $compareGrabSimpleProduct2ImageSrcInComparison + '/placeholder\/small_image\.jpg/' + @@ -274,7 +301,10 @@ - + + $browseGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -282,7 +312,10 @@ - + + $browseGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -293,7 +326,10 @@ - + + $browseGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -305,7 +341,10 @@ - + + $browseGrabSimpleProduct2PageImageSrc + '/placeholder\/image\.jpg/' + @@ -323,7 +362,10 @@ - + + $compareGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -331,7 +373,10 @@ - + + $compareGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -349,7 +394,10 @@ - + + $compareGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -375,7 +423,10 @@ - + + $compareGrabSimpleProduct1ImageSrcInComparison + '/placeholder\/small_image\.jpg/' + @@ -383,7 +434,10 @@ - + + $compareGrabSimpleProduct2ImageSrcInComparison + '/placeholder\/small_image\.jpg/' + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml index 74c6da1c47f60..4eb5b843eeb35 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml @@ -66,7 +66,10 @@ - + + $browseGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -74,7 +77,10 @@ - + + $browseGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -85,7 +91,10 @@ - + + $browseGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -97,7 +106,10 @@ - + + $browseGrabSimpleProduct2PageImageSrc + '/placeholder\/image\.jpg/' + @@ -115,7 +127,10 @@ - + + $compareGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -123,7 +138,10 @@ - + + $compareGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -141,7 +159,10 @@ - + + $compareGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -166,14 +187,20 @@ - + + $compareGrabSimpleProduct1ImageSrcInComparison + '/placeholder\/small_image\.jpg/' + - + + $compareGrabSimpleProduct2ImageSrcInComparison + '/placeholder\/small_image\.jpg/' + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryHighlightedAndProductDisplayedTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryHighlightedAndProductDisplayedTest.xml index b8a9a9cb3e0e6..00f9608d07c3e 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryHighlightedAndProductDisplayedTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryHighlightedAndProductDisplayedTest.xml @@ -60,9 +60,15 @@ - + + $grabCategory1Class + active + - + + $highlightedAmount + 1 + @@ -74,9 +80,15 @@ - + + $grabCategory2Class + active + - + + $highlightedAmount2 + 1 + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml index dc053bb990685..aacce53819178 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml @@ -197,10 +197,16 @@ - + + 12 + - + + 24 + - + + 36 + diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml index 59f0b2f5dd76e..75ec0a4567b7d 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml @@ -72,7 +72,10 @@ - + + $grabSpecialPrice + $15.00 + diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml index eebc1175f1894..9e21ea186f67b 100644 --- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml +++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml @@ -23,6 +23,9 @@ - + + $grabTextFromSelectedAttribute + $today + diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml index 0df73c99595a6..fdd9b4788d315 100644 --- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml +++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml @@ -89,13 +89,19 @@ - + + ($grabFirstProductUpdatedPrice) + $110.70 + - + + ($grabFirstProductUpdatedPrice) + $110.70 + @@ -132,12 +138,18 @@ - + + ($grabThirdProductUpdatedPrice) + $110.70 + - + + ($grabForthProductUpdatedPrice) + $110.70 + diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml index 57940e39e9281..e347803ae3feb 100644 --- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml +++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml @@ -28,7 +28,10 @@ - + + $searchAdvancedGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -36,7 +39,10 @@ - + + $searchAdvancedGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -56,14 +62,20 @@ - + + $searchGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + - + + $searchGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -94,7 +106,10 @@ - + + $searchAdvancedGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -102,7 +117,10 @@ - + + $searchAdvancedGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -122,14 +140,20 @@ - + + $searchGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + - + + $searchGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml index cd3dec912a3c1..51d9973117c6f 100644 --- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml +++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml @@ -28,7 +28,10 @@ - + + $searchAdvancedGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -36,7 +39,10 @@ - + + $searchAdvancedGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -56,14 +62,20 @@ - + + $searchGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + - + + $searchGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml index c91314f1c1bc2..88b517c1cbe25 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml @@ -20,6 +20,9 @@ - + + $billingAddr + $shippingAddr + diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml index 520db653a5c59..b7fda2b8b0345 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCheckProductActionGroup.xml @@ -19,6 +19,9 @@ - + + $grabProductQty + {{cartItem.qty}} + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml index 7002479279a78..93bb2acdcacfe 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml @@ -24,7 +24,10 @@ - + + $cartGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -32,7 +35,10 @@ - + + $cartGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -51,7 +57,10 @@ - + + $cartGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -66,7 +75,10 @@ - + + $cartMinicartGrabSimpleProduct1ImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -74,7 +86,10 @@ - + + $cartMinicartGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -82,7 +97,10 @@ - + + $cartMinicartGrabSimpleProduct2ImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -90,7 +108,10 @@ - + + $cartMinicartGrabSimpleProduct2PageImageSrc + '/placeholder\/image\.jpg/' + @@ -111,7 +132,10 @@ - + + $cartCartGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -119,7 +143,10 @@ - + + $cartCartGrabSimpleProduct2PageImageSrc1 + '/placeholder\/image\.jpg/' + @@ -131,7 +158,10 @@ - + + $cartCartGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -139,7 +169,10 @@ - + + $cartCartGrabSimpleProduct2PageImageSrc2 + '/placeholder\/image\.jpg/' + @@ -212,7 +245,10 @@ - + + $cartGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -220,7 +256,10 @@ - + + $cartGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -239,7 +278,10 @@ - + + $cartGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -254,7 +296,10 @@ - + + $cartMinicartGrabSimpleProduct1ImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -262,7 +307,10 @@ - + + $cartMinicartGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -270,7 +318,10 @@ - + + $cartMinicartGrabSimpleProduct2ImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -278,7 +329,10 @@ - + + $cartMinicartGrabSimpleProduct2PageImageSrc + '/placeholder\/image\.jpg/' + @@ -299,7 +353,10 @@ - + + $cartCartGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -307,7 +364,10 @@ - + + $cartCartGrabSimpleProduct2PageImageSrc1 + '/placeholder\/image\.jpg/' + @@ -319,7 +379,10 @@ - + + $cartCartGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -327,7 +390,10 @@ - + + $cartCartGrabSimpleProduct2PageImageSrc2 + '/placeholder\/image\.jpg/' + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml index 6df859c9972c3..f47b536106400 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml @@ -24,7 +24,10 @@ - + + $cartGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -32,7 +35,10 @@ - + + $cartGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -51,7 +57,10 @@ - + + $cartGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -66,7 +75,10 @@ - + + $cartMinicartGrabSimpleProduct1ImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -74,7 +86,10 @@ - + + $cartMinicartGrabSimpleProduct1PageImageSrc + '/placeholder\/image\.jpg/' + @@ -82,7 +97,10 @@ - + + $cartMinicartGrabSimpleProduct2ImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -90,7 +108,10 @@ - + + $cartMinicartGrabSimpleProduct2PageImageSrc + '/placeholder\/image\.jpg/' + @@ -111,7 +132,10 @@ - + + $cartCartGrabSimpleProduct1ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -119,7 +143,10 @@ - + + $cartCartGrabSimpleProduct2PageImageSrc1 + '/placeholder\/image\.jpg/' + @@ -131,7 +158,10 @@ - + + $cartCartGrabSimpleProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -139,7 +169,10 @@ - + + $cartCartGrabSimpleProduct2PageImageSrc2 + '/placeholder\/image\.jpg/' + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml index 43ee1c8dd3de4..6b7feb485c812 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml @@ -88,6 +88,9 @@ - + + $billingAddress + $shippingAddress + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml index 2b2316b20396e..4e2d5ddbb17e9 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml @@ -207,7 +207,10 @@ - + + $billingAddressOrderPage + $shippingAddressOrderPage + @@ -222,7 +225,13 @@ - - + + $shippingAddress + $shippingAddressOrderPage + + + $billingAddress + $billingAddressOrderPage + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml index f17716af8fd56..f7ae9d29ada55 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml @@ -39,7 +39,10 @@ - + + $grabQtyShoppingCart + 1 + @@ -51,6 +54,9 @@ - + + $grabQtyShoppingCart1 + 5 + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml index e335caa2ddb64..9b536882dc64b 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml @@ -72,7 +72,10 @@ - + + $grabQty + 2 + @@ -85,13 +88,37 @@ - - - - - - - - + + $grabEmail1 + $grabEmail + + + $grabFirstName1 + $grabFirstName + + + $grabLastName1 + $grabLastName + + + $grabStreet1 + $grabStreet + + + $grabCity1 + $grabCity + + + $grabRegion1 + $grabRegion + + + $grabPostcode1 + $grabPostcode + + + $grabTelephone1 + $grabTelephone + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml index 1fff7501f578d..ab67d3f8d989f 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml @@ -69,22 +69,40 @@ - - + + $grabProductNameMinicart + $$createProduct.name$$ + + + $grabProductNameMinicart + -new + - - + + $grabProductNameCart + $$createProduct.name$$ + + + $grabProductNameCart + -new + - - + + $grabProductNameShipping + $$createProduct.name$$ + + + $grabProductNameShipping + -new + diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml index 59cb7216ed264..752cc5e307f60 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml @@ -139,7 +139,10 @@ - + + {$getCurrentOption} + {$getBeforeOption} + diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml index 1c99cd722cf86..af9f3df588351 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml @@ -94,7 +94,10 @@ - + + $browseGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -107,7 +110,10 @@ - + + $browseGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -123,7 +129,10 @@ - + + $cartGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -132,7 +141,10 @@ - + + $cartGrabConfigProductPageImageSrc1 + '/placeholder\/image\.jpg/' + @@ -141,7 +153,10 @@ - + + $cartGrabConfigProductPageImageSrc2 + '/placeholder\/image\.jpg/' + @@ -155,7 +170,10 @@ - + + $cartMinicartGrabConfigProductImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -166,7 +184,10 @@ - + + $cartMinicartGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -179,7 +200,10 @@ - + + $cartCartGrabConfigProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -189,7 +213,10 @@ - + + $cartCartGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -199,7 +226,10 @@ - + + $compareGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -218,7 +248,10 @@ - + + $compareGrabConfigProductImageSrcInComparison + '/placeholder\/small_image\.jpg/' + @@ -306,7 +339,10 @@ - + + $browseGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -319,7 +355,10 @@ - + + $browseGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -335,7 +374,10 @@ - + + $cartGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -344,7 +386,10 @@ - + + $cartGrabConfigProductPageImageSrc1 + '/placeholder\/image\.jpg/' + @@ -353,7 +398,10 @@ - + + $cartGrabConfigProductPageImageSrc2 + '/placeholder\/image\.jpg/' + @@ -367,7 +415,10 @@ - + + $cartMinicartGrabConfigProductImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -378,7 +429,10 @@ - + + $cartMinicartGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -391,7 +445,10 @@ - + + $cartCartGrabConfigProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -401,7 +458,10 @@ - + + $cartCartGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -411,7 +471,10 @@ - + + $compareGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -430,6 +493,9 @@ - + + $compareGrabConfigProductImageSrcInComparison + '/placeholder\/small_image\.jpg/' + diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml index e1c031f11aadf..85c852d09e916 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml @@ -96,7 +96,10 @@ - + + $browseGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -109,7 +112,10 @@ - + + $browseGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -125,7 +131,10 @@ - + + $cartGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -134,7 +143,10 @@ - + + $cartGrabConfigProductPageImageSrc1 + '/placeholder\/image\.jpg/' + @@ -143,7 +155,10 @@ - + + $cartGrabConfigProductPageImageSrc2 + '/placeholder\/image\.jpg/' + @@ -157,7 +172,10 @@ - + + $cartMinicartGrabConfigProductImageSrc + '/placeholder\/thumbnail\.jpg/' + @@ -168,7 +186,10 @@ - + + $cartMinicartGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -181,7 +202,10 @@ - + + $cartCartGrabConfigProduct2ImageSrc + '/placeholder\/small_image\.jpg/' + @@ -191,7 +215,10 @@ - + + $cartCartGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -201,7 +228,10 @@ - + + $compareGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -220,6 +250,9 @@ - + + $compareGrabConfigProductImageSrcInComparison + '/placeholder\/small_image\.jpg/' + diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AssertAdminCurrencySymbolIsDisabledActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AssertAdminCurrencySymbolIsDisabledActionGroup.xml index b8bcb2b0b9cb7..bc2314316d8bd 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AssertAdminCurrencySymbolIsDisabledActionGroup.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AssertAdminCurrencySymbolIsDisabledActionGroup.xml @@ -14,6 +14,9 @@ - + + $grabDisabledAttribute + true + diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml index c5c9c0a6c9cf8..b29ff9ad3efeb 100644 --- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml +++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAuthorizationPopUpPasswordAutoCompleteOffActionGroup.xml @@ -14,6 +14,8 @@ - + + off + diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml index 1b2ec80f87340..6e54222d69b76 100644 --- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml +++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml @@ -14,6 +14,8 @@ - + + off + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml index 5600b6088cfe5..d48838bc0f14f 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml @@ -63,7 +63,11 @@ - - + + 1 + + + 1 + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml index 4f69a9bbfb695..7ec932ab750b9 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml @@ -63,7 +63,11 @@ - - + + 1 + + + 1 + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml index b0de96782f0f5..96a614da0b379 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml @@ -52,6 +52,8 @@ - + + 1 + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml index dfeb868959d54..ae26519d9618e 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml @@ -52,6 +52,8 @@ - + + 1 + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml index 7cd69b4e17472..60caaf64f05b7 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml @@ -114,6 +114,9 @@ - + + ($countriesAmount2) + ($countriesAmount) + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml index 0f98184aafb4f..e4605ba437772 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml @@ -33,6 +33,8 @@ - + + true + diff --git a/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml index f5e1e8ef0c8ec..cb6bdc18b1f9f 100644 --- a/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml +++ b/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml @@ -15,32 +15,74 @@ - + + $grabDHLActiveDisabled + true + - + + $grabDHLTitleDisabled + true + - + + $grabDHLAccessIdDisabled + true + - + + $grabDHLPasswordDisabled + true + - + + $grabDHLAccountDisabled + true + - + + $grabDHLContentTypeDisabled + true + - + + $grabDHLHandlingTypeDisabled + true + - + + $grabDHLHandlingDisabled + true + - + + $grabDHLDivideOrderWeightDisabled + true + - + + $grabDHLUnitOfMeasureDisabled + true + - + + $grabDHLSizeDisabled + true + - + + $grabDHLNonDocAllowedMethodDisabled + true + - + + $grabDHLSmartPostHubIdDisabled + true + - + + $grabDHLSpecificErrMsgDisabled + true + diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.xml index d00c1c59a0f8d..0c51142ac0aae 100644 --- a/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.xml +++ b/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.xml @@ -19,6 +19,9 @@ - + + $grabConnectionStatus + {{AdminElasticsearch6TestConnectionMessageData.successMessage}} + diff --git a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml index f599d7ca223ae..c2678153d13f2 100644 --- a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml +++ b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml @@ -15,38 +15,89 @@ - + + $grabFedExActiveDisabled + true + - + + $grabFedExTitleDisabled + true + - + + $grabFedExAccountIdDisabled + true + - + + $grabFedExMeterNumberDisabled + true + - + + $grabFedExKeyDisabled + true + - + + $grabFedExPasswordDisabled + true + - + + $grabFedExSandboxDisabled + true + - + + $grabFedExShipmentRequestTypeDisabled + true + - + + $grabFedExPackagingDisabled + true + - + + $grabFedExDropoffDisabled + true + - + + $grabFedExUnitOfMeasureDisabled + true + - + + $grabFedExMaxPackageWeightDisabled + true + - + + $grabFedExHandlingTypeDisabled + true + - + + $grabFedExHandlingActionDisabled + true + - + + $grabFedExSpecificErrMsgDisabled + true + - + + $grabFedExAllowSpecificDisabled + true + - + + $grabFedExSpecificCountryDisabled + true + diff --git a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml index c0b602e772b54..297333140b0c7 100644 --- a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml +++ b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml @@ -124,7 +124,13 @@ - - + + $grabShippingMethod + Federal Express + + + $grabShippingMethodTitle + Federal Express + diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml index 72443a41d67f4..58c717cc50fd8 100644 --- a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml +++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml @@ -134,28 +134,40 @@ - + + ($grabMapPrice) + $66.00 + - + + ($grabSecondProductMapPrice) + $66.00 + - + + ($grabFirstProductMapPrice) + $55.00 + - + + ($grabThirdProductMapPrice) + $70.00 + diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml index 0435ab6b7be49..41b917c4c1371 100644 --- a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml +++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml @@ -89,6 +89,9 @@ - + + {$grabCanceledOrdersAny} + {$grabCanceledOrdersSpecified} + diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminCreditMemoGrandTotalActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminCreditMemoGrandTotalActionGroup.xml index f318e76ce74a8..471e3aa80835e 100644 --- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminCreditMemoGrandTotalActionGroup.xml +++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminCreditMemoGrandTotalActionGroup.xml @@ -16,6 +16,9 @@ - + + getGrandTotal + {{expectedGrandTotal}} + diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/VerifyCreatedOrderInformationActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/VerifyCreatedOrderInformationActionGroup.xml index 9a62771fb54cd..490496c1f1e9e 100644 --- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/VerifyCreatedOrderInformationActionGroup.xml +++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/VerifyCreatedOrderInformationActionGroup.xml @@ -16,6 +16,8 @@ - + + $getOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml index e55cdfeb284b4..48eebfb579c27 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml @@ -90,6 +90,9 @@ - + + $grabInvoicedItemQty + 5 + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml index de92d80546733..a20e9efd614fd 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml @@ -69,7 +69,9 @@ - + + $grabOrderId + @@ -96,7 +98,9 @@ - + + $grabMemoId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml index 2cacfe934427c..f4b2c3ad0a819 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml @@ -64,7 +64,9 @@ - + + $grabOrderId + @@ -90,7 +92,9 @@ - + + $grabMemoId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml index e9954de55afbc..e0e7234fc9d24 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml @@ -70,7 +70,9 @@ - + + $grabOrderId + @@ -94,7 +96,9 @@ - + + $grabMemoId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml index 2d5b2d3c66906..fd186fd051fbf 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml @@ -73,7 +73,9 @@ - + + $grabOrderId + @@ -97,7 +99,9 @@ - + + $grabMemoId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithDateTimeOptionUITest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithDateTimeOptionUITest.xml index 677969fd00d91..c689869d35c30 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithDateTimeOptionUITest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithDateTimeOptionUITest.xml @@ -45,7 +45,10 @@ - + + dateTimeRequiredFieldIndicator + "*" + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml index bfaf31007b10a..da427c9085084 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml @@ -71,7 +71,9 @@ - + + $orderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml index 803e24b3423aa..ca2a35eef5ae6 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml @@ -42,7 +42,9 @@ - + + $getFirstOrderId + @@ -53,7 +55,9 @@ - + + $getSecondOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml index c230dc41f0d2e..c11ea49893734 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml @@ -42,7 +42,9 @@ - + + $getFirstOrderId + @@ -53,7 +55,9 @@ - + + $getSecondOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml index 14b61af59eaed..f583f46f19c7c 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml @@ -42,7 +42,9 @@ - + + $getOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml index 5ac803cb666b4..f334a77da6550 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml @@ -42,7 +42,9 @@ - + + $getFirstOrderId + @@ -50,7 +52,9 @@ - + + $getSecondOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml index 4b8df455d545d..437487e3d7e40 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml @@ -42,7 +42,9 @@ - + + $getOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml index 84d5426bd44e3..87d3a864e0820 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml @@ -41,7 +41,9 @@ - + + $getOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml index 83998990c70ed..9eaa3a87e873a 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml @@ -42,7 +42,9 @@ - + + $getOrderId + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml index 8c80c1e9ee6d3..97d9ad9dbeb59 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml @@ -115,11 +115,17 @@ - + + ($grabShippingCost) + $5.00 + - + + ($grabInvoiceDiscount) + -$15.00 + @@ -137,9 +143,15 @@ - + + ($grabRefundDiscountValue) + -$15.00 + - + + ($grabRefundGrandTotal) + ($grabInvoiceGrandTotal) + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml index 6a1cefae7553d..6ba1c3ac3deec 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml @@ -72,7 +72,9 @@ - + + $getOrderId + @@ -235,7 +237,10 @@ - + + $getOrderStatusSecondRow + $getOrderStatusFirstRow + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml index 04dadd95f9f43..e0fcd77ec6243 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml @@ -116,7 +116,9 @@ - + + $grabAttribute + @@ -149,7 +151,9 @@ - + + $grabBundleOption + @@ -234,7 +238,9 @@ - + + $getOrderId + diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.xml index 1a7d3355e4ee4..7c252ca8c14c5 100644 --- a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.xml +++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.xml @@ -13,6 +13,8 @@ - + + $grabShipmentId + diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml index c3d9b243c27c7..08064ae59d793 100644 --- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml +++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml @@ -31,54 +31,117 @@ - + + $grabFlatRateActiveDisabled + true + - + + $grabFlatRateTitleDisabled + true + - + + $grabFlatRateNameDisabled + true + - + + $grabFlatRateSpecificErrMsgDisabled + true + - + + $grabFlatRateAllowSpecificDisabled + true + - + + $grabFlatRateSpecificCountryDisabled + true + - + + $grabFreeShippingActiveDisabled + true + - + + $grabFreeShippingTitleDisabled + true + - + + $grabFreeShippingNameDisabled + true + - + + $grabFreeShippingSpecificErrMsgDisabled + true + - + + $grabFreeShippingAllowSpecificDisabled + true + - + + $grabFreeShippingSpecificCountryDisabled + true + - + + $grabTableRateActiveDisabled + true + - + + $grabTableRateTitleDisabled + true + - + + $grabTableRateNameDisabled + true + - + + $grabTableRateConditionNameDisabled + true + - + + $grabTableRateIncludeVirtualPriceDisabled + true + - + + $grabTableRateHandlingTypeDisabled + true + - + + $grabTableRateSpecificErrMsgDisabled + true + - + + $grabTableRateAllowSpecificDisabled + true + - + + $grabTableRateSpecificCountryDisabled + true + diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml index 18e9f82e74121..5a93defc6ae19 100644 --- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml +++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml @@ -81,7 +81,10 @@ - + + $grabFirstOptionImg + {{MagentoLogo.filename}} + @@ -90,6 +93,9 @@ - + + $grabSecondOptionImg + {{TestImageNew.filename}} + diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml index 64d047c1a4dff..8cd85ee0ca969 100644 --- a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml +++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxCalcWithApplyTaxOnSettingTest.xml @@ -69,12 +69,18 @@ - + + ($grabTaxCost) + $6.00 + - + + ($grabTaxCost) + $6.00 + diff --git a/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontCheckElementColorActionGroup.xml b/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontCheckElementColorActionGroup.xml index 66e98d5e41527..c4c0f01441f0b 100644 --- a/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontCheckElementColorActionGroup.xml +++ b/app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontCheckElementColorActionGroup.xml @@ -19,6 +19,9 @@ - + + getElementColor + {{color}} + diff --git a/app/code/Magento/Translation/Test/Mftf/ActionGroup/AssertElementInTranslateInlineModeActionGroup.xml b/app/code/Magento/Translation/Test/Mftf/ActionGroup/AssertElementInTranslateInlineModeActionGroup.xml index 2bc783f128c33..6128aeeb8918c 100644 --- a/app/code/Magento/Translation/Test/Mftf/ActionGroup/AssertElementInTranslateInlineModeActionGroup.xml +++ b/app/code/Magento/Translation/Test/Mftf/ActionGroup/AssertElementInTranslateInlineModeActionGroup.xml @@ -17,9 +17,18 @@ - - - + + $getBorderColor + {{TranslateInlineModeStyleData.borderColor}} + + + $getBorderType + {{TranslateInlineModeStyleData.borderType}} + + + $getBorderWidth + {{TranslateInlineModeStyleData.borderWidth}} + \ No newline at end of file diff --git a/app/code/Magento/Ups/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Ups/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml index 126586669afd2..f339d0a5b7028 100644 --- a/app/code/Magento/Ups/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml +++ b/app/code/Magento/Ups/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml @@ -15,52 +15,124 @@ - + + $grabUPSActiveDisabled + true + - + + $grabUPSTypeDisabled + true + - + + $grabUPSAccountLiveDisabled + true + - + + $grabUPSGatewayXMLUrlDisabled + true + - + + $grabUPSModeXMLDisabled + true + - + + $grabUPSOriginShipmentDisabled + true + - + + $grabUPSTitleDisabled + true + - + + $grabUPSNegotiatedActiveDisabled + true + - + + $grabUPSIncludeTaxesDisabled + true + - + + $grabUPSShipmentRequestTypeDisabled + true + - + + $grabUPSContainerDisabled + true + - + + $grabUPSDestTypeDisabled + true + - + + $grabUPSTrackingXmlUrlDisabled + true + - + + $grabUPSUnitOfMeasureDisabled + true + - + + $grabUPSMaxPackageWeightDisabled + true + - + + $grabUPSPickupDisabled + true + - + + $grabUPSMinPackageWeightDisabled + true + - + + $grabUPSHandlingTypeDisabled + true + - + + $grabUPSHandlingActionDisabled + true + - + + $grabUPSAllowedMethodsDisabled + true + - + + $grabUPSFreeMethodDisabled + true + - + + $grabUPSSpecificErrMsgDisabled + true + - + + $grabUPSAllowSpecificDisabled + true + - + + $grabUPSSpecificCountryDisabled + true + diff --git a/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml b/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml index bd278c9dbe975..f4f30d4317a57 100644 --- a/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml +++ b/app/code/Magento/Ups/Test/Mftf/Test/DefaultConfigForUPSTypeTest.xml @@ -42,6 +42,9 @@ - + + ($grabSelectedOptionText) + United Parcel Service XML + diff --git a/app/code/Magento/Usps/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Usps/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml index cd77861fccd58..4d4f84c41e1d4 100644 --- a/app/code/Magento/Usps/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml +++ b/app/code/Magento/Usps/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml @@ -15,42 +15,99 @@ - + + $grabUSPSActiveDisabled + true + - + + $grabUSPSGatewayXMLUrlDisabled + true + - + + $grabUSPSGatewaySecureUrlDisabled + true + - + + $grabUSPSTitleDisabled + true + - + + $grabUSPSUserIdDisabled + true + - + + $grabUSPSPasswordDisabled + true + - + + $grabUSPSShipmentRequestTypeDisabled + true + - + + $grabUSPSContainerDisabled + true + - + + $grabUSPSSizeDisabled + true + - + + $grabUSPSDestTypeDisabled + true + - + + $grabUSPSMachinableDisabled + true + - + + $grabUSPSMaxPackageWeightDisabled + true + - + + $grabUSPSHandlingTypeDisabled + true + - + + $grabUSPSHandlingActionDisabled + true + - + + $grabUSPSAllowedMethodsDisabled + true + - + + $grabUSPSFreeMethodDisabled + true + - + + $grabUSPSSpecificErrMsgDisabled + true + - + + $grabUSPSAllowSpecificDisabled + true + - + + $grabUSPSSpecificCountryDisabled + true + diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml index d38bf90a3a16d..b3ab8669a1b6b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml @@ -17,7 +17,10 @@ - + + $searchGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -25,7 +28,10 @@ - + + $searchGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + @@ -36,7 +42,10 @@ - + + $searchGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -44,6 +53,9 @@ - + + $searchGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml index f616e46d6f692..e25d3e0d728f6 100644 --- a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml @@ -17,7 +17,10 @@ - + + $searchGrabConfigProductImageSrc + '/placeholder\/small_image\.jpg/' + @@ -25,6 +28,9 @@ - + + $searchGrabConfigProductPageImageSrc + '/placeholder\/image\.jpg/' + From e7e2b447139d1b820ee920f147c5cb0390682844 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Thu, 12 Mar 2020 09:20:20 -0500 Subject: [PATCH 2/3] MQE-683: [Deprecation] Only use more nested assertion syntax - Lock file update --- composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 54e59a9c31c2b..3a39be3fa4327 100644 --- a/composer.lock +++ b/composer.lock @@ -2251,11 +2251,6 @@ "MIT" ], "authors": [ - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" - }, { "name": "Marijn Huizendveld", "email": "marijn.huizendveld@gmail.com" @@ -2263,6 +2258,11 @@ { "name": "Thibaud Fabre", "email": "thibaud@aztech.io" + }, + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" } ], "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", @@ -7498,12 +7498,12 @@ "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "c37ba96a1caa59755b50593638b01f591e597251" + "reference": "5990abb646462e760d4afa4dcbabe62a9d81b839" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/c37ba96a1caa59755b50593638b01f591e597251", - "reference": "c37ba96a1caa59755b50593638b01f591e597251", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/5990abb646462e760d4afa4dcbabe62a9d81b839", + "reference": "5990abb646462e760d4afa4dcbabe62a9d81b839", "shasum": "" }, "require": { @@ -7576,7 +7576,7 @@ "magento", "testing" ], - "time": "2020-03-11T17:07:43+00:00" + "time": "2020-03-12T14:12:32+00:00" }, { "name": "mikey179/vfsstream", From 58b25cab794b4fcdac3e3c9c95b37a66946d7d74 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Thu, 12 Mar 2020 10:03:06 -0500 Subject: [PATCH 3/3] MQE-683: [Deprecation] Only use more nested assertion syntax - Indent fixes --- .../Mftf/Test/AdminCreateCategoryTest.xml | 58 +++++++++---------- .../Test/StorefrontPrintOrderGuestTest.xml | 8 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml index 72a44cb231b46..3ebc074623d8a 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml @@ -70,35 +70,35 @@ - - - - - <description value="Once the Config setting is unchecked Category should not be saved with layered navigation price field left empty"/> - <severity value="AVERAGE"/> - <testCaseId value="MAGETWO-95797"/> - <group value="category"/> - </annotations> - <before> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> - </before> - <after> - <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> - </after> - <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/> - <waitForPageLoad time="30" stepKey="waitForPageLoad1"/> - <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/> - <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/> - <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="clickOnDisplaySettingsTab"/> - <waitForElementVisible selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="wait"/> - <scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" stepKey="scrollToLayeredNavigationField"/> - <uncheckOption selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="uncheckConfigSetting"/> - <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/> - <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/> - <!-- Verify that the Layered navigation price step field has the required indicator --> - <comment userInput="Check if Layered navigation price field has required indicator icon" stepKey="comment" /> - <executeJS function="{{CategoryDisplaySettingsSection.RequiredFieldIndicator('filter_price_range')}}" stepKey="getRequiredFieldIndicator"/> - <assertEquals message="pass" stepKey="assertRequiredFieldIndicator1"> + <annotations> + <features value="Catalog"/> + <stories value="Default layout configuration MAGETWO-88793"/> + <title value="Category should not be saved once layered navigation price step field is left empty"/> + <description value="Once the Config setting is unchecked Category should not be saved with layered navigation price field left empty"/> + <severity value="AVERAGE"/> + <testCaseId value="MAGETWO-95797"/> + <group value="category"/> + </annotations> + <before> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + <after> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> + </after> + <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad1"/> + <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/> + <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/> + <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="clickOnDisplaySettingsTab"/> + <waitForElementVisible selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="wait"/> + <scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" stepKey="scrollToLayeredNavigationField"/> + <uncheckOption selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="uncheckConfigSetting"/> + <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/> + <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/> + <!-- Verify that the Layered navigation price step field has the required indicator --> + <comment userInput="Check if Layered navigation price field has required indicator icon" stepKey="comment" /> + <executeJS function="{{CategoryDisplaySettingsSection.RequiredFieldIndicator('filter_price_range')}}" stepKey="getRequiredFieldIndicator"/> + <assertEquals message="pass" stepKey="assertRequiredFieldIndicator1"> <actualResult type="variable">getRequiredFieldIndicator</actualResult> <expectedResult type="string">"*"</expectedResult> </assertEquals> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml index e0fcd77ec6243..80a6510de7551 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml @@ -117,8 +117,8 @@ </actionGroup> <grabTextFrom selector="{{AdminConfigurableProductFormSection.currentAttribute}}" stepKey="grabAttribute"/> <assertNotEmpty stepKey="assertNotEmpty"> - <actualResult type="const">$grabAttribute</actualResult> - </assertNotEmpty> + <actualResult type="const">$grabAttribute</actualResult> + </assertNotEmpty> <!-- Create bundle Product --> <createData entity="SimpleSubCategory" stepKey="createSubCategory"/> @@ -152,8 +152,8 @@ </actionGroup> <grabTextFrom selector="{{AdminProductFormBundleSection.currentBundleOption}}" stepKey="grabBundleOption"/> <assertNotEmpty stepKey="assertBundleOptionNotEmpty"> - <actualResult type="const">$grabBundleOption</actualResult> - </assertNotEmpty> + <actualResult type="const">$grabBundleOption</actualResult> + </assertNotEmpty> <!-- Create sales rule --> <createData entity="ActiveSalesRuleCoupon50" stepKey="createCartPriceRule"/>