Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 840a7aa

Browse files
author
Joan He
authored
Merge pull request #3260 from magento-borg/BugFixPR
[2.3.0-regression] Bug Fixes
2 parents 3001311 + 41f2669 commit 840a7aa

File tree

23 files changed

+80
-47
lines changed

23 files changed

+80
-47
lines changed

‎app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="adminNoReport" type="user">
1212
<data key="username" unique="suffix">noreport</data>
1313
<data key="firstname">No</data>
@@ -18,7 +18,7 @@
1818
<data key="interface_local">en_US</data>
1919
<data key="is_active">true</data>
2020
<data key="current_password">123123q</data>
21-
</entity>
21+
</entity>
2222
<entity name="restrictedWebUser" type="user">
2323
<data key="username" unique="suffix">restrictedWebUser</data>
2424
<data key="firstname">restricted</data>

‎app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigSection.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<section name="AdminConfigSection">
10+
<element name="advancedReportingMenuItem" type="text" selector="//*[@id='system_config_tabs']/div[1]//span[text()='Advanced Reporting']"/>
11+
<element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
12+
<element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
13+
<element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
14+
<element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
15+
<element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
16+
<element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
17+
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
18+
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
19+
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
20+
<element name="advancedReportingSuccessMessage" type="text" selector=".message-success>div"/>
21+
</section>
22+
</sections>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-66465"/>
1818
<group value="analytics"/>
19-
<skip>
20-
<issueId value="MAGETWO-90659"/>
21-
</skip>
2219
</annotations>
2320
<after>
2421
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-90659"/>
22-
</skip>
2320
</annotations>
2421

2522
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-82648"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-90659"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData stepKey="noReportUserRole" entity="adminNoReportRole"/>

‎app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.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/testSchema.xsd">
1111
<section name="BraintreeConfigurationPaymentSection">
1212
<element name="creditCart" type="radio" selector="#braintree"/>
13+
<element name="paymentMethodContainer" type="block" selector=".payment-method-braintree"/>
1314
<element name="paymentMethod" type="radio" selector="//div[@class='payment-group']//input[contains(@id, 'braintree_cc_vault_')]"/>
1415
<element name="cartFrame" type="iframe" selector="braintree-hosted-field-number"/>
1516
<element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>

‎app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@
6161
<!--Fill cart data-->
6262
<click selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="SelectBraintreePaymentMethod"/>
6363
<waitForPageLoad stepKey="waitForPageLoad3"/>
64+
<scrollTo selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="ScrollToCreditCardSection"/>
6465
<actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
6566
<waitForPageLoad stepKey="waitForPageLoad4"/>
6667
<!--Place order-->
67-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder"/>
68+
<click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}} {{CheckoutPaymentSection.placeOrder}}"
69+
stepKey="PlaceOrder"/>
6870
<waitForPageLoad stepKey="waitForPageLoad5"/>
6971

7072
<!--Add product to cart again-->

‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-217"/>
1919
<group value="Bundle"/>
20-
<skip>
21-
<issueId value="MAGETWO-92898"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<waitForPageLoad stepKey="waitForStoresLoaded"/>
1414
<click selector="{{CaptchaFormsDisplayingSection.config}}" stepKey="ClickToGoConfiguration"/>
1515
<waitForPageLoad stepKey="waitForConfigurationsLoaded"/>
16-
<scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ScrollToCustomers"/>
16+
<scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" x="0" y="-80" stepKey="ScrollToCustomers"/>
1717
<click selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ClickToCustomers"/>
1818
<waitForPageLoad stepKey="waitForCustomerConfigurationsLoaded"/>
1919
<click selector="{{CaptchaFormsDisplayingSection.customerConfig}}" stepKey="ClickToGoCustomerConfiguration"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
1616
<element name="filter" type="button" selector="//div[@class='data-grid-filters-action-wrap']/button" timeout="30"/>
1717
<element name="typeDropDown" type="multiselect" selector="//select[@name='type_id']" timeout="30"/>
18-
<element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[4]" timeout="30"/>
18+
<element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[@value='bundle']" timeout="30"/>
1919
<element name="applyFilters" type="button" selector="//button[@class='action-secondary']" timeout="30"/>
2020
<element name="allCheckbox" type="checkbox" selector="//div[@data-role='grid-wrapper']//label[@data-bind='attr: {for: ko.uid}']" timeout="30"/>
2121
<element name="actions" type="button" selector="//div[@class='action-select-wrap']/button" timeout="30"/>

‎app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ protected function setUp()
4949

5050
public function testEstimateRowSize()
5151
{
52-
$this->markTestSkipped('Unskip after MAGETWO-89738');
5352
$expectedResult = 40000000;
5453
$maxRelatedProductCount = 10;
5554

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@
9191
<description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
9292
<testCaseId value="MAGETWO-93109"/>
9393
<severity value="AVERAGE"/>
94-
<skip>
95-
<issueId value="MQE-1187" />
96-
</skip>
94+
<group value="checkout"/>
9795
</annotations>
9896
<before>
9997
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>
@@ -183,6 +181,8 @@
183181

184182
<click stepKey="changeShippingAddress" selector="{{CheckoutShippingMethodsSection.shipHereButton}}"/>
185183
<waitForElementNotVisible stepKey="waitForShippingMethodLoaderNotVisible" selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30"/>
184+
<waitForElementVisible stepKey="waitForShippingMethodRadioToBeVisible" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30"/>
185+
<waitForPageLoad stepKey="waitForPageLoad23"/>
186186
<click stepKey="selectFirstShippingMethod2" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
187187
<waitForElement stepKey="waitForShippingMethodSelect2" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
188188
<click stepKey="clickNextOnShippingMethodLoad2" selector="{{CheckoutShippingMethodsSection.next}}" />

‎app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="EnabledWYSIWYG">
12-
<amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
12+
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />
1313
<waitForPageLoad stepKey="wait1"/>
1414
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
1515
<waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
@@ -20,7 +20,7 @@
2020
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
2121
</actionGroup>
2222
<actionGroup name="DisabledWYSIWYG">
23-
<amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
23+
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />
2424
<waitForPageLoad stepKey="wait3"/>
2525
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
2626
<waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" time="30"/>

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="AdminConfigSection">
10-
<element name="advancedReportingMenuItem" type="text" selector="//a[contains(concat(' ',normalize-space(@class),' '),'item-nav')]/span[text()='Advanced Reporting']"/>
11-
<element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
12-
<element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
13-
<element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
14-
<element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
15-
<element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
16-
<element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
17-
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
18-
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
19-
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
20-
<element name="advancedReportingSuccessMessage" type="text" selector=".message-success>div"/>
2110
<element name="saveButton" type="button" selector="#save"/>
2211
</section>
2312
</sections>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
837837
if ($customer->getWebsiteId()) {
838838
$storeId = $this->storeManager->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
839839
} else {
840+
$this->storeManager->setCurrentStore(null);
840841
$storeId = $this->storeManager->getStore()->getId();
841842
}
842843
$customer->setStoreId($storeId);
@@ -1011,7 +1012,7 @@ protected function createPasswordHash($password)
10111012
}
10121013

10131014
/**
1014-
* Returns eval validator
1015+
* Get EAV validator
10151016
*
10161017
* @return Backend
10171018
*/
@@ -1216,7 +1217,7 @@ protected function getWebsiteStoreId($customer, $defaultStoreId = null)
12161217
}
12171218

12181219
/**
1219-
* Return array with template types
1220+
* Get template types
12201221
*
12211222
* @return array
12221223
* @deprecated 100.1.0

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
6969
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
7070
<click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
71+
<waitForPageLoad stepKey="waitForInvoicePageLoad"/>
7172
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
7273
<click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
7374
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />

‎app/code/Magento/Theme/view/base/requirejs-config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,9 @@ var config = {
6464
}
6565
}
6666
};
67+
68+
require(['jquery'], function ($) {
69+
'use strict';
70+
71+
$.noConflict();
72+
});

‎app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml renamed to ‎app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml

File renamed without changes.

‎app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml renamed to ‎app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml

File renamed without changes.

‎dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,34 @@ public function testCreateCustomerWithErrors()
213213
}
214214
}
215215

216+
public function testCreateCustomerWithoutOptionalFields()
217+
{
218+
$serviceInfo = [
219+
'rest' => [
220+
'resourcePath' => self::RESOURCE_PATH,
221+
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, ],
222+
'soap' => [
223+
'service' => self::SERVICE_NAME,
224+
'serviceVersion' => self::SERVICE_VERSION,
225+
'operation' => self::SERVICE_NAME . 'CreateAccount',
226+
],
227+
];
228+
229+
$customerDataArray = $this->dataObjectProcessor->buildOutputDataArray(
230+
$this->customerHelper->createSampleCustomerDataObject(),
231+
\Magento\Customer\Api\Data\CustomerInterface::class
232+
);
233+
unset($customerDataArray['store_id']);
234+
unset($customerDataArray['website_id']);
235+
$requestData = ['customer' => $customerDataArray, 'password' => CustomerHelper::PASSWORD];
236+
try {
237+
$customerData = $this->_webApiCall($serviceInfo, $requestData, null, 'all');
238+
$this->assertNotNull($customerData['id']);
239+
} catch (\Exception $e) {
240+
$this->fail('Customer should be created without optional fields.');
241+
}
242+
}
243+
216244
/**
217245
* Test customer activation when it is required
218246
*

‎dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,11 @@ public function testStartActionCustomerToQuote()
140140

141141
/**
142142
* Test return action with configurable product.
143+
*
144+
* @magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
143145
*/
144146
public function testReturnAction()
145147
{
146-
// Skipped due to MAGETWO-87333
147-
//@magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
148-
$this->markTestSkipped('MAGETWO-87333');
149148
$quote = $this->_objectManager->create(Quote::class);
150149
$quote->load('test_cart_with_configurable', 'reserved_order_id');
151150

‎dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ protected function setUp()
3636
* @magentoAppIsolation enabled
3737
* @param int $categoryId
3838
* @param bool $expectedResult
39+
*
40+
* @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
41+
* @magentoDataFixture Magento/SalesRule/_files/rules_category.php
3942
* @dataProvider validateProductConditionDataProvider
4043
* @magentoDbIsolation disabled
4144
*/
4245
public function testValidateCategorySalesRuleIncludesChildren($categoryId, $expectedResult)
4346
{
44-
//* @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
45-
//* @magentoDataFixture Magento/SalesRule/_files/rules_category.php
46-
$this->markTestSkipped('MAGETWO-87436');
47-
4847
// Load the quote that contains a child of a configurable product
4948
/** @var \Magento\Quote\Model\Quote $quote */
5049
$quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)

‎lib/web/jquery/patches/jquery.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ define([], function () {
2222
return function ($) {
2323
var majorVersion = $.fn.jquery.split('.')[0];
2424

25-
$.noConflict();
26-
2725
if (majorVersion >= 3) {
2826
console.warn('jQuery patch for CVE-2015-9251 is no longer necessary, and should be removed');
2927
}
3028

31-
ajaxResponsePatch(jQuery);
29+
ajaxResponsePatch($);
3230

33-
return jQuery;
31+
return $;
3432
};
3533
});

0 commit comments

Comments
 (0)