| 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 23 matching lines...) Expand all Loading... |
| 34 'history_supervised_user_test.js', | 34 'history_supervised_user_test.js', |
| 35 'history_synced_tabs_test.js', | 35 'history_synced_tabs_test.js', |
| 36 'history_toolbar_test.js' | 36 'history_toolbar_test.js' |
| 37 ]), | 37 ]), |
| 38 | 38 |
| 39 /** @override */ | 39 /** @override */ |
| 40 setUp: function() { | 40 setUp: function() { |
| 41 PolymerTest.prototype.setUp.call(this); | 41 PolymerTest.prototype.setUp.call(this); |
| 42 | 42 |
| 43 suiteSetup(function() { | 43 suiteSetup(function() { |
| 44 // Wait for each of the top-level elements to be upgraded. | 44 // Wait for the top-level app element to be upgraded. |
| 45 return Promise.all([ | 45 return waitForUpgrade($('history-app')); |
| 46 waitForUpgrade($('history-list')), | |
| 47 waitForUpgrade($('toolbar')), | |
| 48 waitForUpgrade($('history-synced-device-manager')), | |
| 49 ]); | |
| 50 }); | 46 }); |
| 51 }, | 47 }, |
| 52 }; | 48 }; |
| 53 | 49 |
| 54 TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() { | 50 TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() { |
| 55 md_history.history_item_test.registerTests(); | 51 md_history.history_item_test.registerTests(); |
| 56 mocha.run(); | 52 mocha.run(); |
| 57 }); | 53 }); |
| 58 | 54 |
| 59 TEST_F('MaterialHistoryBrowserTest', 'HistoryListTest', function() { | 55 TEST_F('MaterialHistoryBrowserTest', 'HistoryListTest', function() { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 86 testGenPreamble: function() { | 82 testGenPreamble: function() { |
| 87 GEN(' SetDeleteAllowed(false);'); | 83 GEN(' SetDeleteAllowed(false);'); |
| 88 } | 84 } |
| 89 }; | 85 }; |
| 90 | 86 |
| 91 TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest', | 87 TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest', |
| 92 function() { | 88 function() { |
| 93 md_history.history_supervised_user_test.registerTests(); | 89 md_history.history_supervised_user_test.registerTests(); |
| 94 mocha.run(); | 90 mocha.run(); |
| 95 }); | 91 }); |
| OLD | NEW |