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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2676643005: MD Settings: Fix reset_page_test.js in Vulcanized mode (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « chrome/test/data/webui/settings/cr_settings_browsertest.js ('k') | chrome/test/data/webui/settings/reset_profile_banner_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f5ebbdf9243205fece1dde35cc0d61ded89993ce..943bc12c1f3109cf7065bbf063511bea264cfeb2 100644
--- a/chrome/test/data/webui/settings/reset_page_test.js
+++ b/chrome/test/data/webui/settings/reset_page_test.js
@@ -2,327 +2,201 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-cr.define('settings_reset_page', function() {
Dan Beam 2017/02/06 21:50:41 can you unwrap this in a separate CL?
dpapad 2017/02/06 23:06:32 Done.
- /** @enum {string} */
- var TestNames = {
- PowerwashDialogAction: 'PowerwashDialogAction',
- PowerwashDialogOpenClose: 'PowerwashDialogOpenClose',
- ResetBannerClose: 'ResetBannerClose',
- ResetBannerReset: 'ResetBannerReset',
- ResetProfileDialogAction: 'ResetProfileDialogAction',
- ResetProfileDialogOpenClose: 'ResetProfileDialogOpenClose',
- ResetProfileDialogOriginUnknown: 'ResetProfileDialogOriginUnknown',
- ResetProfileDialogOriginUserClick: 'ResetProfileDialogOriginUserClick',
- ResetProfileDialogOriginTriggeredReset:
- 'ResetProfileDialogOriginTriggeredReset',
- };
+/** @enum {string} */
+var TestNames = {
dpapad 2017/02/03 20:05:01 The diff in this file is a bit misleading, because
+ PowerwashDialogAction: 'PowerwashDialogAction',
+ PowerwashDialogOpenClose: 'PowerwashDialogOpenClose',
+ ResetProfileDialogAction: 'ResetProfileDialogAction',
+ ResetProfileDialogOpenClose: 'ResetProfileDialogOpenClose',
+ ResetProfileDialogOriginUnknown: 'ResetProfileDialogOriginUnknown',
+ ResetProfileDialogOriginUserClick: 'ResetProfileDialogOriginUserClick',
+ ResetProfileDialogOriginTriggeredReset:
+ 'ResetProfileDialogOriginTriggeredReset',
+};
+
+suite('DialogTests', function() {
+ var resetPage = null;
+
+ /** @type {!settings.ResetPageBrowserProxy} */
+ var resetPageBrowserProxy = null;
+
+ /** @type {!settings.LifetimeBrowserProxy} */
+ var lifetimeBrowserProxy = null;
+
+ setup(function() {
+ if (cr.isChromeOS) {
+ lifetimeBrowserProxy = new settings.TestLifetimeBrowserProxy();
+ settings.LifetimeBrowserProxyImpl.instance_ = lifetimeBrowserProxy;
+ }
+
+ resetPageBrowserProxy = new reset_page.TestResetBrowserProxy();
+ settings.ResetBrowserProxyImpl.instance_ = resetPageBrowserProxy;
+
+ PolymerTest.clearBody();
+ resetPage = document.createElement('settings-reset-page');
+ document.body.appendChild(resetPage);
+ });
+
+ teardown(function() { resetPage.remove(); });
/**
- * @constructor
- * @implements {settings.ResetBrowserProxy}
- * @extends {settings.TestBrowserProxy}
+ * @param {function(SettingsResetProfileDialogElemeent)}
+ * closeDialogFn A function to call for closing the dialog.
+ * @return {!Promise}
*/
- var TestResetBrowserProxy = function() {
- settings.TestBrowserProxy.call(this, [
- 'performResetProfileSettings',
- 'onHideResetProfileDialog',
- 'onHideResetProfileBanner',
- 'onShowResetProfileDialog',
- 'showReportedSettings',
- 'getTriggeredResetToolName',
- 'onPowerwashDialogShow',
- ]);
- };
-
- TestResetBrowserProxy.prototype = {
- __proto__: settings.TestBrowserProxy.prototype,
-
- /** @override */
- performResetProfileSettings: function(sendSettings, requestOrigin) {
- this.methodCalled('performResetProfileSettings', requestOrigin);
- return Promise.resolve();
- },
-
- /** @override */
- onHideResetProfileDialog: function() {
- this.methodCalled('onHideResetProfileDialog');
- },
-
- /** @override */
- onHideResetProfileBanner: function() {
- this.methodCalled('onHideResetProfileBanner');
- },
-
- /** @override */
- onShowResetProfileDialog: function() {
- this.methodCalled('onShowResetProfileDialog');
- },
-
- /** @override */
- showReportedSettings: function() {
- this.methodCalled('showReportedSettings');
- },
-
- /** @override */
- getTriggeredResetToolName: function() {
- this.methodCalled('getTriggeredResetToolName');
- return Promise.resolve('WonderfulAV');
- },
-
- /** @override */
- onPowerwashDialogShow: function() {
- this.methodCalled('onPowerwashDialogShow');
- },
- };
-
- function registerBannerTests() {
- suite('BannerTests', function() {
- var resetBanner = null;
- var browserProxy = null;
-
- suiteSetup(function() {
- return PolymerTest.importHtml(
- 'chrome://md-settings/reset_page/reset_profile_banner.html');
- });
-
- setup(function() {
- browserProxy = new TestResetBrowserProxy();
- settings.ResetBrowserProxyImpl.instance_ = browserProxy;
- PolymerTest.clearBody();
- resetBanner = document.createElement('settings-reset-profile-banner');
- document.body.appendChild(resetBanner);
- });
-
- teardown(function() { resetBanner.remove(); });
-
- // Tests that the reset profile banner
- // - opens the reset profile dialog when the reset button is clicked.
- // - reset happens when clicking on the dialog's reset button.
- // - the reset profile dialog is closed after reset is done.
- test(TestNames.ResetBannerReset, function() {
- var dialog = resetBanner.$$('settings-reset-profile-dialog');
- assertFalse(!!dialog);
- MockInteractions.tap(resetBanner.$.reset);
- Polymer.dom.flush();
- assertTrue(resetBanner.showResetProfileDialog_)
- dialog = resetBanner.$$('settings-reset-profile-dialog');
- assertTrue(!!dialog);
-
- MockInteractions.tap(dialog.$.reset);
-
- return browserProxy.whenCalled('performResetProfileSettings')
- .then(PolymerTest.flushTasks)
- .then(function() {
- assertFalse(resetBanner.showResetProfileDialog_);
- dialog = resetBanner.$$('settings-reset-profile-dialog');
- assertFalse(!!dialog);
- });
- });
+ function testOpenCloseResetProfileDialog(closeDialogFn) {
+ resetPageBrowserProxy.resetResolver('onShowResetProfileDialog');
+ resetPageBrowserProxy.resetResolver('onHideResetProfileDialog');
+
+ // Open reset profile dialog.
+ MockInteractions.tap(resetPage.$.resetProfile);
+ Polymer.dom.flush();
+ var dialog = resetPage.$$('settings-reset-profile-dialog');
+ assertTrue(!!dialog);
+ var onDialogClosed = new Promise(
+ function(resolve, reject) {
+ dialog.addEventListener('close', function() {
+ assertFalse(dialog.$.dialog.open);
+ resolve();
+ });
+ });
- // Tests that the reset profile banner removes itself from the DOM when
- // the close button is clicked and that |onHideResetProfileBanner| is
- // called.
- test(TestNames.ResetBannerClose, function() {
- MockInteractions.tap(resetBanner.$.close);
- assertFalse(!!resetBanner.parentNode);
- return browserProxy.whenCalled('onHideResetProfileBanner');
- });
+ return PolymerTest.flushTasks().then(function() {
+ resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
+ .then(function() {
+ assertTrue(dialog.$.dialog.open);
+ closeDialogFn(dialog);
+ return Promise.all([
+ onDialogClosed,
+ resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
+ ]);
+ });
});
}
- function registerDialogTests() {
- suite('DialogTests', function() {
- var resetPage = null;
-
- /** @type {!settings.ResetPageBrowserProxy} */
- var resetPageBrowserProxy = null;
-
- /** @type {!settings.LifetimeBrowserProxy} */
- var lifetimeBrowserProxy = null;
-
- setup(function() {
- if (cr.isChromeOS) {
- lifetimeBrowserProxy = new settings.TestLifetimeBrowserProxy();
- settings.LifetimeBrowserProxyImpl.instance_ = lifetimeBrowserProxy;
- }
-
- resetPageBrowserProxy = new TestResetBrowserProxy();
- settings.ResetBrowserProxyImpl.instance_ = resetPageBrowserProxy;
-
- PolymerTest.clearBody();
- resetPage = document.createElement('settings-reset-page');
- document.body.appendChild(resetPage);
+ // Tests that the reset profile dialog opens and closes correctly and that
+ // resetPageBrowserProxy calls are occurring as expected.
+ test(TestNames.ResetProfileDialogOpenClose, function() {
+ return testOpenCloseResetProfileDialog(function(dialog) {
+ // Test case where the 'cancel' button is clicked.
+ MockInteractions.tap(dialog.$.cancel);
+ }).then(PolymerTest.flushTasks).then(function() {
+ return testOpenCloseResetProfileDialog(function(dialog) {
+ // Test case where the 'close' button is clicked.
+ MockInteractions.tap(dialog.$.dialog.getCloseButton());
});
-
- teardown(function() { resetPage.remove(); });
-
- /**
- * @param {function(SettingsResetProfileDialogElemeent)}
- * closeDialogFn A function to call for closing the dialog.
- * @return {!Promise}
- */
- function testOpenCloseResetProfileDialog(closeDialogFn) {
- resetPageBrowserProxy.resetResolver('onShowResetProfileDialog');
- resetPageBrowserProxy.resetResolver('onHideResetProfileDialog');
-
- // Open reset profile dialog.
- MockInteractions.tap(resetPage.$.resetProfile);
- Polymer.dom.flush();
- var dialog = resetPage.$$('settings-reset-profile-dialog');
- assertTrue(!!dialog);
- var onDialogClosed = new Promise(
- function(resolve, reject) {
- dialog.addEventListener('close', function() {
- assertFalse(dialog.$.dialog.open);
- resolve();
- });
- });
-
- return PolymerTest.flushTasks().then(function() {
- resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
- .then(function() {
- assertTrue(dialog.$.dialog.open);
- closeDialogFn(dialog);
- return Promise.all([
- onDialogClosed,
- resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
- ]);
- });
+ });
+ });
+
+ // Tests that when user request to reset the profile the appropriate
+ // message is sent to the browser.
+ test(TestNames.ResetProfileDialogAction, function() {
+ // Open reset profile dialog.
+ MockInteractions.tap(resetPage.$.resetProfile);
+ Polymer.dom.flush();
+ var dialog = resetPage.$$('settings-reset-profile-dialog');
+ assertTrue(!!dialog);
+
+ var showReportedSettingsLink = dialog.$$('.footer a');
+ assertTrue(!!showReportedSettingsLink);
+ MockInteractions.tap(showReportedSettingsLink);
+
+ return resetPageBrowserProxy.whenCalled('showReportedSettings').then(
+ function() {
+ assertFalse(dialog.$.reset.disabled);
+ assertFalse(dialog.$.resetSpinner.active);
+ MockInteractions.tap(dialog.$.reset);
+ assertTrue(dialog.$.reset.disabled);
+ assertTrue(dialog.$.cancel.disabled);
+ assertTrue(dialog.$.resetSpinner.active);
+ return resetPageBrowserProxy.whenCalled(
+ 'performResetProfileSettings');
});
- }
-
- // Tests that the reset profile dialog opens and closes correctly and that
- // resetPageBrowserProxy calls are occurring as expected.
- test(TestNames.ResetProfileDialogOpenClose, function() {
- return testOpenCloseResetProfileDialog(function(dialog) {
- // Test case where the 'cancel' button is clicked.
- MockInteractions.tap(dialog.$.cancel);
- }).then(PolymerTest.flushTasks).then(function() {
- return testOpenCloseResetProfileDialog(function(dialog) {
- // Test case where the 'close' button is clicked.
- MockInteractions.tap(dialog.$.dialog.getCloseButton());
- });
+ });
+
+ function testResetRequestOrigin(expectedOrigin) {
+ var dialog = resetPage.$$('settings-reset-profile-dialog');
+ assertTrue(!!dialog);
+ MockInteractions.tap(dialog.$.reset);
+ return resetPageBrowserProxy.whenCalled(
+ 'performResetProfileSettings').then(function(resetRequest) {
+ assertEquals(expectedOrigin, resetRequest);
});
- });
-
- // Tests that when user request to reset the profile the appropriate
- // message is sent to the browser.
- test(TestNames.ResetProfileDialogAction, function() {
- // Open reset profile dialog.
- MockInteractions.tap(resetPage.$.resetProfile);
- Polymer.dom.flush();
- var dialog = resetPage.$$('settings-reset-profile-dialog');
- assertTrue(!!dialog);
-
- var showReportedSettingsLink = dialog.$$('.footer a');
- assertTrue(!!showReportedSettingsLink);
- MockInteractions.tap(showReportedSettingsLink);
-
- return resetPageBrowserProxy.whenCalled('showReportedSettings').then(
- function() {
- assertFalse(dialog.$.reset.disabled);
- assertFalse(dialog.$.resetSpinner.active);
- MockInteractions.tap(dialog.$.reset);
- assertTrue(dialog.$.reset.disabled);
- assertTrue(dialog.$.cancel.disabled);
- assertTrue(dialog.$.resetSpinner.active);
- return resetPageBrowserProxy.whenCalled(
- 'performResetProfileSettings');
- });
- });
-
- function testResetRequestOrigin(expectedOrigin) {
- var dialog = resetPage.$$('settings-reset-profile-dialog');
- assertTrue(!!dialog);
- MockInteractions.tap(dialog.$.reset);
- return resetPageBrowserProxy.whenCalled(
- 'performResetProfileSettings').then(function(resetRequest) {
- assertEquals(expectedOrigin, resetRequest);
- });
- }
-
- test(TestNames.ResetProfileDialogOriginUnknown, function() {
- settings.navigateTo(settings.Route.RESET_DIALOG);
- return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
- .then(function() { return testResetRequestOrigin(''); });
- });
-
- test(TestNames.ResetProfileDialogOriginUserClick, function() {
- MockInteractions.tap(resetPage.$.resetProfile);
- return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
- .then(function() { return testResetRequestOrigin('userclick'); });
- });
-
- test(TestNames.ResetProfileDialogOriginTriggeredReset, function() {
- settings.navigateTo(settings.Route.TRIGGERED_RESET_DIALOG);
- return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
- .then(function() {
- return testResetRequestOrigin('triggeredreset');
- });
- });
-
- if (cr.isChromeOS) {
- /**
- * @param {function(SettingsPowerwashDialogElemeent):!Element}
- * closeButtonFn A function that returns the button to be used for
- * closing the dialog.
- * @return {!Promise}
- */
- function testOpenClosePowerwashDialog(closeButtonFn) {
- // Open powerwash dialog.
- MockInteractions.tap(resetPage.$.powerwash);
- Polymer.dom.flush();
- var dialog = resetPage.$$('settings-powerwash-dialog');
- assertTrue(!!dialog);
- assertTrue(dialog.$.dialog.open);
- var onDialogClosed = new Promise(
- function(resolve, reject) {
- dialog.addEventListener('close', function() {
- assertFalse(dialog.$.dialog.open);
- resolve();
- });
- });
-
- MockInteractions.tap(closeButtonFn(dialog));
- return Promise.all([
- onDialogClosed,
- resetPageBrowserProxy.whenCalled('onPowerwashDialogShow'),
- ]);
- }
+ }
- // Tests that the powerwash dialog opens and closes correctly, and
- // that chrome.send calls are propagated as expected.
- test(TestNames.PowerwashDialogOpenClose, function() {
- // Test case where the 'cancel' button is clicked.
- return testOpenClosePowerwashDialog(function(dialog) {
- return dialog.$.cancel;
- }).then(function() {
- // Test case where the 'close' button is clicked.
- return testOpenClosePowerwashDialog(function(dialog) {
- return dialog.$.dialog.getCloseButton();
- });
+ test(TestNames.ResetProfileDialogOriginUnknown, function() {
+ settings.navigateTo(settings.Route.RESET_DIALOG);
+ return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
+ .then(function() { return testResetRequestOrigin(''); });
+ });
+
+ test(TestNames.ResetProfileDialogOriginUserClick, function() {
+ MockInteractions.tap(resetPage.$.resetProfile);
+ return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
+ .then(function() { return testResetRequestOrigin('userclick'); });
+ });
+
+ test(TestNames.ResetProfileDialogOriginTriggeredReset, function() {
+ settings.navigateTo(settings.Route.TRIGGERED_RESET_DIALOG);
+ return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
+ .then(function() {
+ return testResetRequestOrigin('triggeredreset');
+ });
+ });
+
+ if (cr.isChromeOS) {
+ /**
+ * @param {function(SettingsPowerwashDialogElemeent):!Element}
+ * closeButtonFn A function that returns the button to be used for
+ * closing the dialog.
+ * @return {!Promise}
+ */
+ function testOpenClosePowerwashDialog(closeButtonFn) {
+ // Open powerwash dialog.
+ MockInteractions.tap(resetPage.$.powerwash);
+ Polymer.dom.flush();
+ var dialog = resetPage.$$('settings-powerwash-dialog');
+ assertTrue(!!dialog);
+ assertTrue(dialog.$.dialog.open);
+ var onDialogClosed = new Promise(
+ function(resolve, reject) {
+ dialog.addEventListener('close', function() {
+ assertFalse(dialog.$.dialog.open);
+ resolve();
});
});
- // Tests that when powerwash is requested chrome.send calls are
- // propagated as expected.
- test(TestNames.PowerwashDialogAction, function() {
- // Open powerwash dialog.
- MockInteractions.tap(resetPage.$.powerwash);
- Polymer.dom.flush();
- var dialog = resetPage.$$('settings-powerwash-dialog');
- assertTrue(!!dialog);
- MockInteractions.tap(dialog.$.powerwash);
- return lifetimeBrowserProxy.whenCalled('factoryReset');
+ MockInteractions.tap(closeButtonFn(dialog));
+ return Promise.all([
+ onDialogClosed,
+ resetPageBrowserProxy.whenCalled('onPowerwashDialogShow'),
+ ]);
+ }
+
+ // Tests that the powerwash dialog opens and closes correctly, and
+ // that chrome.send calls are propagated as expected.
+ test(TestNames.PowerwashDialogOpenClose, function() {
+ // Test case where the 'cancel' button is clicked.
+ return testOpenClosePowerwashDialog(function(dialog) {
+ return dialog.$.cancel;
+ }).then(function() {
+ // Test case where the 'close' button is clicked.
+ return testOpenClosePowerwashDialog(function(dialog) {
+ return dialog.$.dialog.getCloseButton();
});
- }
+ });
});
- }
- return {
- registerTests: function() {
- registerBannerTests();
- registerDialogTests();
- },
- };
+ // Tests that when powerwash is requested chrome.send calls are
+ // propagated as expected.
+ test(TestNames.PowerwashDialogAction, function() {
+ // Open powerwash dialog.
+ MockInteractions.tap(resetPage.$.powerwash);
+ Polymer.dom.flush();
+ var dialog = resetPage.$$('settings-powerwash-dialog');
+ assertTrue(!!dialog);
+ MockInteractions.tap(dialog.$.powerwash);
+ return lifetimeBrowserProxy.whenCalled('factoryReset');
+ });
+ }
});
« no previous file with comments | « chrome/test/data/webui/settings/cr_settings_browsertest.js ('k') | chrome/test/data/webui/settings/reset_profile_banner_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698