Skip to content

Commit 798c81a

Browse files
committed
resolved conflict
1 parent 31249dc commit 798c81a

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
</actionGroup>
7777

7878
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
79-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterCreate">
80-
<argument name="indices" value=""/>
81-
</actionGroup>
79+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices" />
8280
</before>
8381

8482
<after>
@@ -105,9 +103,7 @@
105103
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
106104

107105
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
108-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterDeleted">
109-
<argument name="indices" value=""/>
110-
</actionGroup>
106+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices2" />
111107
</after>
112108

113109
<!-- Create the rule -->
@@ -142,8 +138,8 @@
142138
<click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
143139

144140
<!-- Select two products -->
145-
<click stepKey="selectProduct1" selector="{{StorefrontBundledSection.checkboxOptionLabel('$$createBundleOption1_1.sku$$','$$simpleProduct1.name$$')}}"/>
146-
<click stepKey="selectProduct2" selector="{{StorefrontBundledSection.checkboxOptionLabel('$$createBundleOption1_2.sku$$','$$simpleProduct3.name$$')}}"/>
141+
<click stepKey="selectProduct1" selector="{{StorefrontBundledSection.productCheckbox('1','1')}}"/>
142+
<click stepKey="selectProduct2" selector="{{StorefrontBundledSection.productCheckbox('2','1')}}"/>
147143

148144
<!--Click "Add to Cart" button-->
149145
<click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickAddBundleProductToCart"/>

0 commit comments

Comments
 (0)