Skip to content

Commit 25c94c5

Browse files
author
Magento CICD
authored
merge magento/2.3.0-release into magento-pangolin/MQE-1267
2 parents 0e0c110 + 8487750 commit 25c94c5

File tree

49 files changed

+392
-319
lines changed

Some content is hidden

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

49 files changed

+392
-319
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.3.0
2+
=============
3+
To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
4+
15
2.1.0
26
=============
37
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Backend\Controller\Adminhtml\System\Store;
87

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
99
use Magento\Framework\Controller\ResultFactory;
1010

11-
class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
11+
/**
12+
* Delete store.
13+
*/
14+
class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
1215
{
1316
/**
17+
* @inheritDoc
1418
* @return \Magento\Backend\Model\View\Result\Redirect
1519
*/
1620
public function execute()

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Backend\Controller\Adminhtml\System\Store;
87

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
99
use Magento\Framework\Controller\ResultFactory;
1010

11-
class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
11+
/**
12+
* Delete store view.
13+
*/
14+
class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
1215
{
1316
/**
1417
* Delete store view post action

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
1010
use Magento\Framework\Controller\ResultFactory;
1111

12+
/**
13+
* Delete website.
14+
*/
1215
class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
1316
{
1417
/**
18+
* @inheritDoc
1519
* @return \Magento\Backend\Model\View\Result\Redirect
1620
*/
1721
public function execute()

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-94176"/>
1919
<group value="backup"/>
20-
<group value="skip"/>
20+
<skip>
21+
<issueId value="MQE-1187"/>
22+
<issueId value="DEVOPS-3512"/>
23+
</skip>
2124
</annotations>
2225

2326
<!--Login to admin area-->

‎app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
*/
66
namespace Magento\Catalog\Controller\Adminhtml\Category\Image;
77

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
89
use Magento\Framework\Controller\ResultFactory;
910

1011
/**
1112
* Class Upload
1213
*/
13-
class Upload extends \Magento\Backend\App\Action
14+
class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
1415
{
1516
/**
1617
* Image uploader
@@ -54,14 +55,6 @@ public function execute()
5455

5556
try {
5657
$result = $this->imageUploader->saveFileToTmpDir($imageId);
57-
58-
$result['cookie'] = [
59-
'name' => $this->_getSession()->getName(),
60-
'value' => $this->_getSession()->getSessionId(),
61-
'lifetime' => $this->_getSession()->getCookieLifetime(),
62-
'path' => $this->_getSession()->getCookiePath(),
63-
'domain' => $this->_getSession()->getCookieDomain(),
64-
];
6558
} catch (\Exception $e) {
6659
$result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
6760
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
118118
<element name="UploadImage" type="file" selector=".fileupload" />
119119
<element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
120-
<element name="InsertFile" type="text" selector="#insert_files"/>
120+
<element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
121121
<element name="CreateFolder" type="button" selector="#new_folder" />
122122
<element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
123123
<element name="CancelBtn" type="button" selector="#cancel" />

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,25 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-194"/>
1919
<group value="Catalog"/>
20-
<skip>
21-
<issueId value="MAGETWO-92780"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData entity="productDropDownAttribute" stepKey="attribute"/>
26-
2723
<createData entity="productAttributeOption1" stepKey="option1">
2824
<requiredEntity createDataKey="attribute"/>
2925
</createData>
3026
<createData entity="productAttributeOption2" stepKey="option2">
3127
<requiredEntity createDataKey="attribute"/>
3228
</createData>
33-
3429
<createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
3530
<requiredEntity createDataKey="attribute"/>
3631
</createData>
37-
3832
<createData entity="ApiProductWithDescription" stepKey="product"/>
39-
4033
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
4134
</before>
4235
<after>
4336
<deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
4437
<actionGroup ref="logout" stepKey="logout"/>
4538
</after>
46-
4739
<!-- Assert attribute presence in storefront product additional information -->
4840
<amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage1"/>
4941
<waitForPageLoad stepKey="wait1"/>
@@ -64,6 +56,8 @@
6456
<see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
6557
<!-- Save attribute set -->
6658
<actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
59+
<!-- Clear cache -->
60+
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCacheActionGroup"/>
6761
<!-- Go to create new product page -->
6862
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
6963
<waitForPageLoad stepKey="wait2"/>
@@ -72,8 +66,7 @@
7266
<!-- Assert removed attribute not presence in storefront product additional information -->
7367
<amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage2"/>
7468
<waitForPageLoad stepKey="wait3"/>
75-
<actionGroup ref="checkAttributeNotInMoreInformationTab" stepKey="checkAttributeNotInMoreInformationTab">
76-
<argument name="attributeLabel" value="$$attribute.attribute[frontend_labels][0][label]$$"/>
77-
</actionGroup>
69+
<dontSeeElement selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="dontSeeProductAttribute"/>
70+
<dontSee userInput="$$attribute.attribute[frontend_labels][0][label]$$" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="dontSeeAttributeLabel"/>
7871
</test>
7972
</tests>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<group value="product"/>
1919
<testCaseId value="MAGETWO-92384"/>
20-
<group value="skip"/>
21-
<skip>
22-
<issueId value="MAGETWO-93261"/>
23-
</skip>
2420
</annotations>
2521
<before>
2622
<createData entity="_defaultCategory" stepKey="createCategory"/>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<description value="Admin should be able to see the full title of the selected custom option value in the order"/>
1818
<severity value="MAJOR"/>
1919
<testCaseId value="MC-3043"/>
20-
<group value="skip"/>
21-
<!-- Skip due to MQE-1128 -->
22-
<skip>
23-
<issueId value="MQE-1128"/>
24-
</skip>
2520
</annotations>
2621
<before>
2722
<!--Create Simple Product with Custom Options-->
@@ -106,6 +101,6 @@
106101
</assertEquals>
107102
<moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
108103
<waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
109-
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
104+
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
110105
</test>
111106
</tests>

0 commit comments

Comments
 (0)