Chromium Code Reviews| 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 9fa0cb1232184d4b20ae96ba065e0103276dcc87..62478d1df1c1e202453f25cb24021c81b061424b 100644 |
| --- a/chrome/test/data/webui/settings/reset_page_test.js |
| +++ b/chrome/test/data/webui/settings/reset_page_test.js |
| @@ -11,6 +11,10 @@ cr.define('settings_reset_page', function() { |
| ResetBannerReset: 'ResetBannerReset', |
| ResetProfileDialogAction: 'ResetProfileDialogAction', |
| ResetProfileDialogOpenClose: 'ResetProfileDialogOpenClose', |
| + ResetProfileDialogOriginUnknown: 'ResetProfileDialogOriginUnknown', |
| + ResetProfileDialogOriginUserClick: 'ResetProfileDialogOriginUserClick', |
| + ResetProfileDialogOriginTriggeredReset: |
| + 'ResetProfileDialogOriginTriggeredReset', |
| }; |
| /** |
| @@ -25,6 +29,7 @@ cr.define('settings_reset_page', function() { |
| 'onHideResetProfileBanner', |
| 'onShowResetProfileDialog', |
| 'showReportedSettings', |
| + 'getTriggeredResetToolName', |
| 'onPowerwashDialogShow', |
| ]); |
| }; |
| @@ -33,8 +38,8 @@ cr.define('settings_reset_page', function() { |
| __proto__: settings.TestBrowserProxy.prototype, |
| /** @override */ |
| - performResetProfileSettings: function(sendSettings) { |
| - this.methodCalled('performResetProfileSettings'); |
| + performResetProfileSettings: function(sendSettings, requestOrigin) { |
| + this.methodCalled('performResetProfileSettings', requestOrigin); |
| return Promise.resolve(); |
| }, |
| @@ -59,6 +64,12 @@ cr.define('settings_reset_page', function() { |
| }, |
| /** @override */ |
| + getTriggeredResetToolName: function() { |
| + this.methodCalled('getTriggeredResetToolName'); |
| + return Promise.resolve('WonderfulAV'); |
| + }, |
| + |
| + /** @override */ |
| onPowerwashDialogShow: function() { |
| this.methodCalled('onPowerwashDialogShow'); |
| }, |
| @@ -220,6 +231,36 @@ cr.define('settings_reset_page', function() { |
| }); |
| }); |
| + 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('');}); |
|
Dan Beam
2016/10/13 23:52:01
nit:
.then(function() { return testResetRequestOr
alito
2016/10/14 00:28:22
Done.
|
| + }); |
| + |
| + test(TestNames.ResetProfileDialogOriginUserClick, function() { |
| + MockInteractions.tap(resetPage.$.resetProfile); |
| + return resetPageBrowserProxy.whenCalled('onShowResetProfileDialog') |
| + .then(function() {return testResetRequestOrigin('userclick');}); |
|
Dan Beam
2016/10/13 23:52:01
spaces between { and } here as well
alito
2016/10/14 00:28:22
Done.
|
| + }); |
| + |
| + 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} |