Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue #27095 - In Floating cart delete pop-up, When user click on out side of OK button than button color is changed #27096

Closed
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<!--Delete-->
<click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
<click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
<click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
<click selector="//button[@class='action primary action-primary action-accept']" stepKey="ConfirmDelete"/>
<waitForPageLoad stepKey="loading3"/>

<!--Locating delete message-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<waitForPageLoad stepKey="loading"/>
<click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
<click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
<click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
<click selector="//button[@class='action primary action-primary action-accept']" stepKey="ConfirmDelete"/>
<waitForPageLoad stepKey="loading3"/>

<!--Locating delete message-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="AdminProductFormChangeStoreSection">
<element name="storeSelector" type="button" selector="//a[contains(text(),'{{var1}}')]" parameterized="true"/>
<element name="acceptButton" type="button" selector="button[class='action-primary action-accept']" timeout="30"/>
<element name="acceptButton" type="button" selector="button[class='action primary action-primary action-accept']" timeout="30"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<element name="save" type="button" selector="#save" timeout="30"/>
<element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
<element name="delete" type="button" selector="#delete" timeout="30"/>
<element name="okButton" type="button" selector="//button[@class='action-primary action-accept']"/>
<element name="okButton" type="button" selector="//button[@class='action primary action-primary action-accept']"/>
<element name="successMessage" type="text" selector="#messages"/>

<element name="ruleName" type="input" selector="[name='name']"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<element name="searchQuery" type="text" selector="//tr[@class='data-grid-filters']//td/input[@name='search_query']"/>
<element name="nthRow" type="checkbox" selector="//tbody/tr['{{rowNum}}']//input[@name='search']" parameterized="true"/>
<element name="searchTermRowCheckboxBySearchQuery" type="checkbox" selector="//*[normalize-space()='{{var1}}']/preceding-sibling::td//input[@name='search']" parameterized="true" timeout="30"/>
<element name="okButton" type="button" selector="//button[@class='action-primary action-accept']/span" timeout="30"/>
<element name="okButton" type="button" selector="//button[@class='action primary action-primary action-accept']/span" timeout="30"/>
<element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
<element name="gridRow" type="text" selector="//tr[@data-role='row']"/>
<element name="numberOfSearchTermResults" type="text" selector="//tr[@data-role='row']/td[@data-column='num_results']"/>
<element name="selectMassActionCheckbox" type="select" selector="//select[@id='search_term_grid_massaction-mass-select']"/>
</section>
</sections>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
<element name="password" selector="#user_current_password" type="input"/>
<element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
<element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
<element name="confirm" selector="//*[@class='action primary action-primary action-accept']" type="button"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="AdminStoreGroupActionsSection">
<element name="saveButton" type="button" selector="#save" timeout="60" />
<element name="okButton" type="button" selector="//footer[@class='modal-footer']//button[@class='action-primary action-accept']/span" timeout="30"/>
<element name="okButton" type="button" selector="//footer[@class='modal-footer']//button[@class='action primary action-primary action-accept']/span" timeout="30"/>
</section>
</sections>
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/js/modal/confirm.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ define([
}
}, {
text: $t('OK'),
class: 'action-primary action-accept',
class: 'action primary action-primary action-accept',

/**
* Click handler.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<element name="cmsPage" selector="//td[contains(text(), '{{cmsPageUrlKey}}')]" type="button" parameterized="true"/>
<element name="saveButton" type="button" selector="#save" timeout="30"/>
<element name="deleteButton" type="button" selector="#delete" timeout="30"/>
<element name="okButton" type="button" selector="//button[@class='action-primary action-accept']" timeout="30"/>
<element name="okButton" type="button" selector="//button[@class='action primary action-primary action-accept']" timeout="30"/>
<element name="requestPathField" type="input" selector="#request_path"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<element name="salesRole" selector="//td[contains(text(), 'Sales')]" type="button"/>
<element name="current_pass" type="button" selector="#current_password"/>
<element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
<element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
<element name="confirm" selector="//*[@class='action primary action-primary action-accept']" type="button"/>
</section>
</sections>

Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<element name="role" parameterized="true" selector="//td[contains(text(), '{{roleName}}')]" type="button"/>
<element name="password" selector="#user_current_password" type="input"/>
<element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
<element name="confirm" selector=".action-primary.action-accept" type="button"/>
<element name="confirm" selector=".action primary.action-primary.action-accept" type="button"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<element name="role" parameterized="true" selector="//td[contains(text(), '{{args}}')]" type="button"/>
<element name="current_pass" type="button" selector="#current_password"/>
<element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
<element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
<element name="confirm" selector="//*[@class='action primary action-primary action-accept']" type="button"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<element name="theUser" selector="//td[contains(text(), '{{userName}}')]" type="button" parameterized="true"/>
<element name="password" selector="#user_current_password" type="input"/>
<element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
<element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
<element name="confirm" selector="//*[@class='action primary action-primary action-accept']" type="button"/>
<element name="role" parameterized="true" selector="//td[contains(text(), '{{args}}')]" type="button"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,20 @@ define([
'use strict';

describe('ui/js/modal/confirm', function () {
var element = $('<div>some element</div>'),

var widget,
element,
confirm;

beforeEach(function () {
element = $('<div id="element">some element</div>');
confirm = element.confirm({});
widget = element.confirm({}).data('mage-confirm');
});

afterEach(function () {
$('element').remove();
});

it('Check for modal definition', function () {
expect(confirm).toBeDefined();
Expand All @@ -23,5 +35,11 @@ define([
it('Integration: modal created on page', function () {
expect(confirm.length).toEqual(1);
});
it('Check confirm class button', function () {
var expectedClassResult = 'action primary action-primary action-accept',
expectedClass = widget.options.buttons[1].class;

expect($(expectedClass).selector).toContain(expectedClassResult);
});
});
});