Chromium Code Reviews| 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() { |
|
tsergeant
2016/12/21 00:39:36
The existence of this test at all is a relic from
dpapad
2016/12/21 01:04:48
This test is accessing a lot of private state, lik
tsergeant
2016/12/21 02:37:34
sgtm
|
| - 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; |
| }); |
| }); |