| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 TEST_F('MaterialHistoryBrowserTest', 'HistoryOverflowMenuTest', function() { | 110 TEST_F('MaterialHistoryBrowserTest', 'HistoryOverflowMenuTest', function() { |
| 111 md_history.history_overflow_menu_test.registerTests(); | 111 md_history.history_overflow_menu_test.registerTests(); |
| 112 mocha.run(); | 112 mocha.run(); |
| 113 }); | 113 }); |
| 114 | 114 |
| 115 TEST_F('MaterialHistoryBrowserTest', 'RoutingTest', function() { | 115 TEST_F('MaterialHistoryBrowserTest', 'RoutingTest', function() { |
| 116 md_history.history_routing_test.registerTests(); | 116 md_history.history_routing_test.registerTests(); |
| 117 mocha.run(); | 117 mocha.run(); |
| 118 }); | 118 }); |
| 119 | 119 |
| 120 TEST_F('MaterialHistoryBrowserTest', 'SyncedTabsTest', function() { | 120 // Fails on Mac, http://crbug.com/640862 |
| 121 TEST_F('MaterialHistoryBrowserTest', 'DISABLED_SyncedTabsTest', function() { |
| 121 md_history.history_synced_tabs_test.registerTests(); | 122 md_history.history_synced_tabs_test.registerTests(); |
| 122 mocha.run(); | 123 mocha.run(); |
| 123 }); | 124 }); |
| 124 | 125 |
| 125 function MaterialHistoryDeletionDisabledTest() {} | 126 function MaterialHistoryDeletionDisabledTest() {} |
| 126 | 127 |
| 127 MaterialHistoryDeletionDisabledTest.prototype = { | 128 MaterialHistoryDeletionDisabledTest.prototype = { |
| 128 __proto__: MaterialHistoryBrowserTest.prototype, | 129 __proto__: MaterialHistoryBrowserTest.prototype, |
| 129 | 130 |
| 130 typedefCppFixture: 'HistoryUIBrowserTest', | 131 typedefCppFixture: 'HistoryUIBrowserTest', |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 }); | 167 }); |
| 167 }); | 168 }); |
| 168 }, | 169 }, |
| 169 }; | 170 }; |
| 170 | 171 |
| 171 TEST_F('MaterialHistoryWithQueryParamTest', 'RoutingTestWithQueryParam', | 172 TEST_F('MaterialHistoryWithQueryParamTest', 'RoutingTestWithQueryParam', |
| 172 function() { | 173 function() { |
| 173 md_history.history_routing_test_with_query_param.registerTests(); | 174 md_history.history_routing_test_with_query_param.registerTests(); |
| 174 mocha.run(); | 175 mocha.run(); |
| 175 }); | 176 }); |
| OLD | NEW |