Skip to content

Commit 054c1b5

Browse files
author
Joan He
committed
Merge branch 'MAGETWO-89232' into BugFixPR
2 parents 64aa3b9 + 2a0301e commit 054c1b5

File tree

5 files changed

+57
-1
lines changed

5 files changed

+57
-1
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,13 @@
164164
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
165165
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
166166
</actionGroup>
167+
<!--Delete all products by filtering grid and using mass delete action-->
168+
<actionGroup name="deleteAllDuplicateProductUsingProductGrid" extends="deleteProductUsingProductGrid">
169+
<arguments>
170+
<argument name="product"/>
171+
</arguments>
172+
<remove keyForRemoval="seeProductSkuInGrid"/>
173+
</actionGroup>
167174

168175
<!--Delete a product by filtering grid and using delete action-->
169176
<actionGroup name="deleteProductBySku">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="saveAndClose" type="button" selector="span[title='Save &amp; Close']" timeout="30"/>
1616
<element name="changeStoreButton" type="button" selector="#store-change-button" timeout="10"/>
1717
<element name="selectStoreView" type="button" selector="//ul[@data-role='stores-list']/li/a[normalize-space(.)='{{var1}}']" timeout="10" parameterized="true"/>
18+
<element name="saveAndDuplicate" type="button" selector="span[id='save_and_duplicate']" timeout="30"/>
1819
</section>
1920
</sections>

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,46 @@
4040
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
4141
<see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
4242
</test>
43+
<test name="AdminCreateProductDuplicateProductTest">
44+
<annotations>
45+
<features value="Catalog"/>
46+
<stories value="Validation Errors"/>
47+
<title value="No validation errors when trying to duplicate product twice"/>
48+
<description value="No validation errors when trying to duplicate product twice"/>
49+
<severity value="MAJOR"/>
50+
<testCaseId value="MC-5472"/>
51+
<group value="product"/>
52+
</annotations>
53+
<before>
54+
<createData entity="_defaultCategory" stepKey="createCategory"/>
55+
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
56+
<requiredEntity createDataKey="createCategory"/>
57+
</createData>
58+
</before>
59+
<after>
60+
<!--Delete all products by filtering grid and using mass delete action-->
61+
<actionGroup ref="deleteAllDuplicateProductUsingProductGrid" stepKey="deleteAllDuplicateProducts">
62+
<argument name="product" value="$$createSimpleProduct$$"/>
63+
</actionGroup>
64+
<deleteData createDataKey="createCategory" stepKey="deletePreReqCatalog" />
65+
<actionGroup ref="logout" stepKey="logout"/>
66+
</after>
67+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
68+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct1">
69+
<argument name="product" value="$$createSimpleProduct$$"/>
70+
</actionGroup>
71+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
72+
<argument name="product" value="$$createSimpleProduct$$"/>
73+
</actionGroup>
74+
<!--Save and duplicated the product once-->
75+
<actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm1"/>
76+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
77+
<argument name="product" value="$$createSimpleProduct$$"/>
78+
</actionGroup>
79+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
80+
<argument name="product" value="$$createSimpleProduct$$"/>
81+
</actionGroup>
82+
<!--Save and duplicated the product second time-->
83+
<actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm2"/>
84+
</test>
4385
</tests>

‎app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,10 @@
1313
<click selector="{{AdminProductFormActionSection.saveAndClose}}" stepKey="clickOnSaveAndClose"/>
1414
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
1515
</actionGroup>
16+
<actionGroup name="AdminFormSaveAndDuplicate">
17+
<click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
18+
<click selector="{{AdminProductFormActionSection.saveAndDuplicate}}" stepKey="clickOnSaveAndDuplicate"/>
19+
<see selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveSuccess" userInput="You saved the product."/>
20+
<see selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertDuplicateSuccess" userInput="You duplicated the product."/>
21+
</actionGroup>
1622
</actionGroups>

‎app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Magento\Framework\Phrase;
99

1010
/**
11-
* Specific exception for URL key already exists
11+
* Exception for already created url.
1212
*
1313
* @api
1414
* @since 100.2.0

0 commit comments

Comments
 (0)