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

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

Issue 2341923005: MD WebUI: Make cr-lazy-render get() synchronous (Closed)
Patch Set: Simplify test more Created 4 years, 3 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_overflow_menu_test.js
diff --git a/chrome/test/data/webui/md_history/history_overflow_menu_test.js b/chrome/test/data/webui/md_history/history_overflow_menu_test.js
index 0af568a78c90d0086a7b9d83812bb063adb84944..24e88afdce1fd0c5ddf50973ed548d119f493caf 100644
--- a/chrome/test/data/webui/md_history/history_overflow_menu_test.js
+++ b/chrome/test/data/webui/md_history/history_overflow_menu_test.js
@@ -32,39 +32,33 @@ cr.define('md_history.history_overflow_menu_test', function() {
MENU_EVENT.detail.target = element1;
ADDITIONAL_MENU_EVENT.detail.target = element2;
- return listContainer.$.sharedMenu.get().then(function(menu) {
- sharedMenu = menu;
- });
+ sharedMenu = listContainer.$.sharedMenu.get();
});
test('opening and closing menu', function() {
- return listContainer.toggleMenu_(MENU_EVENT).then(function() {
- assertTrue(sharedMenu.menuOpen);
- assertEquals(MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
+ listContainer.toggleMenu_(MENU_EVENT);
+ assertTrue(sharedMenu.menuOpen);
+ assertEquals(MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
- // Test having the same menu event (pressing the same button) closes
- // the overflow menu.
- return listContainer.toggleMenu_(MENU_EVENT);
- }).then(function() {
- assertFalse(sharedMenu.menuOpen);
+ // Test having the same menu event (pressing the same button) closes
+ // the overflow menu.
+ listContainer.toggleMenu_(MENU_EVENT);
+ assertFalse(sharedMenu.menuOpen);
- // Test having consecutive distinct menu events moves the menu to the
- // new button.
- return listContainer.toggleMenu_(MENU_EVENT);
- }).then(function() {
- return listContainer.toggleMenu_(ADDITIONAL_MENU_EVENT);
- }).then(function() {
- assertEquals(
- ADDITIONAL_MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
- assertTrue(sharedMenu.menuOpen);
- return listContainer.toggleMenu_(MENU_EVENT);
- }).then(function() {
- assertTrue(sharedMenu.menuOpen);
- assertEquals(MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
+ // Test having consecutive distinct menu events moves the menu to the
+ // new button.
+ listContainer.toggleMenu_(MENU_EVENT);
+ listContainer.toggleMenu_(ADDITIONAL_MENU_EVENT);
+ assertEquals(
+ ADDITIONAL_MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
+ assertTrue(sharedMenu.menuOpen);
- sharedMenu.closeMenu();
- assertFalse(sharedMenu.menuOpen);
- });
+ listContainer.toggleMenu_(MENU_EVENT);
+ assertTrue(sharedMenu.menuOpen);
+ assertEquals(MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
+
+ sharedMenu.closeMenu();
+ assertFalse(sharedMenu.menuOpen);
});
test('menu closes when search changes', function() {
@@ -72,11 +66,10 @@ cr.define('md_history.history_overflow_menu_test', function() {
[createHistoryEntry('2016-07-19', 'https://www.nianticlabs.com')];
app.historyResult(createHistoryInfo(), entry);
- return listContainer.toggleMenu_(MENU_EVENT).then(function() {
- // Menu closes when search changes.
- app.historyResult(createHistoryInfo('niantic'), entry);
- assertFalse(sharedMenu.menuOpen);
- });
+ listContainer.toggleMenu_(MENU_EVENT);
+ // Menu closes when search changes.
+ app.historyResult(createHistoryInfo('niantic'), entry);
+ assertFalse(sharedMenu.menuOpen);
});
teardown(function() {

Powered by Google App Engine
This is Rietveld 408576698