Skip to content

Commit c41c854

Browse files
committed
Update integration and functional tests
1 parent 1d5f146 commit c41c854

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
<!-- Create a catalog rule for the NOT LOGGED IN customer group -->
4444
<actionGroup ref="NewCatalogPriceRuleByUIActionGroup" stepKey="createNewPriceRule"/>
4545
<actionGroup ref="SelectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
46+
<conditionalClick selector="{{AdminNewCatalogPriceRule.active}}" dependentSelector="{{AdminNewCatalogPriceRule.activeIsEnabled}}" visible="false" stepKey="enableActiveBtn"/>
4647
<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
48+
49+
<!--<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>-->
4750
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
4851

4952
<!-- Perform reindex and flush cache -->

app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
1919
<click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
2020
<click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
21+
<conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
2122
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
2223
</actionGroup>
2324
</actionGroups>

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Grid/Renderer/AbstractMultiactionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ protected function processRender(): void
9999
private function assertUrl(int $quoteItemId, array $action, string $html): void
100100
{
101101
$jsFunction = str_replace('url_', '', $action['url']);
102-
$configureXPath = "//a[contains(@onclick, 'return cartControl.$jsFunction($quoteItemId)')"
103-
. " and text()='{$action['caption']}' and @href='{$action['url']}']";
102+
$configureXPath = "//a[text()='{$action['caption']}' and @href='{$action['url']}']";
104103
$this->assertEquals(
105104
1,
106105
Xpath::getElementsCountForXpath($configureXPath, $html),
107106
sprintf('Expected %s link is incorrect or missing', $action['caption'])
108107
);
108+
$this->assertStringContainsString("return cartControl.$jsFunction($quoteItemId)", $html);
109109
}
110110
}

0 commit comments

Comments
 (0)