File tree Expand file tree Collapse file tree 7 files changed +13
-5
lines changed
dev/tests/functional/tests/app/Magento
CatalogRule/Test/TestCase
Sales/Test/Block/Adminhtml/Order/Create/Shipping Expand file tree Collapse file tree 7 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 84
84
<argument name =" total" />
85
85
</arguments >
86
86
<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" />
88
91
<see userInput =" ${{subtotal}}" selector =" {{CheckoutCartSummarySection.subtotal}}" stepKey =" assertSubtotal" />
89
92
<see userInput =" ${{shipping}}" selector =" {{CheckoutCartSummarySection.shipping}}" stepKey =" assertShipping" />
90
93
<see userInput =" ({{shippingMethod}})" selector =" {{CheckoutCartSummarySection.shippingMethod}}" stepKey =" assertShippingMethod" />
Original file line number Diff line number Diff line change 10
10
xsi : noNamespaceSchemaLocation =" urn:magento:mftf:Page/etc/SectionObject.xsd" >
11
11
<section name =" CheckoutCartSummarySection" >
12
12
<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" />
13
14
<element name =" shippingMethod" type =" text" selector =" //*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']" />
14
15
<element name =" shipping" type =" text" selector =" //*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']" />
15
16
<element name =" total" type =" text" selector =" //*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']" />
Original file line number Diff line number Diff line change 72
72
<!-- Should not see the discount yet because we have not set country -->
73
73
<amOnPage url =" {{CheckoutCartPage.url}}" stepKey =" goToCartPage" />
74
74
<waitForPageLoad stepKey =" waitForCartPage" />
75
+ <click selector =" {{CheckoutCartSummarySection.shippingHeading}}" stepKey =" openEstimateShippingSection" />
76
+ <checkOption selector =" {{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey =" selectFlatRateShipping" />
75
77
<see selector =" {{CheckoutCartSummarySection.subtotal}}" userInput =" $123.00" stepKey =" seeSubtotal" />
76
78
<dontSeeElement selector =" {{CheckoutCartSummarySection.discountAmount}}" stepKey =" dontSeeDiscount" />
77
79
78
80
<!-- See discount if we use valid country -->
79
- <click selector =" {{CheckoutCartSummarySection.shippingHeading}}" stepKey =" expandShipping" />
80
81
<selectOption selector =" {{CheckoutCartSummarySection.country}}" userInput =" Brazil" stepKey =" fillCountry" />
81
82
<waitForPageLoad stepKey =" waitForCountry1" />
82
83
<waitForElementVisible selector =" {{CheckoutCartSummarySection.discountAmount}}" stepKey =" waitForDiscountElement" />
Original file line number Diff line number Diff line change 76
76
<!-- Should not see the discount yet because we have not filled in postcode -->
77
77
<amOnPage url =" {{CheckoutCartPage.url}}" stepKey =" goToCartPage" />
78
78
<waitForPageLoad stepKey =" waitForCartPage" />
79
+ <click selector =" {{CheckoutCartSummarySection.shippingHeading}}" stepKey =" openEstimateShippingSection" />
80
+ <checkOption selector =" {{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey =" selectFlatRateShipping" />
79
81
<see selector =" {{CheckoutCartSummarySection.subtotal}}" userInput =" $123.00" stepKey =" seeSubtotal" />
80
82
<dontSeeElement selector =" {{CheckoutCartSummarySection.discountAmount}}" stepKey =" dontSeeDiscount" />
81
83
82
84
<!-- See discount if we use valid postcode -->
83
- <click selector =" {{CheckoutCartSummarySection.shippingHeading}}" stepKey =" expandShipping" />
84
85
<fillField selector =" {{CheckoutCartSummarySection.postcode}}" userInput =" 78613" stepKey =" fillPostcode" />
85
86
<waitForPageLoad stepKey =" waitForPostcode1" />
86
87
<waitForElementVisible selector =" {{CheckoutCartSummarySection.discountAmount}}" stepKey =" waitForDiscountElement" />
Original file line number Diff line number Diff line change 72
72
<!-- Should not see the discount yet because we have not filled in postcode -->
73
73
<amOnPage url =" {{CheckoutCartPage.url}}" stepKey =" goToCartPage" />
74
74
<waitForPageLoad stepKey =" waitForCartPage" />
75
+ <click selector =" {{CheckoutCartSummarySection.shippingHeading}}" stepKey =" expandShipping" />
76
+ <checkOption selector =" {{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey =" selectFlatRateShipping" />
75
77
<see selector =" {{CheckoutCartSummarySection.subtotal}}" userInput =" $123.00" stepKey =" seeSubtotal" />
76
78
<dontSeeElement selector =" {{CheckoutCartSummarySection.discountAmount}}" stepKey =" dontSeeDiscount" />
77
79
78
80
<!-- See discount if we use valid postcode -->
79
- <click selector =" {{CheckoutCartSummarySection.shippingHeading}}" stepKey =" expandShipping" />
80
81
<selectOption selector =" {{CheckoutCartSummarySection.stateProvince}}" userInput =" Indiana" stepKey =" fillState" />
81
82
<waitForPageLoad stepKey =" waitForPostcode1" />
82
83
<waitForElementVisible selector =" {{CheckoutCartSummarySection.discountAmount}}" stepKey =" waitForDiscountElement" />
Original file line number Diff line number Diff line change 106
106
<data name =" productPrice/0/special" xsi : type =" string" >5</data >
107
107
<data name =" productPrice/0/sub_total" xsi : type =" string" >5</data >
108
108
<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 >
109
111
<constraint name =" Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedCatalogPage" />
110
112
<constraint name =" Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedProductPage" />
111
113
<constraint name =" Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedShoppingCart" />
Original file line number Diff line number Diff line change @@ -67,7 +67,6 @@ function () {
67
67
*/
68
68
private function waitFormLoading ()
69
69
{
70
- $ this ->_rootElement ->click ();
71
70
$ this ->browser ->waitUntil (
72
71
function () {
73
72
return $ this ->browser ->find ($ this ->waitElement )->isVisible () ? null : true ;
You can’t perform that action at this time.
0 commit comments