Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compliance to StorefrontMinicartSection #27955

Merged
merged 2 commits into from
Apr 29, 2020
Merged

compliance to StorefrontMinicartSection #27955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ed309
compliance to StorefrontMinicartSection
engcom-Echo Apr 23, 2020
659e3bb
Changed selectors on tests related PR
engcom-Echo Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...leteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<see selector="{{StorefrontMinicartSection.productPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPrice1"/>

<!-- Assert that the rule isn't present on the Checkout page -->
<click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout1"/>
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout1"/>
<conditionalClick selector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" dependentSelector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" visible="true" stepKey="expandShoppingCartSummary1"/>
<see selector="{{CheckoutCartProductSection.ProductRegularPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPriceOnCheckout1"/>
</test>
Expand Down
1 change: 1 addition & 0 deletions ...ftf/Section/StorefrontMiniCartSection.xml → ...ftf/Section/StorefrontMinicartSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
<element name="subtotal" type="text" selector="//tr[@class='totals sub']//td[@class='amount']/span"/>
<element name="emptyCart" type="text" selector=".counter.qty.empty"/>
<element name="emptyMiniCart" type="text" selector="//div[@class='minicart-wrapper']//span[@class='counter qty empty']/../.."/>
<element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
<element name="messageEmptyCart" type="text" selector="//*[@id='minicart-content-wrapper']//*[contains(@class,'subtitle empty')]"/>
<element name="visibleItemsCountText" type="text" selector="//div[@class='items-total']"/>
Expand Down
2 changes: 1 addition & 1 deletion ...rontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<!-- Verify mini cart is empty -->
<actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertEmptryCart">
<argument name="selector" value="{{StorefrontMiniCartSection.emptyMiniCart}}"/>
<argument name="selector" value="{{StorefrontMinicartSection.emptyMiniCart}}"/>
</actionGroup>
</test>
</tests>
2 changes: 1 addition & 1 deletion .../StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert Empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Register customer after checkout -->
Expand Down
2 changes: 1 addition & 1 deletion ...ontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

<!--Place order -->
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Register customer after checkout -->
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>

<!-- Open Order Index Page -->
Expand Down
4 changes: 2 additions & 2 deletions ...agento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</actionGroup>

<!-- Check cart -->
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart2"/>
<dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickMiniCart2"/>
<dontSeeElement selector="{{StorefrontMinicartSection.quantity}}" stepKey="dontSeeCartItem"/>
</test>
</tests>
2 changes: 1 addition & 1 deletion .../Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Open Order Index Page -->
Expand Down
2 changes: 1 addition & 1 deletion .../Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Open Order Index Page -->
Expand Down
2 changes: 1 addition & 1 deletion ...out/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Open Order Index Page -->
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>

<!-- Login to Admin Page -->
Expand Down
2 changes: 1 addition & 1 deletion ...Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Open Order Index Page -->
Expand Down
2 changes: 1 addition & 1 deletion ...Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>

<!-- Assert empty Mini Cart -->
<seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>

<!-- Open Order Index Page -->
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
<wait time="60" stepKey="waitForCartToBeUpdated"/>
<reloadPage stepKey="reloadPage"/>
<waitForPageLoad stepKey="waitForCheckoutPageReload"/>
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart"/>
<dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickMiniCart"/>
<dontSeeElement selector="{{StorefrontMinicartSection.quantity}}" stepKey="dontSeeCartItem"/>
<!-- Add simple product to shopping cart -->
<amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct2.name$$)}}" stepKey="amOnSimpleProductPage2"/>
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="cartAddSimpleProductToCart2">
Expand All @@ -153,7 +153,7 @@
<wait time="60" stepKey="waitForCartToBeUpdated2"/>
<reloadPage stepKey="reloadPage2"/>
<waitForPageLoad stepKey="waitForCheckoutPageReload2"/>
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart2"/>
<dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem2"/>
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickMiniCart2"/>
<dontSeeElement selector="{{StorefrontMinicartSection.quantity}}" stepKey="dontSeeCartItem2"/>
</test>
</tests>
6 changes: 3 additions & 3 deletions app/code/Magento/Translation/Test/Mftf/Test/AdminInlineTranslationOnCheckoutTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!-- 3. Go to storefront and click on cart button on the top -->
<reloadPage stepKey="reloadPage"/>
<waitForPageLoad stepKey="waitForReload"/>
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="showMiniCart"/>
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="showMiniCart"/>

<!-- Small cart popup appeared. -->
<waitForElementVisible selector="{{StorefrontMinicartSection.blockMiniCart}}" stepKey="seePopUpAppeared"/>
Expand Down Expand Up @@ -339,7 +339,7 @@
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
<argument name="product" value="$$createProduct$$"/>
</actionGroup>
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="showCart"/>
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="showCart"/>

<!-- Small cart popup appeared. -->
<waitForElementVisible selector="{{StorefrontMinicartSection.blockMiniCart}}" stepKey="waitPopUpAppeared"/>
Expand Down Expand Up @@ -438,7 +438,7 @@
<magentoCLI command="cache:flush" stepKey="flushCache3"/>
<reloadPage stepKey="reloadProductPage"/>
<waitForPageLoad stepKey="waitForReloadPage"/>
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="showMiniCartPopup"/>
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="showMiniCartPopup"/>
<waitForElementVisible selector="{{StorefrontMinicartSection.blockMiniCart}}" stepKey="waitForPopUpAppeared"/>

<actionGroup ref="AdminTranslateElementActionGroup" stepKey="revertTranslateProceedToCheckout">
Expand Down