Skip to content

Commit 1aff699

Browse files
soumyausoumyau
committed
MQE-2069: [MTF-to-MFTF] Create Newsletter Template Entity #761 
1 parent 98655d7 commit 1aff699

7 files changed

+35
-19
lines changed

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminCreatesNewIntegrationActionGroup.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
</arguments>
1818
<fillField stepKey="fillNameField" selector="{{AdminNewIntegrationSection.name}}" userInput="{{name}}"/>
1919
<fillField stepKey="fillAdminPasswordField" selector="{{AdminNewIntegrationSection.password}}" userInput="{{password}}"/>
20-
<!--Click the "Save" Button -->
21-
<click stepKey="clickSaveButton" selector="{{AdminNewIntegrationSection.saveButton}}"/>
2220

2321
</actionGroup>
2422
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
2424
</before>
2525
<after>
26+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="returnToIntegrationsPage">
27+
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
28+
<argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="searchForIntegration">
31+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminDeleteIntegrationEntityActionGroup" stepKey="deleteCreatedIntegration"/>
2634
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2735
</after>
2836

@@ -32,18 +40,18 @@
3240
</actionGroup>
3341
<actionGroup ref="AdminNavigateToCreateIntegrationPageActionGroup" stepKey="clickAddNewIntegrationButton"/>
3442
<actionGroup ref="AdminCreatesNewIntegrationActionGroup" stepKey="createNewIntegration">
35-
<argument name="name" value="Integration1"/>
43+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
3644
<argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3745
</actionGroup>
3846
<actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheForm"/>
3947
<actionGroup ref="AdminNavigateToCreateIntegrationPageActionGroup" stepKey="clickAddNewIntegrationButtonSecondTime"/>
4048
<actionGroup ref="AdminCreatesNewIntegrationActionGroup" stepKey="createNewIntegrationWithDuplicatedName">
41-
<argument name="name" value="Integration1"/>
49+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
4250
<argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
4351
</actionGroup>
4452
<actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheFormWithDuplicatedName"/>
4553
<actionGroup ref="AssertAdminMessageCreateIntegrationEntityActionGroup" stepKey="seeErrorMessage">
46-
<argument name="message" value="The integration with name &quot;Integration1&quot; exists."/>
54+
<argument name="message" value="The integration with name &quot;{{defaultIntegrationData.name}}&quot; exists."/>
4755
<argument value="error" name="messageType"/>
4856
</actionGroup>
4957
</test>

‎app/code/Magento/Integration/Test/Mftf/Test/AdminDeleteIntegrationEntityTest.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,32 @@
3131
<actionGroup ref="AdminNavigateToCreateIntegrationPageActionGroup" stepKey="clickAddNewIntegrationButton"/>
3232
<!-- Create New Integration -->
3333
<actionGroup ref="AdminCreatesNewIntegrationActionGroup" stepKey="createIntegration">
34-
<argument name="name" value="Integration1"/>
34+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
3535
<argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3636
</actionGroup>
37-
<!-- Submit The Form -->
3837
<actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheForm"/>
3938
</before>
4039
<after>
4140
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4241
</after>
43-
4442
<!-- TEST BODY -->
4543
<!-- Find Created Integration In Grid -->
4644
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="findCreatedIntegration">
47-
<argument name="name" value="Integration1"/>
45+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
4846
</actionGroup>
4947
<!-- Delete Created Integration Entity -->
5048
<actionGroup ref="AdminDeleteIntegrationEntityActionGroup" stepKey="deleteIntegration"/>
5149
<!-- Assert Success Message -->
5250
<actionGroup ref="AssertAdminMessageCreateIntegrationEntityActionGroup" stepKey="seeSuccessMessage">
53-
<argument name="message" value="The integration 'Integration1' has been deleted."/>
51+
<argument name="message" value="The integration '{{defaultIntegrationData.name}}' has been deleted."/>
5452
<argument value="success" name="messageType"/>
5553
</actionGroup>
5654
<!-- Assert Deleted Integration Is Not In Grid -->
5755
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="findDeletedIntegration">
58-
<argument name="name" value="Integration1"/>
56+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
5957
</actionGroup>
6058
<actionGroup ref="AssertDeletedIntegrationIsNotInGridActionGroup" stepKey="dontSeeIntegration">
61-
<argument name="name" value="Integration1"/>
59+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
6260
</actionGroup>
6361
<!-- END TEST BODY -->
6462
</test>

‎app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityTest.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,32 @@
3030
<actionGroup ref="AdminNavigateToCreateIntegrationPageActionGroup" stepKey="clickAddNewIntegrationButton"/>
3131
<!-- Create New Integration -->
3232
<actionGroup ref="AdminCreatesNewIntegrationActionGroup" stepKey="createIntegration">
33-
<argument name="name" value="Integration1"/>
33+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
3434
<argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3535
</actionGroup>
36+
<actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheForm"/>
3637
</before>
3738
<after>
39+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="returnToIntegrationsPage">
40+
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
41+
<argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="searchForIntegration">
44+
<argument name="name" value="{{defaultIntegrationData.name}} Updated"/>
45+
</actionGroup>
3846
<actionGroup ref="logout" stepKey="logout"/>
3947
</after>
4048

4149
<!-- TEST BODY -->
4250
<!-- Find Created Integration In Grid -->
4351
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="findCreatedIntegration">
44-
<argument name="name" value="Integration1"/>
52+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
4553
</actionGroup>
4654
<!-- Open Integration Edit Page -->
4755
<actionGroup ref="AdminClickEditIntegrationEntityActionGroup" stepKey="clickEditButton"/>
4856
<!-- Update Integration Entity -->
4957
<actionGroup ref="AdminUpdateCreatedIntegrationEntityActionGroup" stepKey="updateIntegrationEntity">
50-
<argument name="name" value="Integration Updated"/>
58+
<argument name="name" value="{{defaultIntegrationData.name}} Updated"/>
5159
<argument name="endpoint" value="https://endpoint-updated.com"/>
5260
<argument name="linkUrl" value="https://testlink-updated.com"/>
5361
<argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
@@ -56,15 +64,15 @@
5664
<actionGroup ref="AdminSubmitIntegrationFormActionGroup" stepKey="submitTheForm"/>
5765
<!-- Assert Success Message -->
5866
<actionGroup ref="AssertAdminMessageCreateIntegrationEntityActionGroup" stepKey="seeSuccessMessage">
59-
<argument name="message" value="The integration 'Integration Updated' has been saved."/>
67+
<argument name="message" value="The integration '{{defaultIntegrationData.name}} Updated' has been saved."/>
6068
<argument value="success" name="messageType"/>
6169
</actionGroup>
6270
<!-- Assert Updated Entity In Grid -->
6371
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="findDeletedIntegration">
64-
<argument name="name" value="Integration Updated"/>
72+
<argument name="name" value="{{defaultIntegrationData.name}} Updated"/>
6573
</actionGroup>
6674
<actionGroup ref="AssertUpdatedIntegrationEntityInGridActionGroup" stepKey="seeIntegrationEntity">
67-
<argument name="name" value="Integration Updated"/>
75+
<argument name="name" value="{{defaultIntegrationData.name}} Updated"/>
6876
</actionGroup>
6977
</test>
7078
</tests>

‎app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityWithIncorrectPasswordTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<argument name="name" value="Integration1"/>
3434
<argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3535
</actionGroup>
36+
<actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheForm"/>
3637
</before>
3738
<after>
3839
<actionGroup ref="logout" stepKey="logout"/>

‎app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingCreateNewsletterTemplateTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
<description value="Newsletter Template Successfully Created"/>
1717
<group value="newsletter"/>
1818
<group value="mtf_migrated"/>
19+
<severity value="CRITICAL"/>
1920
<testCaseId value="MC-29809"/>
21+
<group value="WYSIWYGDisabled"/>
2022
</annotations>
2123
<before>
2224
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

‎app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateUpdateTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminMarketingNewsletterTemplateUpdate">
11+
<test name="AdminMarketingNewsletterTemplateUpdateTest">
1212
<annotations>
1313
<features value="Newsletter"/>
1414
<stories value="Newsletter Updating"/>
1515
<title value="Newsletter Updating Test"/>
1616
<description value="Admin should be able update created Newsletter Template"/>
1717
<group value="reports"/>
1818
<group value="mtf_migrated"/>
19+
<group value="WYSIWYGDisabled"/>
1920
</annotations>
2021

2122
<before>

0 commit comments

Comments
 (0)