Skip to content

Commit 5525815

Browse files
pmclainpmclain
committed
Merge remote-tracking branch 'upstream/2.3-develop' into feature/bundle-cart
2 parents 76a8f29 + adb5dff commit 5525815

File tree

68 files changed

+700
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+700
-135
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ if ($isField) {
5353

5454
<?php if (!$element->getNoContainer()) : ?>
5555
<fieldset class="<?= $block->escapeHtmlAttr($cssClass) ?>" id="<?= $block->escapeHtmlAttr($id) ?>">
56+
<?php if (strlen($element->getBeforeElementHtml())) : ?>
57+
<?= $element->getBeforeElementHtml() ?>
58+
<?php endif ?>
5659
<?php if ($element->getLegend() && !$isWrapped) : ?>
5760
<legend class="<?= /* @noEscape */ $isField ? 'label admin__field-label' : 'admin__legend legend' ?>">
5861
<span><?= $block->escapeHtml($element->getLegend()) ?></span>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
8080
<element name="sectionHeaderOpened" type="button" selector="[data-index='websites']._show" timeout="30"/>
8181
<element name="website" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox']" parameterized="true"/>
82+
<element name="websiteChecked" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox'][@value='1']" parameterized="true"/>
8283
</section>
8384
<section name="ProductDesignSection">
8485
<element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="StorefrontProductActionSection">
1111
<element name="quantity" type="input" selector="#qty"/>
12-
<element name="addToCart" type="button" selector="#product-addtocart-button"/>
12+
<element name="addToCart" type="button" selector="#product-addtocart-button" timeout="60"/>
1313
<element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
1414
<element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
1515
<element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,9 @@ protected function getFieldsForFieldset()
175175
$label = __('Websites');
176176

177177
$defaultWebsiteId = $this->websiteRepository->getDefault()->getId();
178-
$isOnlyOneWebsiteAvailable = count($websitesList) === 1;
179178
foreach ($websitesList as $website) {
180179
$isChecked = in_array($website['id'], $websiteIds)
181-
|| ($defaultWebsiteId == $website['id'] && $isNewProduct)
182-
|| $isOnlyOneWebsiteAvailable;
180+
|| ($defaultWebsiteId == $website['id'] && $isNewProduct);
183181
$children[$website['id']] = [
184182
'arguments' => [
185183
'data' => [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="totalAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price' and contains(text(), '{{amount}}')]" parameterized="true"/>
2121
<element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
2222
<element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
23-
<element name="shippingHeading" type="button" selector="#block-shipping-heading"/>
23+
<element name="shippingHeading" type="button" selector="#block-shipping-heading" timeout="60"/>
2424
<element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
2525
<element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
2626
<element name="stateProvinceInput" type="input" selector="input[name='region']"/>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
1515
<element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
1616
<element name="shippingMethodFlatRate" type="radio" selector="#checkout-shipping-method-load input[value='flatrate_flatrate']"/>
17-
<element name="shippingMethodFreeShipping" type="radio" selector="#checkout-shipping-method-load input[value='freeshipping_freeshipping']"/>
17+
<element name="shippingMethodFreeShipping" type="radio" selector="#checkout-shipping-method-load input[value='freeshipping_freeshipping']" timeout="60"/>
1818
<element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
1919
<element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
2020
<element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="productName" type="text" selector=".product-item-name"/>
1717
<element name="productOptionsDetailsByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[.='See Details']" parameterized="true"/>
1818
<element name="productOptionByNameAndAttribute" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//dt[@class='label' and .='{{var2}}']/following-sibling::dd[@class='values']//span" parameterized="true"/>
19-
<element name="showCart" type="button" selector="a.showcart"/>
19+
<element name="showCart" type="button" selector="a.showcart" timeout="60"/>
2020
<element name="quantity" type="button" selector="span.counter-number"/>
2121
<element name="miniCartOpened" type="button" selector="a.showcart.active"/>
2222
<element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>

‎app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="ContentManagementSection">
12-
<element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
12+
<element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head" timeout="60"/>
1313
<element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
1414
<element name="EnableSystemValue" type="button" selector="#cms_wysiwyg_enabled_inherit"/>
1515
<element name="EnableWYSIWYG" type="button" selector="#cms_wysiwyg_enabled"/>
16-
<element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit"/>
16+
<element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit" timeout="60"/>
1717
<element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
1818
<element name="StaticURL" type="button" selector="#cms_wysiwyg_use_static_urls_in_catalog" />
1919
<element name="Save" type="button" selector="#save" timeout="30"/>

‎app/code/Magento/Customer/Model/CustomerIdProvider.php

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Customer\Model;
9+
10+
use Magento\Framework\App\RequestInterface;
11+
12+
/**
13+
* Provides customer id from request.
14+
*/
15+
class CustomerIdProvider
16+
{
17+
/**
18+
* @var RequestInterface
19+
*/
20+
private $request;
21+
22+
/**
23+
* @param RequestInterface $request
24+
*/
25+
public function __construct(
26+
RequestInterface $request
27+
) {
28+
$this->request = $request;
29+
}
30+
31+
/**
32+
* Get customer id from request.
33+
*
34+
* @return int
35+
*/
36+
public function getCustomerId(): int
37+
{
38+
return (int)$this->request->getParam('id');
39+
}
40+
}

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.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:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="StorefrontCustomerLogoutActionGroup">
1212
<amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="storefrontSignOut"/>
13+
<waitForPageLoad stepKey="waitForSignOut"/>
1314
</actionGroup>
1415

1516
<actionGroup name="StorefrontSignOutActionGroup">

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontCustomerSidebarSection">
12-
<element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true"/>
12+
<element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true" timeout="60"/>
1313
<element name="sidebarCurrentTab" type="text" selector="//div[@id='block-collapsible-nav']//*[contains(text(), '{{var}}')]" parameterized="true"/>
1414
</section>
1515
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<!-- 2. Navigate to Customers > Customer Groups -->
2828
<amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
2929
<waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
30+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
3031

3132
<!-- 3. Select system Customer Group specified in data set from grid -->
3233
<click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />

‎app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
<referenceContainer name="content">
1616
<uiComponent name="customer_form"/>
1717
</referenceContainer>
18+
<referenceContainer name="after.body.start">
19+
<block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" name="after.body.start.product_composite_configure" template="Magento_Catalog::catalog/product/composite/configure.phtml"/>
20+
</referenceContainer>
1821
</body>
1922
</page>

‎app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
131131
ScopeInterface::SCOPE_STORE
132132
);
133133
$linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
134+
135+
$linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING;
136+
if ($orderStatusToEnableItem == \Magento\Sales\Model\Order\Item::STATUS_PENDING
137+
|| $orderItem->getOrder()->getState() == \Magento\Sales\Model\Order::STATE_COMPLETE
138+
) {
139+
$linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE;
140+
}
141+
134142
foreach ($linkIds as $linkId) {
135143
if (isset($links[$linkId])) {
136144
$linkPurchasedItem = $this->_createPurchasedItemModel()->setPurchasedId(
@@ -158,9 +166,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
158166
)->setNumberOfDownloadsBought(
159167
$numberOfDownloads
160168
)->setStatus(
161-
\Magento\Sales\Model\Order\Item::STATUS_PENDING == $orderStatusToEnableItem ?
162-
\Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
163-
\Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
169+
$linkStatus
164170
)->setCreatedAt(
165171
$orderItem->getCreatedAt()
166172
)->setUpdatedAt(
@@ -170,7 +176,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
170176
}
171177
}
172178
}
173-
174179
return $this;
175180
}
176181

‎app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<?php foreach ($_options as $_option) : ?>
1313
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1414
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
15-
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>
15+
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
1616
<?= $block->escapeHtml($_formatedOptionValue['value']) ?>
1717
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
1818
<dl class="item options tooltip content">

‎app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<element name="templateSubject" type="input" selector="#subject"/>
1313
<element name="senderName" type="input" selector="#sender_name"/>
1414
<element name="senderEmail" type="input" selector="#sender_email"/>
15-
<element name="save" type="button" selector="button[data-role='template-save']"/>
15+
<element name="save" type="button" selector="button[data-role='template-save']" timeout="60"/>
1616
<element name="searchButton" type="button" selector=".admin__filter-actions button[title=Search]"/>
1717
<element name="searchInput" type="input" selector="input[name=code]"/>
1818
</section>
1919
<section name="NewsletterWYSIWYGSection">
2020
<element name="TextArea" type="text" selector="#text" />
2121
<element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
22-
<element name="ShowHideBtn" type="button" selector="#toggletext"/>
22+
<element name="ShowHideBtn" type="button" selector="#toggletext" timeout="60"/>
2323
<element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
2424
<element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
2525
<element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
@@ -51,6 +51,6 @@
5151
<element name="InsertImage" type="button" selector=".mce-i-image" />
5252
<element name="InsertTable" type="button" selector=".mce-i-table" />
5353
<element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
54-
<element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true"/>
54+
<element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true" timeout="60"/>
5555
</section>
5656
</sections>

‎app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
3030
<fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
3131
<conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
32+
<waitForPageLoad stepKey="waitForTinyMce"/>
3233
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
3334
<actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
3435
<executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>

‎app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="OrderReportMainSection">
12-
<element name="showReport" type="button" selector="#filter_form_submit"/>
13-
<element name="here" type="text" selector="//a[contains(text(), 'here')]"/>
12+
<element name="showReport" type="button" selector="#filter_form_submit" timeout="60"/>
13+
<element name="here" type="text" selector="//a[contains(text(), 'here')]" timeout="60"/>
1414
</section>
1515

1616
<section name="OrderReportFilterSection">

‎app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-95960"/>
1919
<useCaseId value="MAGETWO-95823"/>
20-
<skip>
21-
<issueId value="MC-17274"/>
22-
</skip>
2320
</annotations>
2421

2522
<before>
@@ -69,6 +66,7 @@
6966

7067
<!-- Generate Order report for statuses -->
7168
<amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage1"/>
69+
<waitForPageLoad stepKey="waitForOrdersReportPageLoad1"/>
7270
<!-- Get date -->
7371
<generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
7472
<generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
@@ -81,6 +79,7 @@
8179
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersSpecified"/>
8280
<!-- Generate Order report -->
8381
<amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage2"/>
82+
<waitForPageLoad stepKey="waitForOrdersReportPageLoad2"/>
8483
<!-- Get date -->
8584
<actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
8685
<argument name="orderFromDate" value="$generateStartDate"/>

‎app/code/Magento/Sales/Block/Adminhtml/ShoppingCartsTab.php

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Sales\Block\Adminhtml;
7+
8+
use Magento\Backend\Block\Template\Context;
9+
use Magento\Customer\Model\CustomerIdProvider;
10+
use Magento\Ui\Component\Layout\Tabs\TabWrapper;
11+
12+
/**
13+
* Class ShoppingCarts
14+
*
15+
* @package Magento\Sales\Block\Adminhtml
16+
*/
17+
class ShoppingCartsTab extends TabWrapper
18+
{
19+
/**
20+
* @var bool
21+
*/
22+
protected $isAjaxLoaded = true;
23+
24+
/**
25+
* @var CustomerIdProvider
26+
*/
27+
private $customerIdProvider;
28+
29+
/**
30+
* @param Context $context
31+
* @param CustomerIdProvider $customerIdProvider
32+
* @param array $data
33+
*/
34+
public function __construct(Context $context, CustomerIdProvider $customerIdProvider, array $data = [])
35+
{
36+
parent::__construct($context, $data);
37+
$this->customerIdProvider = $customerIdProvider;
38+
}
39+
40+
/**
41+
* @inheritdoc
42+
*/
43+
public function canShowTab()
44+
{
45+
return $this->customerIdProvider->getCustomerId();
46+
}
47+
48+
/**
49+
* Return Tab label
50+
*
51+
* @codeCoverageIgnore
52+
*
53+
* @return \Magento\Framework\Phrase
54+
*/
55+
public function getTabLabel()
56+
{
57+
return __('Shopping cart');
58+
}
59+
60+
/**
61+
* Return URL link to Tab content
62+
*
63+
* @return string
64+
*/
65+
public function getTabUrl()
66+
{
67+
return $this->getUrl('customer/*/cart', ['_current' => true]);
68+
}
69+
}

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,15 @@
418418
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
419419
<waitForPageLoad stepKey="waitForProductsListForOrder"/>
420420
<click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
421+
<waitForPageLoad stepKey="waitForClickProduct"/>
421422
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
422423
<waitForPageLoad stepKey="waitForProductAddedInOrder"/>
423424
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
424425
<waitForPageLoad stepKey="waitForShippingMethods"/>
425426
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
426427
<waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
427428
<click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
429+
<waitForPageLoad stepKey="waitForSubmitOrder"/>
428430
<see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
429431
</actionGroup>
430432
</actionGroups>

0 commit comments

Comments
 (0)