Skip to content

Commit b958b56

Browse files
joanhejoanhe
authored
Merge pull request #62 from magento-arcticfoxes/foxes-pr
[arcticfoxes] PRs
2 parents f23b8bd + 9f13f51 commit b958b56

12 files changed

+27
-14
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<argument name="product" value="SimpleProduct"/>
7070
</actionGroup>
7171
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
72-
<amOnPage url="{{SimpleProduct.name}}.html" stepKey="navigateToProductPageOnStorefront"/>
72+
<amOnPage url="{{SimpleProduct.urlKey}}.html" stepKey="navigateToProductPageOnStorefront"/>
7373
<waitForPageLoad stepKey="waitForPageLoad5"/>
7474
<see userInput="Hello Product Page From PageBuilder" stepKey="pagebuilderContent"/>
7575
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<argument name="product" value="SimpleProduct"/>
6969
</actionGroup>
7070
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
71-
<amOnPage url="{{SimpleProduct.name}}.html" stepKey="navigateToProductPageOnStorefront"/>
71+
<amOnPage url="{{SimpleProduct.urlKey}}.html" stepKey="navigateToProductPageOnStorefront"/>
7272
<waitForPageLoad stepKey="waitForPageLoad5"/>
7373
<see userInput="Hello Product Page From PageBuilder" stepKey="pagebuilderContent"/>
7474
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
103103
<waitForPageLoad stepKey="waitForPageLoadSaveProduct"/>
104104
<waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
105-
<amOnPage url="{{SimpleProduct.name}}.html" stepKey="navigateToProductPage"/>
105+
<amOnPage url="{{SimpleProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
106106
<waitForPageLoad stepKey="waitForPageLoadProductPage"/>
107107
<!-- Verify custom product attribute has it's own heading -->
108108
<comment userInput="Verify custom product attribute has it's own heading" stepKey="commentValidateAttributeHasHeading"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
5252
<!-- Verify text field attribute is displayed correctly in table -->
5353
<comment userInput="Verify text field attribute is displayed correctly in table" stepKey="commentVerifyAttributeInTable"/>
54-
<amOnPage url="{{SimpleProduct.name}}.html" stepKey="navigateToProductPage"/>
54+
<amOnPage url="{{SimpleProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
5555
<waitForPageLoad stepKey="waitForPageLoadProductPage"/>
5656
<waitForElementVisible selector="{{PageBuilderProductStorefront.attributeTableValue($$createTextAttribute.default_frontend_label$$, 'Normal Text Attribute Value')}}" stepKey="seeAttributeValueInTable"/>
5757
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
</actionGroup>
3131
</before>
3232
<after>
33+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
34+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
35+
</actionGroup>
36+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
3337
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3438
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3539
<closeTab stepKey="closeTab"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
</actionGroup>
3131
</before>
3232
<after>
33+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
34+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
35+
</actionGroup>
36+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
3337
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3438
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3539
</after>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
130130
<!--Go to storefront to verify Product Link-->
131131
<comment userInput="Verify directives on store front" stepKey="commentVerifyDirectivesOnSlideout"/>
132-
<amOnPage url="$$createPreReqProduct.name$$.html" stepKey="navigateToProductPage"/>
132+
<amOnPage url="$$createPreReqProduct.custom_attributes[url_key]$$.html" stepKey="navigateToProductPage"/>
133133
<comment userInput="Verify directive link on Storefront" stepKey="verifyDirectiveLinkOnStorefront"/>
134134
<waitForPageLoad stepKey="waitForPageLoad5"/>
135135
<scrollTo selector="{{StorefrontProductInfoDetailsSection.detailsTab}}" stepKey="scrollToDetailsTab"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<!-- Validate attributes are displayed in the correct order -->
116116
<comment userInput="Validate attributes are displayed in the correct order" stepKey="commentValidateAttributeOrder"/>
117117
<openNewTab stepKey="openNewTab"/>
118-
<amOnPage url="{{SimpleProduct.name}}.html" stepKey="navigateToProductPage"/>
118+
<amOnPage url="{{SimpleProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
119119
<waitForElementVisible selector="{{PageBuilderProductStorefront.attributeSectionHeading('1', $$createPageBuilderAttribute1.default_frontend_label$$)}}" stepKey="validateAttribute1DisplayedFirst"/>
120120
<waitForElementVisible selector="{{PageBuilderProductStorefront.attributeSectionHeading('2', $$createPageBuilderAttribute2.default_frontend_label$$)}}" stepKey="validateAttribute2DisplayedSecond"/>
121121
<!-- Swap the sort order of the attributes -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3939
</before>
4040
<after>
41+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
42+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
43+
</actionGroup>
44+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
4145
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4246
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
4347
<deleteData createDataKey="createPageBuilderAttribute" stepKey="deleteAttribute1"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
116116
<executeJS function="return Math.abs({$columnWidthStorefront}-{$buttonWidthStorefront})" stepKey="buttonWidthStorefrontDifference"/>
117117
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefront">
118-
<expectedResult type="int">1</expectedResult>
118+
<expectedResult type="int">2</expectedResult>
119119
<actualResult type="variable">$buttonWidthStorefrontDifference</actualResult>
120120
</assertLessThanOrEqual>
121121
<!-- Validate Storefront Mobile: Initial -->
@@ -129,7 +129,7 @@
129129
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
130130
<executeJS function="return Math.abs({$columnWidthStorefrontMobile}-{$buttonWidthStorefrontMobile})" stepKey="buttonWidthMobileDifference"/>
131131
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefrontMobile">
132-
<expectedResult type="int">1</expectedResult>
132+
<expectedResult type="int">2</expectedResult>
133133
<actualResult type="variable">$buttonWidthMobileDifference</actualResult>
134134
</assertLessThanOrEqual>
135135
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop1"/>
@@ -189,7 +189,7 @@
189189
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile2"/>
190190
<executeJS function="return Math.abs({$columnWidthStorefrontMobile2}-{$buttonWidthStorefrontMobile2})" stepKey="buttonWidthMobileDifference2"/>
191191
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefrontMobile2">
192-
<expectedResult type="int">1</expectedResult>
192+
<expectedResult type="int">2</expectedResult>
193193
<actualResult type="variable">$buttonWidthMobileDifference2</actualResult>
194194
</assertLessThanOrEqual>
195195
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop2"/>
@@ -231,7 +231,7 @@
231231
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront3"/>
232232
<executeJS function="return Math.abs({$columnWidthStorefront3}-{$buttonWidthStorefront3})" stepKey="buttonWidthStorefrontDifference3"/>
233233
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefront3">
234-
<expectedResult type="int">1</expectedResult>
234+
<expectedResult type="int">2</expectedResult>
235235
<actualResult type="variable">$buttonWidthStorefrontDifference3</actualResult>
236236
</assertLessThanOrEqual>
237237
<!-- Validate Storefront Mobile: Small Column -->
@@ -245,7 +245,7 @@
245245
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile3"/>
246246
<executeJS function="return Math.abs({$columnWidthStorefrontMobile3}-{$buttonWidthStorefrontMobile3})" stepKey="buttonWidthMobileDifference3"/>
247247
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefrontMobile3">
248-
<expectedResult type="int">1</expectedResult>
248+
<expectedResult type="int">2</expectedResult>
249249
<actualResult type="variable">$buttonWidthMobileDifference3</actualResult>
250250
</assertLessThanOrEqual>
251251
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop3"/>

0 commit comments

Comments
 (0)