| 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 Test suite for the Material Design history page. | 6 * @fileoverview Test suite for the Material Design history page. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 var ROOT_PATH = '../../../../../'; | 9 var ROOT_PATH = '../../../../../'; |
| 10 | 10 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 function MaterialHistorySyncedTabsTest() {} | 207 function MaterialHistorySyncedTabsTest() {} |
| 208 | 208 |
| 209 MaterialHistorySyncedTabsTest.prototype = { | 209 MaterialHistorySyncedTabsTest.prototype = { |
| 210 __proto__: MaterialHistoryBrowserTest.prototype, | 210 __proto__: MaterialHistoryBrowserTest.prototype, |
| 211 | 211 |
| 212 extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([ | 212 extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([ |
| 213 'history_synced_tabs_test.js', | 213 'history_synced_tabs_test.js', |
| 214 ]), | 214 ]), |
| 215 }; | 215 }; |
| 216 | 216 |
| 217 // Fails on Mac, http://crbug.com/640862 | 217 TEST_F('MaterialHistorySyncedTabsTest', 'All', function() { |
| 218 TEST_F('MaterialHistorySyncedTabsTest', 'DISABLED_All', function() { | |
| 219 mocha.run(); | 218 mocha.run(); |
| 220 }); | 219 }); |
| 221 | 220 |
| 222 function MaterialHistorySupervisedUserTest() {} | 221 function MaterialHistorySupervisedUserTest() {} |
| 223 | 222 |
| 224 MaterialHistorySupervisedUserTest.prototype = { | 223 MaterialHistorySupervisedUserTest.prototype = { |
| 225 __proto__: MaterialHistoryBrowserTest.prototype, | 224 __proto__: MaterialHistoryBrowserTest.prototype, |
| 226 | 225 |
| 227 typedefCppFixture: 'HistoryUIBrowserTest', | 226 typedefCppFixture: 'HistoryUIBrowserTest', |
| 228 | 227 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 251 | 250 |
| 252 TEST_F('MaterialHistoryToolbarTest', 'Basic', function() { | 251 TEST_F('MaterialHistoryToolbarTest', 'Basic', function() { |
| 253 md_history.history_toolbar_test.registerTests(); | 252 md_history.history_toolbar_test.registerTests(); |
| 254 mocha.run(); | 253 mocha.run(); |
| 255 }); | 254 }); |
| 256 | 255 |
| 257 TEST_F('MaterialHistoryToolbarTest', 'Focus', function() { | 256 TEST_F('MaterialHistoryToolbarTest', 'Focus', function() { |
| 258 md_history.history_toolbar_focus_test.registerTests(); | 257 md_history.history_toolbar_focus_test.registerTests(); |
| 259 mocha.run(); | 258 mocha.run(); |
| 260 }); | 259 }); |
| OLD | NEW |