OLD | NEW |
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 24 matching lines...) Expand all Loading... |
35 | 35 |
36 /** @override */ | 36 /** @override */ |
37 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ | 37 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
38 'extension_test_util.js', | 38 'extension_test_util.js', |
39 'extension_detail_view_test.js', | 39 'extension_detail_view_test.js', |
40 'extension_item_test.js', | 40 'extension_item_test.js', |
41 'extension_item_list_test.js', | 41 'extension_item_list_test.js', |
42 'extension_keyboard_shortcuts_test.js', | 42 'extension_keyboard_shortcuts_test.js', |
43 'extension_pack_dialog_test.js', | 43 'extension_pack_dialog_test.js', |
44 'extension_service_test.js', | 44 'extension_service_test.js', |
| 45 'extension_shortcut_input_test.js', |
45 'extension_sidebar_test.js', | 46 'extension_sidebar_test.js', |
46 'extension_manager_test.js', | 47 'extension_manager_test.js', |
47 '../mock_controller.js', | 48 '../mock_controller.js', |
48 '../../../../../ui/webui/resources/js/promise_resolver.js', | 49 '../../../../../ui/webui/resources/js/promise_resolver.js', |
49 '../../../../../ui/webui/resources/js/webui_resource_test.js', | 50 '../../../../../ui/webui/resources/js/webui_resource_test.js', |
50 ]), | 51 ]), |
51 | 52 |
52 /** @override */ | 53 /** @override */ |
53 typedefCppFixture: 'ExtensionSettingsUIBrowserTest', | 54 typedefCppFixture: 'ExtensionSettingsUIBrowserTest', |
54 }; | 55 }; |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 extension_keyboard_shortcut_tests.registerTests(); | 222 extension_keyboard_shortcut_tests.registerTests(); |
222 mocha.grep(assert(extension_keyboard_shortcut_tests.TestNames.Layout)).run(); | 223 mocha.grep(assert(extension_keyboard_shortcut_tests.TestNames.Layout)).run(); |
223 }); | 224 }); |
224 | 225 |
225 TEST_F('CrExtensionsBrowserTest', 'ExtensionShortcutUtilTest', function() { | 226 TEST_F('CrExtensionsBrowserTest', 'ExtensionShortcutUtilTest', function() { |
226 extension_keyboard_shortcut_tests.registerTests(); | 227 extension_keyboard_shortcut_tests.registerTests(); |
227 mocha.grep( | 228 mocha.grep( |
228 assert(extension_keyboard_shortcut_tests.TestNames.ShortcutUtil)).run(); | 229 assert(extension_keyboard_shortcut_tests.TestNames.ShortcutUtil)).run(); |
229 }); | 230 }); |
230 | 231 |
| 232 TEST_F('CrExtensionsBrowserTest', 'ExtensionShortcutInputTest', function() { |
| 233 extension_shortcut_input_tests.registerTests(); |
| 234 mocha.grep( |
| 235 assert(extension_shortcut_input_tests.TestNames.Basic)).run(); |
| 236 }); |
| 237 |
231 //////////////////////////////////////////////////////////////////////////////// | 238 //////////////////////////////////////////////////////////////////////////////// |
232 // Extension Pack Dialog Tests | 239 // Extension Pack Dialog Tests |
233 | 240 |
234 TEST_F('CrExtensionsBrowserTest', 'ExtensionPackDialogInteractionTest', | 241 TEST_F('CrExtensionsBrowserTest', 'ExtensionPackDialogInteractionTest', |
235 function() { | 242 function() { |
236 extension_pack_dialog_tests.registerTests(); | 243 extension_pack_dialog_tests.registerTests(); |
237 mocha.grep(assert(extension_pack_dialog_tests.TestNames.Interaction)).run(); | 244 mocha.grep(assert(extension_pack_dialog_tests.TestNames.Interaction)).run(); |
238 }); | 245 }); |
OLD | NEW |