magento · magento-devops-reposync-svc · Jun 14, 2022 · Jan 31, 2022 · Feb 8, 2022 · Feb 8, 2022
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -40,8 +40,11 @@
 
  <!-- Go to new product page and see a default attribute -->
  <!-- Switch from default attribute set to new attribute set -->
- <amOnPage url="{{AdminProductCreatePage.url('4', 'bundle')}}" stepKey="goToNewProductPage"/>
- <waitForPageLoad stepKey="wait2"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToNewProductPage">
+ <argument name="attributeSetId" value="4"/>
+ <argument name="productType" value="bundle"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
 
  <actionGroup ref="AdminSelectAttributeSetOnEditProductPageActionGroup" stepKey="startEditAttrSet">
  <argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
@@ -37,8 +37,11 @@
  </actionGroup>
 
  <!--Go to product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
- <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
 
  <!--Enable/Disable Toggle-->
  <checkOption selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="clickOnEnableDisableToggle"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -31,8 +31,11 @@
  </after>
 
  <!--Create bundle product-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
- <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
  <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
  <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
  <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
@@ -31,8 +31,11 @@
  </after>
 
  <!--Create bundle product-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
- <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
  <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
  <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
  <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -38,8 +38,11 @@
  <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
  </after>
  <!--Go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
 
  <!-- Add two bundle items -->
  <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
@@ -36,8 +36,11 @@
  </actionGroup>
  <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
  </after>
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
  <actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
  <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">
  <argument name="x" value="0"/>

diff --git a/.../Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml b/.../Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
@@ -41,8 +41,11 @@
  <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
  </after>
 
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
  <click selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="disableDynamicSku"/>
  <click selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="clickDynamicPriceSwitcher"/>
  <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="100" stepKey="fillBundlePrice"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -45,8 +45,11 @@
  <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
  </after>
  <!--Go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
  <actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
  <!-- Add Option, a "Radio Buttons" type option -->
  <actionGroup ref="AddBundleOptionWithTwoProductsActionGroup" stepKey="addBundleOptionWithTwoProducts2">

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -37,8 +37,11 @@
  </after>
 
  <!--Go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
 
  <!--Create bundle product-->
  <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
@@ -67,8 +70,11 @@
 
  <!--Creating Second bundle product-->
  <!--Go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage2" />
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad2"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage2">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad2"/>
 
  <!--Create bundle product 2-->
  <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems2"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
@@ -37,8 +37,11 @@
  <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
  </after>
  <!-- go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
 
  <!--Add description-->
  <click selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="openDescriptionDropDown"/>

diff --git a/...e/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml b/...e/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
@@ -42,8 +42,11 @@
  </actionGroup>
 
  <!--Go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
 
  <!--Categories-->
  <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -36,8 +36,11 @@
  <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
  </after>
  <!--Go to bundle product creation page-->
- <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
- <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+ <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+ <argument name="productType" value="{{BundleProduct.type}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
 
  <!--Categories-->
  <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
@@ -52,8 +52,10 @@
  <!-- Save attribute set -->
  <actionGroup ref="SaveAttributeSetActionGroup" stepKey="SaveAttributeSet"/>
  <!-- Go to create new product page -->
- <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
- <waitForPageLoad stepKey="waitForPageLoad"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct">
+ <argument name="attributeSetId" value="{{AddToDefaultSet.attributeSetId}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad"/>
  <!-- Assert attribute can be used in product creation -->
  <seeElement selector="{{AdminProductFormSection.attributeLabelByText($$attribute.attribute[frontend_labels][0][label]$$)}}" stepKey="seeLabel"/>
  </test>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml
@@ -53,8 +53,10 @@
  <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave2"/>
 
  <!-- Go to new product page and see a default attribute -->
- <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToNewProductPage"/>
- <waitForPageLoad stepKey="wait2"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToNewProductPage">
+ <argument name="attributeSetId" value="4"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
  <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="expandSEOSection"/>
  <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('meta_keyword')}}" stepKey="seeMetaKeyword"/>
  <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('testgroupname')}}" stepKey="dontSeeTestGroupName"/>

diff --git a/...ento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/...ento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -37,7 +37,10 @@
  </after>
 
  <!-- Create virtual product-->
- <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId,'virtual')}}" stepKey="openVirtualProductCreatePage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openVirtualProductCreatePage">
+ <argument name="attributeSetId" value="{{AddToDefaultSet.attributeSetId}}"/>
+ <argument name="productType" value="virtual"/>
+ </actionGroup>
  <actionGroup ref="FillMainProductFormNoWeightActionGroup" stepKey="fillNewProductData">
  <argument name="product" value="virtualProductGeneralGroup"/>
  </actionGroup>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -36,8 +36,10 @@
  <dontSeeElement selector="{{StorefrontPropertiesSection.EnableWYSIWYG}}" stepKey="dontSeeWYSIWYGEnableField1" />
  <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute1" />
  <waitForPageLoad stepKey="waitForPageLoad3" />
- <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
- <waitForPageLoad stepKey="waitForPageLoad4"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct">
+ <argument name="attributeSetId" value="{{AddToDefaultSet.attributeSetId}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad4"/>
  <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
  <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
  <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>

diff --git a/...code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/...code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
@@ -64,8 +64,10 @@
  <!-- Clear cache -->
  <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCacheActionGroup"/>
  <!-- Go to create new product page -->
- <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
- <waitForPageLoad stepKey="wait2"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct">
+ <argument name="attributeSetId" value="{{AddToDefaultSet.attributeSetId}}"/>
+ </actionGroup>
+ <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
  <!-- Assert attribute not present in product creation -->
  <dontSeeElement selector="{{AdminProductFormSection.attributeLabelByText($$attribute.attribute[frontend_labels][0][label]$$)}}" stepKey="seeLabel"/>
  <!-- Assert removed attribute not presence in storefront product additional information -->

diff --git a/.../Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml b/.../Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml
@@ -58,7 +58,9 @@
  <seeInField stepKey="assertDefaultValue" selector="{{AdvancedAttributePropertiesSection.DefaultValueDate}}" userInput="{$generateDateCompressedFormat}"/>
 
  <!--Go to New Product page, add Attribute and check values-->
- <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateSimpleProductPage">
+ <argument name="attributeSetId" value="4"/>
+ </actionGroup>
  <actionGroup ref="AddProductAttributeInProductModalActionGroup" stepKey="addAttributeToProduct">
  <argument name="attributeCode" value="{{dateProductAttribute.attribute_code}}"/>
  </actionGroup>

diff --git a/...t/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml b/...t/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml
@@ -82,7 +82,9 @@
  <seeCheckboxIsChecked stepKey="seeOption3Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('3')}}"/>
 
  <!--Go to New Product page, add Attribute and check dropdown values-->
- <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateSimpleProductPage">
+ <argument name="attributeSetId" value="4"/>
+ </actionGroup>
  <actionGroup ref="AddProductAttributeInProductModalActionGroup" stepKey="addAttributeToProduct">
  <argument name="attributeCode" value="{{dropdownProductAttribute.attribute_code}}"/>
  </actionGroup>

diff --git a/...ateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml b/...ateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml
@@ -66,7 +66,9 @@
  <seeCheckboxIsChecked stepKey="seeOption1Default" selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault('1')}}"/>
 
  <!--Go to New Product page, add Attribute and check dropdown values-->
- <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToCreateSimpleProductPage"/>
+ <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateSimpleProductPage">
+ <argument name="attributeSetId" value="4"/>
+ </actionGroup>
  <actionGroup ref="AddProductAttributeInProductModalActionGroup" stepKey="addAttributeToProduct">
  <argument name="attributeCode" value="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
  </actionGroup>