Chromium Code Reviews| 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 25 matching lines...) Expand all Loading... | |
| 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 each of the top-level elements to be upgraded. |
| 45 return Promise.all([ | 45 return Promise.all([ |
| 46 waitForUpgrade($('history-list')), | 46 waitForUpgrade($('history-app')), |
|
tsergeant
2016/05/03 00:05:10
No need for Promise.all anymore, since there's jus
calamity
2016/05/03 23:07:18
Done.
| |
| 47 waitForUpgrade($('toolbar')), | |
| 48 waitForUpgrade($('history-synced-device-manager')), | |
| 49 ]); | 47 ]); |
| 50 }); | 48 }); |
| 51 }, | 49 }, |
| 52 }; | 50 }; |
| 53 | 51 |
| 54 TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() { | 52 TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() { |
| 55 md_history.history_item_test.registerTests(); | 53 md_history.history_item_test.registerTests(); |
| 56 mocha.run(); | 54 mocha.run(); |
| 57 }); | 55 }); |
| 58 | 56 |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 86 testGenPreamble: function() { | 84 testGenPreamble: function() { |
| 87 GEN(' SetDeleteAllowed(false);'); | 85 GEN(' SetDeleteAllowed(false);'); |
| 88 } | 86 } |
| 89 }; | 87 }; |
| 90 | 88 |
| 91 TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest', | 89 TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest', |
| 92 function() { | 90 function() { |
| 93 md_history.history_supervised_user_test.registerTests(); | 91 md_history.history_supervised_user_test.registerTests(); |
| 94 mocha.run(); | 92 mocha.run(); |
| 95 }); | 93 }); |
| OLD | NEW |