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.

Sign up for GitHub

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
wants to merge 8 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2781074
Fixed issue - 27095
dipeshrangani Feb 29, 2020
0f6a15c
Update confirm.js
dipeshrangani Mar 2, 2020
4338e4c
Covered jasmine test.
engcom-Echo Mar 18, 2020
5e210ea
Update confirm.test.js
engcom-Echo Mar 25, 2020
d7b0123
Merge branch '2.4-develop' of http://github.com/magento/magento2 into…
engcom-Echo Mar 26, 2020
6289f05
Merge branch '2.4-develop' of http://github.com/magento/magento2 into…
engcom-Echo Apr 8, 2020
aed2dbd
Fixed mftf tests related PR
engcom-Echo Apr 8, 2020
df0d179
Merge branch '2.4-develop' into hot/fix-27095
sivaschenko Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/js/modal/confirm.js
View file
Open in desktop
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
21 changes: 20 additions & 1 deletion dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/confirm.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,21 @@ 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();

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we remove this extra empty line, please?

});

it('Check for modal definition', function () {
expect(confirm).toBeDefined();
Expand All @@ -23,5 +36,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);
});
});
});