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

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

Issue 1911573003: MD Settings: Reset profile dialog, display settings in new tab. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits. Created 4 years, 8 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 ffe3271c3e5144257e5ad3ea73588ab876f09f0c..eff808ed47706d5806503ab2c4d0ff2c3c32564f 100644
--- a/chrome/test/data/webui/settings/reset_page_test.js
+++ b/chrome/test/data/webui/settings/reset_page_test.js
@@ -20,11 +20,12 @@ cr.define('settings_reset_page', function() {
*/
var TestResetBrowserProxy = function() {
settings.TestBrowserProxy.call(this, [
- 'performResetProfileSettings',
- 'onHideResetProfileDialog',
+ 'getReportedSettings',
tommycli 2016/04/20 23:23:18 Why the re-order? In the proxy implementation, 'ge
dpapad 2016/04/21 00:27:10 Reverted the re-ordering.
'onHideResetProfileBanner',
- 'onShowResetProfileDialog',
+ 'onHideResetProfileDialog',
'onPowerwashDialogShow',
+ 'onShowResetProfileDialog',
+ 'performResetProfileSettings',
'requestFactoryResetRestart',
]);
};
@@ -33,6 +34,12 @@ cr.define('settings_reset_page', function() {
__proto__: settings.TestBrowserProxy.prototype,
/** @override */
+ getReportedSettings: function() {
tommycli 2016/04/20 23:23:18 nit: Same ordering as proxy impl
dpapad 2016/04/21 00:27:10 Done.
+ this.methodCalled('getReportedSettings');
+ return Promise.resolve([]);
+ },
+
+ /** @override */
performResetProfileSettings: function(sendSettings) {
this.methodCalled('performResetProfileSettings');
return Promise.resolve();
@@ -184,8 +191,15 @@ cr.define('settings_reset_page', function() {
MockInteractions.tap(resetPage.$.resetProfile);
var dialog = resetPage.$$('settings-reset-profile-dialog');
assertTrue(!!dialog);
- MockInteractions.tap(dialog.$.reset);
- return browserProxy.whenCalled('performResetProfileSettings');
+
+ var showReportedSettingsButton = dialog.$$('iron-icon');
+ assertTrue(!!showReportedSettingsButton);
+ MockInteractions.tap(showReportedSettingsButton);
+
+ return browserProxy.whenCalled('getReportedSettings').then(function() {
+ MockInteractions.tap(dialog.$.reset);
+ return browserProxy.whenCalled('performResetProfileSettings');
+ });
});
if (cr.isChromeOS) {

Powered by Google App Engine
This is Rietveld 408576698