Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1777)

Unified Diff: chrome/test/data/webui/md_history/history_routing_test.js

Issue 2375223002: md-settings: Fix back navigation from /resetProfileSettings. (Closed)
Patch Set: Fix failing test. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/webui/md_history/history_routing_test.js
diff --git a/chrome/test/data/webui/md_history/history_routing_test.js b/chrome/test/data/webui/md_history/history_routing_test.js
index 74295289d56c206e3b65bc08a9ddf8e3b496aa92..ce40cf3bd885e644f1a60b3f36bb3f0ffce18e9a 100644
--- a/chrome/test/data/webui/md_history/history_routing_test.js
+++ b/chrome/test/data/webui/md_history/history_routing_test.js
@@ -24,7 +24,7 @@ cr.define('md_history.history_routing_test', function() {
test('changing route changes active view', function() {
assertEquals('history', app.$.content.selected);
navigateTo('/syncedTabs');
- return flush().then(function() {
+ return PolymerTest.flushTasks().then(function() {
assertEquals('syncedTabs', app.$.content.selected);
assertEquals('chrome://history/syncedTabs', window.location.href);
});
@@ -105,7 +105,7 @@ cr.define('md_history.history_routing_test_with_query_param', function() {
test('search initiated on load', function(done) {
var verifyFunction = function(info) {
assertEquals(expectedQuery, info[0]);
- flush().then(function() {
+ PolymerTest.flushTasks().then(function() {
assertEquals(
expectedQuery,
toolbar.$['main-toolbar'].getSearchField().getValue());

Powered by Google App Engine
This is Rietveld 408576698