Skip to content

Commit 1235271

Browse files
author
Stas Puga
committed
Merge remote-tracking branch 'origin/MAGETWO-96249' into 2.2-develop-mftf-pr10
2 parents 14a569a + d3d6d7b commit 1235271

File tree

8 files changed

+34
-33
lines changed

8 files changed

+34
-33
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
</before>
2424
<after>
2525
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
26+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderListingFilters"/>
27+
<actionGroup ref="logout" stepKey="logoutAdmin"/>
2628
</after>
2729

2830
<!--Create Simple Product with Custom Options-->
@@ -36,10 +38,9 @@
3638

3739
<!-- Login Customer Storeront -->
3840

39-
<amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
40-
<fillField userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
41-
<fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
42-
<click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
41+
<actionGroup ref="CustomerLoginOnStorefront" stepKey="loginCustomerOnStorefront">
42+
<argument name="customer" value="$$createCustomer$$"/>
43+
</actionGroup>
4344

4445
<!-- Checking the correctness of displayed prices for user parameters -->
4546

@@ -121,13 +122,11 @@
121122

122123
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
123124

124-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
125-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
126-
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
127-
<fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
128-
<click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
129-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
130-
<click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
125+
<actionGroup ref="filterOrderGridById" stepKey="filterByOrderId">
126+
<argument name="orderId" value="$grabOrderNumber"/>
127+
</actionGroup>
128+
<click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
129+
<waitForPageLoad stepKey="waitForOrderPageOpened"/>
131130

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

@@ -176,6 +175,9 @@
176175
<see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/18, 1:00 AM')}}" userInput="1/1/18, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
177176
<see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
178177

178+
<!-- Logout customer -->
179+
<actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutCustomer"/>
180+
179181
<!-- Delete product and category -->
180182

181183
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>

‎app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php

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

88
use Magento\Framework\Event\ObserverInterface;
99

10+
/**
11+
* Class SalesQuoteSaveAfterObserver
12+
*/
1013
class SalesQuoteSaveAfterObserver implements ObserverInterface
1114
{
1215
/**
@@ -24,15 +27,18 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
2427
}
2528

2629
/**
30+
* Assign quote to session
31+
*
2732
* @param \Magento\Framework\Event\Observer $observer
2833
* @return void
2934
*/
3035
public function execute(\Magento\Framework\Event\Observer $observer)
3136
{
37+
/* @var \Magento\Quote\Model\Quote $quote */
3238
$quote = $observer->getEvent()->getQuote();
33-
/* @var $quote \Magento\Quote\Model\Quote */
39+
3440
if ($quote->getIsCheckoutCart()) {
35-
$this->checkoutSession->getQuoteId($quote->getId());
41+
$this->checkoutSession->setQuoteId($quote->getId());
3642
}
3743
}
3844
}

‎app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ protected function setUp()
3030

3131
public function testSalesQuoteSaveAfter()
3232
{
33+
$quoteId = 7;
3334
$observer = $this->createMock(\Magento\Framework\Event\Observer::class);
3435
$observer->expects($this->once())->method('getEvent')->will(
3536
$this->returnValue(new \Magento\Framework\DataObject(
36-
['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => 7])]
37+
['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => $quoteId])]
3738
))
3839
);
39-
$this->checkoutSession->expects($this->once())->method('getQuoteId')->with(7);
40+
$this->checkoutSession->expects($this->once())->method('setQuoteId')->with($quoteId);
4041

4142
$this->object->execute($observer);
4243
}

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
<argument name="customer" defaultValue="customer"/>
1414
</arguments>
1515
<amOnPage stepKey="loginPage" url="customer/account/login/"/>
16-
<waitForPageLoad stepKey="pageLoadBeforeLogin"/>
1716
<fillField stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
1817
<fillField stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
1918
<click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
2019
</actionGroup>
2120

2221
<actionGroup name="CustomerLogoutStorefrontActionGroup">
2322
<amOnPage url="customer/account/logout/" stepKey="storefrontSignOut"/>
24-
<waitForPageLoad time="30" stepKey="waitForLogOut"/>
2523
</actionGroup>
2624
</actionGroups>

‎app/code/Magento/Newsletter/etc/adminhtml/system.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@
1111
<label>Newsletter</label>
1212
<tab>customer</tab>
1313
<resource>Magento_Newsletter::newsletter</resource>
14-
<group id="subscription" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
14+
<group id="subscription" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
1515
<label>Subscription Options</label>
16-
<field id="allow_guest_subscribe" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
16+
<field id="allow_guest_subscribe" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
1717
<label>Allow Guest Subscription</label>
1818
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1919
</field>
20-
<field id="confirm" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
20+
<field id="confirm" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2121
<label>Need to Confirm</label>
2222
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
2323
</field>
24-
<field id="confirm_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
24+
<field id="confirm_email_identity" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2525
<label>Confirmation Email Sender</label>
2626
<source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
2727
</field>
28-
<field id="confirm_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
28+
<field id="confirm_email_template" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2929
<label>Confirmation Email Template</label>
3030
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
3131
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
3232
</field>
33-
<field id="success_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
33+
<field id="success_email_identity" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3434
<label>Success Email Sender</label>
3535
<source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
3636
</field>
37-
<field id="success_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
37+
<field id="success_email_template" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3838
<label>Success Email Template</label>
3939
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
4040
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
4141
</field>
42-
<field id="un_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
42+
<field id="un_email_identity" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4343
<label>Unsubscription Email Sender</label>
4444
<source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
4545
</field>
46-
<field id="un_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
46+
<field id="un_email_template" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4747
<label>Unsubscription Email Template</label>
4848
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
4949
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
<argument name="orderId" type="string"/>
1515
</arguments>
1616
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
17-
<waitForPageLoad stepKey="waitForOrderGridLoad"/>
1817
<conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
1918
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
2019
<fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
2120
<click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
2221
</actionGroup>
2322
<actionGroup name="AdminOrdersGridClearFiltersActionGroup">
2423
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
25-
<waitForPageLoad stepKey="waitForPageToLoad"/>
2624
<conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
2725
</actionGroup>
2826
</actionGroups>

‎lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66
return [
7-
'without_event_handle' => [
8-
'<?xml version="1.0"?><config></config>',
9-
["Element 'config': Missing child element(s). Expected is ( event ).\nLine: 1\n"],
10-
],
117
'event_without_required_name_attribute' => [
128
'<?xml version="1.0"?><config><event name="some_name"></event></config>',
139
["Element 'event': Missing child element(s). Expected is ( observer ).\nLine: 1\n"],

‎lib/internal/Magento/Framework/Event/etc/events.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<xs:element name="config">
1010
<xs:complexType>
1111
<xs:sequence>
12-
<xs:element name="event" type="eventDeclaration" minOccurs="1" maxOccurs="unbounded">
12+
<xs:element name="event" type="eventDeclaration" minOccurs="0" maxOccurs="unbounded">
1313
<xs:unique name="uniqueObserverName">
1414
<xs:annotation>
1515
<xs:documentation>

0 commit comments

Comments
 (0)