-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 2.3-develop into ENGCOM-3767-magento-magento2-20011
- Loading branch information
Showing
1,156 changed files
with
22,456 additions
and
5,090 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd"> | ||
| <groups> | ||
| <group id="authorizenet"> | ||
| <label>Authorize.net</label> | ||
| </group> | ||
| </groups> | ||
| </payment> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="SetAdminAccountActionGroup"> | ||
| <arguments> | ||
| <argument name="InterfaceLocaleByValue" type="string"/> | ||
| </arguments> | ||
| <!-- Navigate to admin System Account Page--> | ||
| <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" /> | ||
| <waitForPageLoad stepKey="loadAdminSystemAccountPage"/> | ||
| <!-- Change Admin locale to Français (France) / French (France) --> | ||
| <selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/> | ||
| <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/> | ||
| <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/> | ||
| <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd"> | ||
| <page name="AdminSystemAccountPage" url="admin/system_account/index/" area="admin" module="Magento_Backend"> | ||
| <section name="AdminSystemAccountSection"/> | ||
| </page> | ||
| </pages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> | ||
| <section name="AdminSlideOutDialogSection"> | ||
| <element name="closeButton" type="button" selector=".modal-slide._show [data-role='closeBtn']" timeout="30"/> | ||
| <element name="cancelButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']" timeout="30"/> | ||
| <element name="doneButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']" timeout="30"/> | ||
| <element name="saveButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']" timeout="30"/> | ||
| </section> | ||
| </sections> |
15 changes: 15 additions & 0 deletions
15
app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> | ||
| <section name="AdminSystemAccountSection"> | ||
| <element name="interfaceLocale" type="text" selector="#interface_locale"/> | ||
| <element name="currentPassword" type="text" selector="#current_password"/> | ||
| </section> | ||
| </sections> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="AdminAttributeTextSwatchesCanBeFiledTest"> | ||
| <annotations> | ||
| <features value="Backend"/> | ||
| <stories value="Unable to add more attributes in size"/> | ||
| <title value="Check that attribute text swatches can be filed"/> | ||
| <description value="Check that attribute text swatches can be filed"/> | ||
| <severity value="MAJOR"/> | ||
| <testCaseId value="MAGETWO-96710"/> | ||
| <useCaseId value="MAGETWO-96409"/> | ||
| <group value="backend"/> | ||
| <group value="ui"/> | ||
| </annotations> | ||
| <before> | ||
|
|
||
| <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> | ||
|
|
||
| </before> | ||
| <after> | ||
| <!-- Delete all 10 store views --> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1"> | ||
| <argument name="customStore" value="customStore"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2"> | ||
| <argument name="customStore" value="NewStoreViewData"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView3"> | ||
| <argument name="customStore" value="storeViewData"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView4"> | ||
| <argument name="customStore" value="storeViewData1"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView5"> | ||
| <argument name="customStore" value="storeViewData2"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView6"> | ||
| <argument name="customStore" value="storeViewData3"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView7"> | ||
| <argument name="customStore" value="storeViewData4"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView8"> | ||
| <argument name="customStore" value="storeViewData5"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView9"> | ||
| <argument name="customStore" value="storeViewData6"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10"> | ||
| <argument name="customStore" value="storeViewData7"/> | ||
| </actionGroup> | ||
|
|
||
| <actionGroup ref="logout" stepKey="logout"/> | ||
| </after> | ||
|
|
||
| <!-- Create 10 store views --> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1"> | ||
| <argument name="customStore" value="customStore"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2"> | ||
| <argument name="customStore" value="NewStoreViewData"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView3"> | ||
| <argument name="customStore" value="storeViewData"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView4"> | ||
| <argument name="customStore" value="storeViewData1"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView5"> | ||
| <argument name="customStore" value="storeViewData2"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView6"> | ||
| <argument name="customStore" value="storeViewData3"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView7"> | ||
| <argument name="customStore" value="storeViewData4"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView8"> | ||
| <argument name="customStore" value="storeViewData5"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView9"> | ||
| <argument name="customStore" value="storeViewData6"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10"> | ||
| <argument name="customStore" value="storeViewData7"/> | ||
| </actionGroup> | ||
|
|
||
| <!--Navigate to Product attribute page--> | ||
| <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/> | ||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
| <fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/> | ||
| <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/> | ||
| <click selector="{{AttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/> | ||
| <waitForAjaxLoad stepKey="waitForAjaxLoad"/> | ||
|
|
||
| <!-- Fill Swatch and Description fields for Admin --> | ||
| <fillField selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" userInput="test" stepKey="fillSwatchForAdmin"/> | ||
| <fillField selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" userInput="test" stepKey="fillDescriptionForAdmin"/> | ||
|
|
||
| <!-- Grab value Swatch and Description fields for Admin --> | ||
| <grabValueFrom selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" stepKey="grabSwatchForAdmin"/> | ||
| <grabValueFrom selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" stepKey="grabDescriptionForAdmin"/> | ||
|
|
||
| <!-- Check that Swatch and Description fields for Admin are not empty--> | ||
| <assertNotEmpty actual="$grabSwatchForAdmin" stepKey="checkSwatchFieldForAdmin"/> | ||
| <assertNotEmpty actual="$grabDescriptionForAdmin" stepKey="checkDescriptionFieldForAdmin"/> | ||
| </test> | ||
| </tests> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.