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 11 matching lines...) Expand all Loading... |
22 | 22 |
23 commandLineSwitches: [{switchName: 'enable-features', | 23 commandLineSwitches: [{switchName: 'enable-features', |
24 switchValue: 'MaterialDesignHistory'}], | 24 switchValue: 'MaterialDesignHistory'}], |
25 | 25 |
26 /** @override */ | 26 /** @override */ |
27 runAccessibilityChecks: false, | 27 runAccessibilityChecks: false, |
28 | 28 |
29 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ | 29 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
30 'test_util.js', | 30 'test_util.js', |
31 'browser_service_test.js', | 31 'browser_service_test.js', |
| 32 'history_grouped_list_test.js', |
32 'history_item_test.js', | 33 'history_item_test.js', |
33 'history_list_test.js', | 34 'history_list_test.js', |
34 'history_overflow_menu_test.js', | 35 'history_overflow_menu_test.js', |
35 'history_supervised_user_test.js', | 36 'history_supervised_user_test.js', |
36 'history_synced_tabs_test.js', | 37 'history_synced_tabs_test.js', |
37 'history_toolbar_test.js' | 38 'history_toolbar_test.js' |
38 ]), | 39 ]), |
39 | 40 |
40 /** @override */ | 41 /** @override */ |
41 setUp: function() { | 42 setUp: function() { |
42 PolymerTest.prototype.setUp.call(this); | 43 PolymerTest.prototype.setUp.call(this); |
43 | 44 |
44 suiteSetup(function() { | 45 suiteSetup(function() { |
45 // Wait for the top-level app element to be upgraded. | 46 // Wait for the top-level app element to be upgraded. |
46 return waitForUpgrade($('history-app')); | 47 return waitForUpgrade($('history-app')).then(function() { |
| 48 $('history-app').queryingDisabled_ = true; |
| 49 }); |
47 }); | 50 }); |
48 }, | 51 }, |
49 }; | 52 }; |
50 | 53 |
51 TEST_F('MaterialHistoryBrowserTest', 'BrowserServiceTest', function() { | 54 TEST_F('MaterialHistoryBrowserTest', 'BrowserServiceTest', function() { |
52 md_history.browser_service_test.registerTests(); | 55 md_history.browser_service_test.registerTests(); |
53 mocha.run(); | 56 mocha.run(); |
54 }); | 57 }); |
55 | 58 |
| 59 TEST_F('MaterialHistoryBrowserTest', 'HistoryGroupedListTest', function() { |
| 60 md_history.history_grouped_list_test.registerTests(); |
| 61 mocha.run(); |
| 62 }); |
| 63 |
56 TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() { | 64 TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() { |
57 md_history.history_item_test.registerTests(); | 65 md_history.history_item_test.registerTests(); |
58 mocha.run(); | 66 mocha.run(); |
59 }); | 67 }); |
60 | 68 |
61 TEST_F('MaterialHistoryBrowserTest', 'HistoryListTest', function() { | 69 TEST_F('MaterialHistoryBrowserTest', 'HistoryListTest', function() { |
62 md_history.history_list_test.registerTests(); | 70 md_history.history_list_test.registerTests(); |
63 mocha.run(); | 71 mocha.run(); |
64 }); | 72 }); |
65 | 73 |
(...skipping 22 matching lines...) Expand all Loading... |
88 testGenPreamble: function() { | 96 testGenPreamble: function() { |
89 GEN(' SetDeleteAllowed(false);'); | 97 GEN(' SetDeleteAllowed(false);'); |
90 } | 98 } |
91 }; | 99 }; |
92 | 100 |
93 TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest', | 101 TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest', |
94 function() { | 102 function() { |
95 md_history.history_supervised_user_test.registerTests(); | 103 md_history.history_supervised_user_test.registerTests(); |
96 mocha.run(); | 104 mocha.run(); |
97 }); | 105 }); |
OLD | NEW |