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

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

Issue 1871073004: Settings People Revamp: Simplify Change Picture browsertests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0138-settings-people-manage-profile-browser-tests
Patch Set: fix hitting the check (and merge origin/master) 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 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 /** @fileoverview Runs the Polymer Settings tests. */ 5 /** @fileoverview Runs the Polymer Settings tests. */
6 6
7 /** @const {string} Path to source root. */ 7 /** @const {string} Path to source root. */
8 var ROOT_PATH = '../../../../../'; 8 var ROOT_PATH = '../../../../../';
9 9
10 // Polymer BrowserTest fixture. 10 // Polymer BrowserTest fixture.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() { 60 TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() {
61 settings_checkbox.registerTests(); 61 settings_checkbox.registerTests();
62 settings_dropdown_menu.registerTests(); 62 settings_dropdown_menu.registerTests();
63 settings_prefUtil.registerTests(); 63 settings_prefUtil.registerTests();
64 settings_prefs.registerTests(); 64 settings_prefs.registerTests();
65 65
66 // Run all registered tests. 66 // Run all registered tests.
67 mocha.run(); 67 mocha.run();
68 }); 68 });
69 69
70 GEN('#if !defined(OS_CHROMEOS)'); 70 GEN('#if defined(OS_CHROMEOS)');
71 /**
72 * Test fixture for
73 * chrome/browser/resources/settings/people_page/change_picture.html.
74 * This is ChromeOS only.
75 * @constructor
76 * @extends {CrSettingsBrowserTest}
77 */
78 function CrSettingsPeoplePageChangePictureTest() {}
79
80 CrSettingsPeoplePageChangePictureTest.prototype = {
81 __proto__: CrSettingsBrowserTest.prototype,
82
83 /** @override */
84 browsePreload: 'chrome://md-settings/people_page/change_picture.html',
85
86 /** @override */
87 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
88 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js',
89 'test_browser_proxy.js',
90 'people_page_change_picture_test.js',
91 ]),
92 };
93
94 TEST_F('CrSettingsPeoplePageChangePictureTest', 'ChangePicture', function() {
95 settings_people_page_change_picture.registerTests();
96 mocha.run();
97 });
98 GEN('#else'); // !defined(OS_CHROMEOS)
71 /** 99 /**
72 * Test fixture for 100 * Test fixture for
73 * chrome/browser/resources/settings/people_page/manage_profile.html. 101 * chrome/browser/resources/settings/people_page/manage_profile.html.
74 * This is non-ChromeOS only. 102 * This is non-ChromeOS only.
75 * @constructor 103 * @constructor
76 * @extends {CrSettingsBrowserTest} 104 * @extends {CrSettingsBrowserTest}
77 */ 105 */
78 function CrSettingsPeoplePageManageProfileTest() {} 106 function CrSettingsPeoplePageManageProfileTest() {}
79 107
80 CrSettingsPeoplePageManageProfileTest.prototype = { 108 CrSettingsPeoplePageManageProfileTest.prototype = {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 387 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
360 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', 388 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js',
361 'test_browser_proxy.js', 389 'test_browser_proxy.js',
362 'startup_urls_page_test.js', 390 'startup_urls_page_test.js',
363 ]), 391 ]),
364 }; 392 };
365 393
366 TEST_F('CrSettingsStartupUrlsPageTest', 'StartupUrlsPage', function() { 394 TEST_F('CrSettingsStartupUrlsPageTest', 'StartupUrlsPage', function() {
367 mocha.run(); 395 mocha.run();
368 }); 396 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698