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

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

Issue 2583353003: MD History: Replace last usage of cr-shared-menu with cr-action-menu. (Closed)
Patch Set: Test found real subtle bug (display flex overriding [hidden] attribute) Created 4 years 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 5f407a0778b1329bf65ab7b0e0ff4ab399db77e0..6dc4a4ab107a6698d40e2c0ad29c64d1253ab165 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
@@ -2,74 +2,45 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Menu button event.
-var MENU_EVENT = {
- detail: {
- target: null
- }
-};
-
-var ADDITIONAL_MENU_EVENT = {
- detail: {
- target: null
- }
-};
-
suite('#overflow-menu', function() {
- var app;
var listContainer;
var sharedMenu;
+ var target1;
+ var target2;
+
suiteSetup(function() {
- app = $('history-app');
+ var app = $('history-app');
listContainer = app.$['history'];
var element1 = document.createElement('div');
var element2 = document.createElement('div');
document.body.appendChild(element1);
document.body.appendChild(element2);
- MENU_EVENT.detail.target = element1;
- ADDITIONAL_MENU_EVENT.detail.target = element2;
+ target1 = element1;
+ target2 = element2;
sharedMenu = listContainer.$.sharedMenu.get();
});
test('opening and closing menu', function() {
- 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.
- listContainer.toggleMenu_(MENU_EVENT);
- assertFalse(sharedMenu.menuOpen);
+ var detail1 = {target: target1};
+ listContainer.fire('open-menu', detail1);
+ assertTrue(sharedMenu.open);
+ assertEquals(detail1, listContainer.actionMenuModel_);
- // 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);
-
- listContainer.toggleMenu_(MENU_EVENT);
- assertTrue(sharedMenu.menuOpen);
- assertEquals(MENU_EVENT.detail.target, sharedMenu.lastAnchor_);
-
- sharedMenu.closeMenu();
- assertFalse(sharedMenu.menuOpen);
- });
+ sharedMenu.close();
+ assertFalse(sharedMenu.open);
- test('menu closes when search changes', function() {
- var entry =
- [createHistoryEntry('2016-07-19', 'https://www.nianticlabs.com')];
+ var detail2 = {target: target2};
+ listContainer.fire('open-menu', detail2);
+ assertEquals(detail2, listContainer.actionMenuModel_);
+ assertTrue(sharedMenu.open);
- app.historyResult(createHistoryInfo(), entry);
- listContainer.toggleMenu_(MENU_EVENT);
- // Menu closes when search changes.
- app.historyResult(createHistoryInfo('niantic'), entry);
- assertFalse(sharedMenu.menuOpen);
+ sharedMenu.close();
+ assertFalse(sharedMenu.open);
});
teardown(function() {
- sharedMenu.lastAnchor_ = null;
+ sharedMenu.actionMenuModel_ = null;
});
});

Powered by Google App Engine
This is Rietveld 408576698