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 27 matching lines...) Expand all Loading... |
38 'history_synced_tabs_test.js', | 38 'history_synced_tabs_test.js', |
39 'history_toolbar_test.js' | 39 'history_toolbar_test.js' |
40 ]), | 40 ]), |
41 | 41 |
42 /** @override */ | 42 /** @override */ |
43 setUp: function() { | 43 setUp: function() { |
44 PolymerTest.prototype.setUp.call(this); | 44 PolymerTest.prototype.setUp.call(this); |
45 | 45 |
46 suiteSetup(function() { | 46 suiteSetup(function() { |
47 // Wait for the top-level app element to be upgraded. | 47 // Wait for the top-level app element to be upgraded. |
48 return waitForUpgrade($('history-app')).then(function() { | 48 return waitForAppUpgrade().then(function() { |
49 $('history-app').queryState_.queryingDisabled = true; | 49 $('history-app').queryState_.queryingDisabled = true; |
50 }); | 50 }); |
51 }); | 51 }); |
52 }, | 52 }, |
53 }; | 53 }; |
54 | 54 |
55 TEST_F('MaterialHistoryBrowserTest', 'BrowserServiceTest', function() { | 55 TEST_F('MaterialHistoryBrowserTest', 'BrowserServiceTest', function() { |
56 md_history.browser_service_test.registerTests(); | 56 md_history.browser_service_test.registerTests(); |
57 mocha.run(); | 57 mocha.run(); |
58 }); | 58 }); |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 // This message handler needs to be registered before the test since the | 125 // This message handler needs to be registered before the test since the |
126 // query can happen immediately after the element is upgraded. However, | 126 // query can happen immediately after the element is upgraded. However, |
127 // since there may be a delay as well, the test might check the global var | 127 // since there may be a delay as well, the test might check the global var |
128 // too early as well. In this case the test will have overtaken the | 128 // too early as well. In this case the test will have overtaken the |
129 // callback. | 129 // callback. |
130 registerMessageCallback('queryHistory', this, function (info) { | 130 registerMessageCallback('queryHistory', this, function (info) { |
131 window.historyQueryInfo = info; | 131 window.historyQueryInfo = info; |
132 }); | 132 }); |
133 | 133 |
134 // Wait for the top-level app element to be upgraded. | 134 // Wait for the top-level app element to be upgraded. |
135 return waitForUpgrade($('history-app')); | 135 return waitForAppUpgrade(); |
136 }); | 136 }); |
137 }, | 137 }, |
138 }; | 138 }; |
139 | 139 |
140 TEST_F('MaterialHistoryWithQueryParamTest', 'RoutingTestWithQueryParam', | 140 TEST_F('MaterialHistoryWithQueryParamTest', 'RoutingTestWithQueryParam', |
141 function() { | 141 function() { |
142 md_history.history_routing_test_with_query_param.registerTests(); | 142 md_history.history_routing_test_with_query_param.registerTests(); |
143 mocha.run(); | 143 mocha.run(); |
144 }); | 144 }); |
OLD | NEW |