Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1162)

Unified Diff: chrome/test/data/webui/settings/reset_page_test.js

Issue 2180823004: Migrate <cr-dialog> from PaperDialogBehavior to native <dialog>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/webui/settings/reset_page_test.js
diff --git a/chrome/test/data/webui/settings/reset_page_test.js b/chrome/test/data/webui/settings/reset_page_test.js
index 73217e7b4a9045d3e76bcfb5cf0674694647f59e..ee4172f8f4004f3951de5c2e678471b1b23d22bb 100644
--- a/chrome/test/data/webui/settings/reset_page_test.js
+++ b/chrome/test/data/webui/settings/reset_page_test.js
@@ -151,30 +151,22 @@ cr.define('settings_reset_page', function() {
MockInteractions.tap(resetPage.$.resetProfile);
var dialog = resetPage.$$('settings-reset-profile-dialog');
assertTrue(!!dialog);
- assertTrue(dialog.$.dialog.opened);
+ assertTrue(dialog.$.dialog.open);
var onDialogClosed = new Promise(
function(resolve, reject) {
- dialog.addEventListener('iron-overlay-closed', function() {
- assertFalse(dialog.$.dialog.opened);
+ dialog.addEventListener('close', function() {
+ assertFalse(dialog.$.dialog.open);
resolve();
});
});
- return new Promise(function(resolve, reject) {
- resetPageBrowserProxy.whenCalled(
+ return resetPageBrowserProxy.whenCalled(
'onShowResetProfileDialog').then(function() {
- // Need to call requestAnimationFrame here, otherwise the dialog has
- // not been registered to the IronOverlayManager at the time we
- // attempt to close it (which prevents closing by 'esc' key from
- // working).
- window.requestAnimationFrame(function() {
- closeDialogFn(dialog);
- Promise.all([
- onDialogClosed,
- resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
- ]).then(resolve, reject);
- });
- });
+ closeDialogFn(dialog);
+ return Promise.all([
+ onDialogClosed,
+ resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
+ ]);
});
}
@@ -189,12 +181,6 @@ cr.define('settings_reset_page', function() {
// Test case where the 'close' button is clicked.
MockInteractions.tap(dialog.$.dialog.getCloseButton());
});
- }).then(function() {
- return testOpenCloseResetProfileDialog(function(dialog) {
- // Test case where the 'Esc' key is pressed.
- MockInteractions.pressAndReleaseKeyOn(
- dialog, 27 /* 'Esc' key code */);
- });
});
});
@@ -234,10 +220,14 @@ cr.define('settings_reset_page', function() {
MockInteractions.tap(resetPage.$.powerwash);
var dialog = resetPage.$$('settings-powerwash-dialog');
assertTrue(!!dialog);
+ assertTrue(dialog.$.dialog.open);
var onDialogClosed = new Promise(
- function(resolve, reject) {
- dialog.addEventListener('iron-overlay-closed', resolve);
+ function(resolve, reject) {
+ dialog.addEventListener('close', function() {
+ assertFalse(dialog.$.dialog.open);
+ resolve();
});
+ });
MockInteractions.tap(closeButtonFn(dialog));
return Promise.all([

Powered by Google App Engine
This is Rietveld 408576698