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

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

Issue 1422023012: MD Settings: Simplify settings-dropdown-menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix updateSelected Created 5 years, 1 month 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 11 matching lines...) Expand all
22 __proto__: PolymerTest.prototype, 22 __proto__: PolymerTest.prototype,
23 23
24 /** @override */ 24 /** @override */
25 browsePreload: 'chrome://md-settings/prefs/prefs.html', 25 browsePreload: 'chrome://md-settings/prefs/prefs.html',
26 26
27 commandLineSwitches: [{switchName: 'enable-md-settings'}], 27 commandLineSwitches: [{switchName: 'enable-md-settings'}],
28 28
29 /** @override */ 29 /** @override */
30 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ 30 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
31 'checkbox_tests.js', 31 'checkbox_tests.js',
32 'dropdown_menu_tests.js',
32 'pref_util_tests.js', 33 'pref_util_tests.js',
33 'prefs_test_cases.js', 34 'prefs_test_cases.js',
34 'prefs_tests.js', 35 'prefs_tests.js',
35 ]), 36 ]),
36 }; 37 };
37 38
38 // Have to include command_line.h manually due to GEN calls below. 39 // Have to include command_line.h manually due to GEN calls below.
39 GEN('#include "base/command_line.h"'); 40 GEN('#include "base/command_line.h"');
40 41
41 // Times out on memory bots. http://crbug.com/534718 42 // Times out on memory bots. http://crbug.com/534718
42 GEN('#if defined(MEMORY_SANITIZER)'); 43 GEN('#if defined(MEMORY_SANITIZER)');
43 GEN('#define MAYBE_CrSettingsTest DISABLED_CrSettingsTest'); 44 GEN('#define MAYBE_CrSettingsTest DISABLED_CrSettingsTest');
44 GEN('#else'); 45 GEN('#else');
45 GEN('#define MAYBE_CrSettingsTest CrSettingsTest'); 46 GEN('#define MAYBE_CrSettingsTest CrSettingsTest');
46 GEN('#endif'); 47 GEN('#endif');
47 48
48 // Runs all tests. 49 // Runs all tests.
49 TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() { 50 TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() {
50 // Register mocha tests for each element. 51 // Register mocha tests for each element.
51 settings_checkbox.registerTests(); 52 settings_checkbox.registerTests();
53 settings_dropdown_menu.registerTests();
52 settings_prefUtil.registerTests(); 54 settings_prefUtil.registerTests();
53 settings_prefs.registerTests(); 55 settings_prefs.registerTests();
54 56
55 // Run all registered tests. 57 // Run all registered tests.
56 mocha.run(); 58 mocha.run();
57 }); 59 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698