Skip to content

Commit e496e26

Browse files
committed
MAGETWO-95589: [FT][Temando] Tests fail with enabled Temando extension
1 parent 2a389b0 commit e496e26

File tree

7 files changed

+13
-5
lines changed

7 files changed

+13
-5
lines changed

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@
8484
<argument name="total"/>
8585
</arguments>
8686
<seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
87-
<waitForText userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" time="30" stepKey="waitForTotal"/>
87+
<waitForPageLoad stepKey="waitForCartPage"/>
88+
<conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodForm}}" visible="false" stepKey="openEstimateShippingSection"/>
89+
<waitForElementVisible selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="waitForShippingSection"/>
90+
<checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
8891
<see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
8992
<see userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" stepKey="assertShipping"/>
9093
<see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="CheckoutCartSummarySection">
1212
<element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>
13+
<element name="shippingMethodForm" type="text" selector="#co-shipping-method-form"/>
1314
<element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>
1415
<element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
1516
<element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@
7272
<!-- Should not see the discount yet because we have not set country -->
7373
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
7474
<waitForPageLoad stepKey="waitForCartPage"/>
75+
<click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="openEstimateShippingSection"/>
76+
<checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
7577
<see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
7678
<dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
7779

7880
<!-- See discount if we use valid country -->
79-
<click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
8081
<selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Brazil" stepKey="fillCountry"/>
8182
<waitForPageLoad stepKey="waitForCountry1"/>
8283
<waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@
7676
<!-- Should not see the discount yet because we have not filled in postcode -->
7777
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
7878
<waitForPageLoad stepKey="waitForCartPage"/>
79+
<click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="openEstimateShippingSection"/>
80+
<checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
7981
<see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
8082
<dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
8183

8284
<!-- See discount if we use valid postcode -->
83-
<click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
8485
<fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="78613" stepKey="fillPostcode"/>
8586
<waitForPageLoad stepKey="waitForPostcode1"/>
8687
<waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@
7272
<!-- Should not see the discount yet because we have not filled in postcode -->
7373
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
7474
<waitForPageLoad stepKey="waitForCartPage"/>
75+
<click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
76+
<checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
7577
<see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
7678
<dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
7779

7880
<!-- See discount if we use valid postcode -->
79-
<click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
8081
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Indiana" stepKey="fillState"/>
8182
<waitForPageLoad stepKey="waitForPostcode1"/>
8283
<waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@
106106
<data name="productPrice/0/special" xsi:type="string">5</data>
107107
<data name="productPrice/0/sub_total" xsi:type="string">5</data>
108108
<data name="productPrice/0/regular" xsi:type="string">10</data>
109+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
110+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
109111
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedCatalogPage" />
110112
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedProductPage" />
111113
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedShoppingCart" />

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ function () {
6767
*/
6868
private function waitFormLoading()
6969
{
70-
$this->_rootElement->click();
7170
$this->browser->waitUntil(
7271
function () {
7372
return $this->browser->find($this->waitElement)->isVisible() ? null : true;

0 commit comments

Comments
 (0)