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

Side by Side Diff: chrome/test/data/webui/settings/reset_page_test.js

Issue 2668623002: MD Settings: Fix remaining tests that fail in Vulcanized mode. (Closed)
Patch Set: Rebase 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('settings_reset_page', function() { 5 cr.define('settings_reset_page', function() {
6 /** @enum {string} */ 6 /** @enum {string} */
7 var TestNames = { 7 var TestNames = {
8 PowerwashDialogAction: 'PowerwashDialogAction', 8 PowerwashDialogAction: 'PowerwashDialogAction',
9 PowerwashDialogOpenClose: 'PowerwashDialogOpenClose', 9 PowerwashDialogOpenClose: 'PowerwashDialogOpenClose',
10 ResetBannerClose: 'ResetBannerClose', 10 ResetBannerClose: 'ResetBannerClose',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 onPowerwashDialogShow: function() { 73 onPowerwashDialogShow: function() {
74 this.methodCalled('onPowerwashDialogShow'); 74 this.methodCalled('onPowerwashDialogShow');
75 }, 75 },
76 }; 76 };
77 77
78 function registerBannerTests() { 78 function registerBannerTests() {
79 suite('BannerTests', function() { 79 suite('BannerTests', function() {
80 var resetBanner = null; 80 var resetBanner = null;
81 var browserProxy = null; 81 var browserProxy = null;
82 82
83 suiteSetup(function() { 83 var USE_VULCANIZE = true;
84 return PolymerTest.importHtml( 84 if (!USE_VULCANIZE) {
Dan Beam 2017/02/03 22:49:08 same
dpapad 2017/02/03 23:18:16 I have already sent a separate CL for this (https:
85 'chrome://md-settings/reset_page/reset_profile_banner.html'); 85 suiteSetup(function() {
86 }); 86 return PolymerTest.importHtml(
87 'chrome://md-settings/reset_page/reset_profile_banner.html');
88 });
89 }
87 90
88 setup(function() { 91 setup(function() {
89 browserProxy = new TestResetBrowserProxy(); 92 browserProxy = new TestResetBrowserProxy();
90 settings.ResetBrowserProxyImpl.instance_ = browserProxy; 93 settings.ResetBrowserProxyImpl.instance_ = browserProxy;
91 PolymerTest.clearBody(); 94 PolymerTest.clearBody();
92 resetBanner = document.createElement('settings-reset-profile-banner'); 95 resetBanner = document.createElement('settings-reset-profile-banner');
93 document.body.appendChild(resetBanner); 96 document.body.appendChild(resetBanner);
94 }); 97 });
95 98
96 teardown(function() { resetBanner.remove(); }); 99 teardown(function() { resetBanner.remove(); });
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 }); 322 });
320 } 323 }
321 324
322 return { 325 return {
323 registerTests: function() { 326 registerTests: function() {
324 registerBannerTests(); 327 registerBannerTests();
325 registerDialogTests(); 328 registerDialogTests();
326 }, 329 },
327 }; 330 };
328 }); 331 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698