| 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 /** | 5 /** |
| 6 * @fileoverview Framework for running JavaScript tests of Polymer elements. | 6 * @fileoverview Framework for running JavaScript tests of Polymer elements. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 /** | 9 /** |
| 10 * Test fixture for Polymer element testing. | 10 * Test fixture for Polymer element testing. |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 */ | 31 */ |
| 32 isAsync: true, | 32 isAsync: true, |
| 33 | 33 |
| 34 /** | 34 /** |
| 35 * Files that need not be compiled. Should be overridden to use correct | 35 * Files that need not be compiled. Should be overridden to use correct |
| 36 * relative paths with PolymerTest.getLibraries. | 36 * relative paths with PolymerTest.getLibraries. |
| 37 * @override | 37 * @override |
| 38 */ | 38 */ |
| 39 extraLibraries: [ | 39 extraLibraries: [ |
| 40 'ui/webui/resources/js/cr.js', | 40 'ui/webui/resources/js/cr.js', |
| 41 'ui/webui/resources/js/promise_resolver.js', |
| 41 'third_party/mocha/mocha.js', | 42 'third_party/mocha/mocha.js', |
| 42 'chrome/test/data/webui/mocha_adapter.js', | 43 'chrome/test/data/webui/mocha_adapter.js', |
| 43 ], | 44 ], |
| 44 | 45 |
| 45 /** Time when preLoad starts, i.e. before the browsePreload page is loaded. */ | 46 /** Time when preLoad starts, i.e. before the browsePreload page is loaded. */ |
| 46 preloadTime: 0, | 47 preloadTime: 0, |
| 47 | 48 |
| 48 /** Time when test run starts. */ | 49 /** Time when test run starts. */ |
| 49 runTime: 0, | 50 runTime: 0, |
| 50 | 51 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 */ | 174 */ |
| 174 PolymerTest.getLibraries = function(basePath) { | 175 PolymerTest.getLibraries = function(basePath) { |
| 175 // Ensure basePath ends in '/'. | 176 // Ensure basePath ends in '/'. |
| 176 if (basePath.length && basePath[basePath.length - 1] != '/') | 177 if (basePath.length && basePath[basePath.length - 1] != '/') |
| 177 basePath += '/'; | 178 basePath += '/'; |
| 178 | 179 |
| 179 return PolymerTest.prototype.extraLibraries.map(function(library) { | 180 return PolymerTest.prototype.extraLibraries.map(function(library) { |
| 180 return basePath + library; | 181 return basePath + library; |
| 181 }); | 182 }); |
| 182 }; | 183 }; |
| OLD | NEW |