Skip to content

Commit 0eb8677

Browse files
viktymviktym
authored
Merge pull request #3093 from magento-tsg/2.3-develop-pr33
[TSG] Upporting for 2.3 (pr33) (2.3.0)
2 parents 61fb87f + 56a5856 commit 0eb8677

File tree

8 files changed

+63
-39
lines changed

8 files changed

+63
-39
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@
6868
<!-- Open Product Grid, Filter product and open -->
6969

7070
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
71-
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
71+
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
7272

73-
<actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions">
73+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
7474
<argument name="product" value="_defaultProduct"/>
7575
</actionGroup>
76+
7677
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
77-
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
78+
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
7879

7980
<!-- Update Product with Option Value DropDown 1-->
80-
8181
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
8282
<click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
83-
<waitForPageLoad time="10" stepKey="waitForPageLoad7"/>
83+
<waitForPageLoad time="10" stepKey="waitForPageLoad3"/>
8484
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
8585
<click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
8686
<click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
@@ -97,19 +97,20 @@
9797
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
9898

9999
<!-- Switcher to Store FR-->
100+
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
100101

101102
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
102103
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
103104
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
104105

105106
<!-- Open tab Customizable Options -->
106107

107-
<waitForPageLoad time="10" stepKey="waitForPageLoad2"/>
108+
<waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
108109
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
109110

110111
<!-- Update Option Customizable Options and Option Value 1-->
111112

112-
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
113+
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
113114
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="uncheckUseDefaultOptionTitle"/>
114115
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('Custom Options 1')}}" userInput="FR Custom Options 1" stepKey="fillOptionTitle2"/>
115116
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="uncheckUseDefaultOptionValueTitle1"/>
@@ -125,15 +126,16 @@
125126
<!-- Login Customer Storefront -->
126127

127128
<amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
128-
<waitForPageLoad stepKey="waitForSignInPage"/>
129+
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
129130
<fillField userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
130131
<fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
131132
<click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
132133

133134
<!-- Go to Product Page -->
134135

135136
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
136-
<waitForPageLoad stepKey="waitForProductPage"/>
137+
<waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
138+
137139
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
138140
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
139141
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeproductOptionDropDownOptionTitle2"/>
@@ -171,22 +173,24 @@
171173
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
172174
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
173175
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
176+
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
174177

175178
<!-- Place Order -->
176179

177-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
180+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
178181
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
179182

180183
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
181184

182185
<!-- Open Order -->
183186

184187
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
185-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
188+
<waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
186189
<fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
187190
<click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
188191
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
189192
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
193+
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
190194

191195
<!-- Checking the correctness of displayed custom options for user parameters on Order -->
192196

@@ -196,14 +200,15 @@
196200
<!-- Switch to FR Store View Storefront -->
197201

198202
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
199-
<waitForPageLoad stepKey="waitForStorefrontHomePage"/>
203+
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
200204
<click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
201205
<waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
202206
<click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
203-
<waitForPageLoad stepKey="waitForPageLoad4"/>
207+
<waitForPageLoad stepKey="waitForPageLoad12"/>
204208

205209
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
206-
<waitForPageLoad stepKey="waitForProductPage2"/>
210+
<waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
211+
207212
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
208213
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
209214
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option2')}}" stepKey="productFrOptionDropDownOptionTitle2"/>
@@ -241,52 +246,56 @@
241246
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
242247
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
243248
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
249+
<waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
244250

245251
<!-- Place Order -->
246252

247-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton1"/>
253+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
248254
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
249255

250256
<!-- Open Product Grid, Filter product and open -->
251257

252258
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
253-
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
259+
<waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
254260

255-
<actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions1">
261+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
256262
<argument name="product" value="_defaultProduct"/>
257263
</actionGroup>
264+
258265
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit1"/>
259-
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
266+
<waitForPageLoad time="30" stepKey="waitForPageLoad16"/>
260267

261268
<!-- Switcher to Store FR-->
262269

270+
<scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
263271
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher1"/>
264272
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView1"/>
265273
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage1"/>
266274

267275
<!-- Open tab Customizable Options -->
268276

269-
<waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
277+
<waitForPageLoad time="30" stepKey="waitForPageLoad17"/>
270278
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
271279

272280
<!-- Update Option Customizable Options and Option Value 1-->
273281

274-
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
282+
<waitForPageLoad time="30" stepKey="waitForPageLoad18"/>
275283
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="checkUseDefaultOptionTitle"/>
276284
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="checkUseDefaultOptionValueTitle1"/>
277285

278286
<!-- Update Product with Option Value 1 DropDown 1-->
279287

280-
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
288+
<waitForPageLoad time="30" stepKey="waitForPageLoad19"/>
281289
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
282290
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
283291

284292
<!--Go to Product Page-->
285293

286294
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
287-
<waitForPageLoad stepKey="waitForProductPage3"/>
295+
<waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
296+
288297
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
289298
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
290299
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeProductOptionDropDownOptionTitle4"/>
291300
</test>
292-
</tests>
301+
</tests>

‎app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ define([
448448
scriptTag = document.getElementsByTagName('script')[0];
449449

450450
element.async = true;
451-
element.src = 'https://secure-a.vimeocdn.com/js/froogaloop2.min.js';
451+
element.src = 'https://f.vimeocdn.com/js/froogaloop2.min.js';
452452

453453
/**
454454
* Vimeo js framework on load callback.

‎app/code/Magento/Sales/Model/Service/PaymentFailuresService.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Magento\Backend\App\Area\FrontNameResolver;
1111
use Magento\Framework\App\Config\ScopeConfigInterface;
12+
use Magento\Framework\App\ObjectManager;
1213
use Magento\Framework\Mail\Template\TransportBuilder;
1314
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
1415
use Magento\Framework\Translate\Inline\StateInterface;
@@ -17,11 +18,14 @@
1718
use Magento\Sales\Api\PaymentFailuresInterface;
1819
use Magento\Store\Model\ScopeInterface;
1920
use Magento\Store\Model\Store;
21+
use Psr\Log\LoggerInterface;
2022

2123
/**
2224
* Service is responsible for handling failed payment transactions.
2325
*
2426
* It depends on Stores > Configuration > Sales > Checkout > Payment Failed Emails configuration.
27+
*
28+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2529
*/
2630
class PaymentFailuresService implements PaymentFailuresInterface
2731
{
@@ -52,25 +56,33 @@ class PaymentFailuresService implements PaymentFailuresInterface
5256
*/
5357
private $cartRepository;
5458

59+
/**
60+
* @var LoggerInterface
61+
*/
62+
private $logger;
63+
5564
/**
5665
* @param ScopeConfigInterface $scopeConfig
5766
* @param StateInterface $inlineTranslation
5867
* @param TransportBuilder $transportBuilder
5968
* @param TimezoneInterface $localeDate
6069
* @param CartRepositoryInterface $cartRepository
70+
* @param LoggerInterface|null $logger
6171
*/
6272
public function __construct(
6373
ScopeConfigInterface $scopeConfig,
6474
StateInterface $inlineTranslation,
6575
TransportBuilder $transportBuilder,
6676
TimezoneInterface $localeDate,
67-
CartRepositoryInterface $cartRepository
77+
CartRepositoryInterface $cartRepository,
78+
LoggerInterface $logger = null
6879
) {
6980
$this->scopeConfig = $scopeConfig;
7081
$this->inlineTranslation = $inlineTranslation;
7182
$this->transportBuilder = $transportBuilder;
7283
$this->localeDate = $localeDate;
7384
$this->cartRepository = $cartRepository;
85+
$this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
7486
}
7587

7688
/**
@@ -128,7 +140,11 @@ public function handle(
128140
->addBcc($bcc)
129141
->getTransport();
130142

131-
$transport->sendMessage();
143+
try {
144+
$transport->sendMessage();
145+
} catch (\Exception $e) {
146+
$this->logger->critical($e->getMessage());
147+
}
132148
}
133149

134150
$this->inlineTranslation->resume();

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
padding-top: @main__indent-top;
2020
}
2121

22+
.menu-wrapper {
23+
.logo-static {
24+
pointer-events: none;
25+
}
26+
}
27+
2228
//
2329
// Header
2430
// _____________________________________________

‎dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AbandonedCartsReportEntityTest extends Injectable
3434
{
3535
/* tags */
3636
const MVP = 'no';
37-
const STABLE = 'no';
37+
const STABLE = 'yes';
3838
/* end tags */
3939

4040
/**

‎dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Store\Test\TestCase\DeleteStoreGroupEntityTest" summary="Delete Store Group" ticketId="MAGETWO-27596">
1010
<variation name="DeleteStoreGroupEntityTestVariation1">
11-
<data name="tag" xsi:type="string">severity:S3, stable:no</data>
11+
<data name="tag" xsi:type="string">severity:S3</data>
1212
<data name="storeGroup/dataset" xsi:type="string">custom</data>
1313
<data name="createBackup" xsi:type="string">Yes</data>
1414
<constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteAndBackupMessages" />

‎setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎setup/view/magento/setup/navigation/side-menu.phtml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66

77
// @codingStandardsIgnoreFile
88

9-
use Magento\Backend\Model\UrlInterface;
10-
use Magento\Framework\App\ObjectManager;
11-
12-
$objectManager = ObjectManager::getInstance();
13-
/** @var Magento\Backend\Model\UrlInterface $backendUrl */
14-
$backendUrl = $objectManager->get(UrlInterface::class);
15-
169
?>
1710
<?php $expressions = []; foreach ( $this->main as $item ): ?>
1811
<?php $expressions[] = '!$state.is(\'' . $item['id'] . '\')';
@@ -27,13 +20,13 @@ $backendUrl = $objectManager->get(UrlInterface::class);
2720
ng-show="<?= implode( '&&', $expressions) ?>"
2821
>
2922
<nav class="admin__menu" ng-controller="mainController">
30-
<a href="<?= $backendUrl->getBaseUrl() . $backendUrl->getAreaFrontName(); ?>"
31-
class="logo"
23+
<span
24+
class="logo logo-static"
3225
data-edition="Community Edition">
3326
<img class="logo-img"
3427
src="./pub/images/logo.svg"
3528
alt="Magento Admin Panel">
36-
</a>
29+
</span>
3730
<ul id="nav" role="menubar">
3831
<li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
3932
<a href="" ui-sref="root.home">

0 commit comments

Comments
 (0)