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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2504813002: MD History: Remove unnecessary namespacing from tests (Closed)
Patch Set: Remove newlines Created 4 years, 1 month 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
« no previous file with comments | « chrome/test/data/webui/md_history/history_item_test.js ('k') | chrome/test/data/webui/md_history/history_metrics_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/md_history/history_list_test.js
diff --git a/chrome/test/data/webui/md_history/history_list_test.js b/chrome/test/data/webui/md_history/history_list_test.js
index 4a8293328bfb2a9b34cad75cfea91a925d4001a6..55cbb8a0140cd94d35a2ac157494af43a7ffee97 100644
--- a/chrome/test/data/webui/md_history/history_list_test.js
+++ b/chrome/test/data/webui/md_history/history_list_test.js
@@ -2,581 +2,559 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-cr.define('md_history.history_list_test', function() {
- function registerTests() {
- suite('<history-list>', function() {
- var app;
- var element;
- var toolbar;
- var TEST_HISTORY_RESULTS;
- var ADDITIONAL_RESULTS;
-
- suiteSetup(function() {
- TEST_HISTORY_RESULTS = [
- createHistoryEntry('2016-03-15', 'https://www.google.com'),
- createHistoryEntry('2016-03-14 10:00', 'https://www.example.com'),
- createHistoryEntry('2016-03-14 9:00', 'https://www.google.com'),
- createHistoryEntry('2016-03-13', 'https://en.wikipedia.org')
- ];
- TEST_HISTORY_RESULTS[2].starred = true;
-
- ADDITIONAL_RESULTS = [
- createHistoryEntry('2016-03-13 10:00', 'https://en.wikipedia.org'),
- createHistoryEntry('2016-03-13 9:50', 'https://www.youtube.com'),
- createHistoryEntry('2016-03-11', 'https://www.google.com'),
- createHistoryEntry('2016-03-10', 'https://www.example.com')
- ];
- });
-
- setup(function() {
- app = replaceApp();
- element = app.$['history'].$['infinite-list'];
- toolbar = app.$['toolbar'];
- app.queryState_.incremental = true;
- });
-
- test('deleting single item', function(done) {
- var listContainer = app.$.history;
- app.historyResult(createHistoryInfo(), [
- createHistoryEntry('2015-01-01', 'http://example.com')
- ]);
-
+suite('<history-list>', function() {
+ var app;
+ var element;
+ var toolbar;
+ var TEST_HISTORY_RESULTS;
+ var ADDITIONAL_RESULTS;
+
+ suiteSetup(function() {
+ TEST_HISTORY_RESULTS = [
+ createHistoryEntry('2016-03-15', 'https://www.google.com'),
+ createHistoryEntry('2016-03-14 10:00', 'https://www.example.com'),
+ createHistoryEntry('2016-03-14 9:00', 'https://www.google.com'),
+ createHistoryEntry('2016-03-13', 'https://en.wikipedia.org')
+ ];
+ TEST_HISTORY_RESULTS[2].starred = true;
+
+ ADDITIONAL_RESULTS = [
+ createHistoryEntry('2016-03-13 10:00', 'https://en.wikipedia.org'),
+ createHistoryEntry('2016-03-13 9:50', 'https://www.youtube.com'),
+ createHistoryEntry('2016-03-11', 'https://www.google.com'),
+ createHistoryEntry('2016-03-10', 'https://www.example.com')
+ ];
+ });
+
+ setup(function() {
+ app = replaceApp();
+ element = app.$['history'].$['infinite-list'];
+ toolbar = app.$['toolbar'];
+ app.queryState_.incremental = true;
+ });
+
+ test('deleting single item', function(done) {
+ var listContainer = app.$.history;
+ app.historyResult(createHistoryInfo(), [
+ createHistoryEntry('2015-01-01', 'http://example.com')
+ ]);
+
+ PolymerTest.flushTasks().then(function() {
+ assertEquals(element.historyData_.length, 1);
+ items = polymerSelectAll(element, 'history-item');
+ MockInteractions.tap(items[0].$.checkbox);
+ assertDeepEquals([true], element.historyData_.map(i => i.selected));
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ MockInteractions.tap(app.$.toolbar.$$('#delete-button'));
+ var dialog = listContainer.$.dialog.get();
+ registerMessageCallback('removeVisits', this, function() {
PolymerTest.flushTasks().then(function() {
- assertEquals(element.historyData_.length, 1);
- items = polymerSelectAll(element, 'history-item');
- MockInteractions.tap(items[0].$.checkbox);
- assertDeepEquals([true],
- element.historyData_.map(i => i.selected));
+ deleteComplete();
return PolymerTest.flushTasks();
}).then(function() {
- MockInteractions.tap(app.$.toolbar.$$('#delete-button'));
- var dialog = listContainer.$.dialog.get();
- registerMessageCallback('removeVisits', this, function() {
- PolymerTest.flushTasks().then(function() {
- deleteComplete();
- return PolymerTest.flushTasks();
- }).then(function() {
- items = polymerSelectAll(element, 'history-item');
- assertEquals(element.historyData_.length, 0);
- done();
- });
- });
- assertTrue(dialog.open);
- MockInteractions.tap(listContainer.$$('.action-button'));
+ items = polymerSelectAll(element, 'history-item');
+ assertEquals(element.historyData_.length, 0);
+ done();
});
});
+ assertTrue(dialog.open);
+ MockInteractions.tap(listContainer.$$('.action-button'));
+ });
+ });
- test('cancelling selection of multiple items', function() {
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- var items = polymerSelectAll(element, 'history-item');
-
- MockInteractions.tap(items[2].$.checkbox);
- MockInteractions.tap(items[3].$.checkbox);
-
- // Make sure that the array of data that determines whether or not an
- // item is selected is what we expect after selecting the two items.
- assertDeepEquals([false, false, true, true],
- element.historyData_.map(i => i.selected));
+ test('cancelling selection of multiple items', function() {
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ var items = polymerSelectAll(element, 'history-item');
- toolbar.onClearSelectionTap_();
+ MockInteractions.tap(items[2].$.checkbox);
+ MockInteractions.tap(items[3].$.checkbox);
- // Make sure that clearing the selection updates both the array and
- // the actual history-items affected.
- assertDeepEquals([false, false, false, false],
- element.historyData_.map(i => i.selected));
+ // Make sure that the array of data that determines whether or not an
+ // item is selected is what we expect after selecting the two items.
+ assertDeepEquals([false, false, true, true],
+ element.historyData_.map(i => i.selected));
- assertFalse(items[2].selected);
- assertFalse(items[3].selected);
- });
- });
+ toolbar.onClearSelectionTap_();
- test('selection of multiple items using shift click', function() {
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- var items = polymerSelectAll(element, 'history-item');
+ // Make sure that clearing the selection updates both the array and
+ // the actual history-items affected.
+ assertDeepEquals([false, false, false, false],
+ element.historyData_.map(i => i.selected));
- MockInteractions.tap(items[1].$.checkbox);
- assertDeepEquals([false, true, false, false],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- ['historyData_.1'],
- Array.from(element.selectedPaths).sort());
+ assertFalse(items[2].selected);
+ assertFalse(items[3].selected);
+ });
+ });
+
+ test('selection of multiple items using shift click', function() {
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ var items = polymerSelectAll(element, 'history-item');
+
+ MockInteractions.tap(items[1].$.checkbox);
+ assertDeepEquals([false, true, false, false],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ ['historyData_.1'],
+ Array.from(element.selectedPaths).sort());
+
+ // Shift-select to the last item.
+ shiftClick(items[3].$.checkbox);
+ assertDeepEquals([false, true, true, true],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ ['historyData_.1', 'historyData_.2', 'historyData_.3'],
+ Array.from(element.selectedPaths).sort());
+
+ // Shift-select back to the first item.
+ shiftClick(items[0].$.checkbox);
+ assertDeepEquals([true, true, true, true],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ [
+ 'historyData_.0', 'historyData_.1', 'historyData_.2',
+ 'historyData_.3'
+ ],
+ Array.from(element.selectedPaths).sort());
+
+ // Shift-deselect to the third item.
+ shiftClick(items[2].$.checkbox);
+ assertDeepEquals([false, false, false, true],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ ['historyData_.3'],
+ Array.from(element.selectedPaths).sort());
+
+ // Select the second item.
+ MockInteractions.tap(items[1].$.checkbox);
+ assertDeepEquals([false, true, false, true],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ ['historyData_.1', 'historyData_.3'],
+ Array.from(element.selectedPaths).sort());
+
+ // Shift-deselect to the last item.
+ shiftClick(items[3].$.checkbox);
+ assertDeepEquals([false, false, false, false],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ [],
+ Array.from(element.selectedPaths).sort());
+
+ // Shift-select back to the third item.
+ shiftClick(items[2].$.checkbox);
+ assertDeepEquals([false, false, true, true],
+ element.historyData_.map(i => i.selected));
+ assertDeepEquals(
+ ['historyData_.2', 'historyData_.3'],
+ Array.from(element.selectedPaths).sort());
+
+ // Remove selected items.
+ element.removeItemsByPath(Array.from(element.selectedPaths));
+ assertDeepEquals(
+ ['https://www.google.com', 'https://www.example.com'],
+ element.historyData_.map(i => i.title));
+ });
+ });
+
+ test('setting first and last items', function() {
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+
+ return PolymerTest.flushTasks().then(function() {
+ var items = polymerSelectAll(element, 'history-item');
+ assertTrue(items[0].isCardStart);
+ assertTrue(items[0].isCardEnd);
+ assertFalse(items[1].isCardEnd);
+ assertFalse(items[2].isCardStart);
+ assertTrue(items[2].isCardEnd);
+ assertTrue(items[3].isCardStart);
+ assertTrue(items[3].isCardEnd);
+ });
+ });
- // Shift-select to the last item.
- shiftClick(items[3].$.checkbox);
- assertDeepEquals([false, true, true, true],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- ['historyData_.1', 'historyData_.2', 'historyData_.3'],
- Array.from(element.selectedPaths).sort());
+ test('updating history results', function() {
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
- // Shift-select back to the first item.
- shiftClick(items[0].$.checkbox);
- assertDeepEquals([true, true, true, true],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- [
- 'historyData_.0', 'historyData_.1', 'historyData_.2',
- 'historyData_.3'
- ],
- Array.from(element.selectedPaths).sort());
-
- // Shift-deselect to the third item.
- shiftClick(items[2].$.checkbox);
- assertDeepEquals([false, false, false, true],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- ['historyData_.3'],
- Array.from(element.selectedPaths).sort());
+ return PolymerTest.flushTasks().then(function() {
+ var items = polymerSelectAll(element, 'history-item');
+ assertTrue(items[3].isCardStart);
+ assertTrue(items[5].isCardEnd);
- // Select the second item.
- MockInteractions.tap(items[1].$.checkbox);
- assertDeepEquals([false, true, false, true],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- ['historyData_.1', 'historyData_.3'],
- Array.from(element.selectedPaths).sort());
+ assertTrue(items[6].isCardStart);
+ assertTrue(items[6].isCardEnd);
- // Shift-deselect to the last item.
- shiftClick(items[3].$.checkbox);
- assertDeepEquals([false, false, false, false],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- [],
- Array.from(element.selectedPaths).sort());
+ assertTrue(items[7].isCardStart);
+ assertTrue(items[7].isCardEnd);
+ });
+ });
+
+ test('deleting multiple items from view', function() {
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+
+ element.removeItemsByPath([
+ 'historyData_.2', 'historyData_.5', 'historyData_.7'
+ ]);
+
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ items = polymerSelectAll(element, 'history-item');
+
+ assertEquals(element.historyData_.length, 5);
+ assertEquals(element.historyData_[0].dateRelativeDay, '2016-03-15');
+ assertEquals(element.historyData_[2].dateRelativeDay, '2016-03-13');
+ assertEquals(element.historyData_[4].dateRelativeDay, '2016-03-11');
+
+ // Checks that the first and last items have been reset correctly.
+ assertTrue(items[2].isCardStart);
+ assertTrue(items[3].isCardEnd);
+ assertTrue(items[4].isCardStart);
+ assertTrue(items[4].isCardEnd);
+ });
+ });
- // Shift-select back to the third item.
- shiftClick(items[2].$.checkbox);
- assertDeepEquals([false, false, true, true],
- element.historyData_.map(i => i.selected));
- assertDeepEquals(
- ['historyData_.2', 'historyData_.3'],
- Array.from(element.selectedPaths).sort());
+ test('search results display with correct item title', function() {
+ app.historyResult(createHistoryInfo(),
+ [createHistoryEntry('2016-03-15', 'https://www.google.com')]);
+ element.searchedTerm = 'Google';
- // Remove selected items.
- element.removeItemsByPath(Array.from(element.selectedPaths));
- assertDeepEquals(
- ['https://www.google.com', 'https://www.example.com'],
- element.historyData_.map(i => i.title));
- });
- });
+ return PolymerTest.flushTasks().then(function() {
+ var item = element.$$('history-item');
+ assertTrue(item.isCardStart);
+ var heading = item.$$('#date-accessed').textContent;
+ var title = item.$.title;
- test('setting first and last items', function() {
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
-
- return PolymerTest.flushTasks().then(function() {
- var items = polymerSelectAll(element, 'history-item');
- assertTrue(items[0].isCardStart);
- assertTrue(items[0].isCardEnd);
- assertFalse(items[1].isCardEnd);
- assertFalse(items[2].isCardStart);
- assertTrue(items[2].isCardEnd);
- assertTrue(items[3].isCardStart);
- assertTrue(items[3].isCardEnd);
- });
- });
+ // Check that the card title displays the search term somewhere.
+ var index = heading.indexOf('Google');
+ assertTrue(index != -1);
- test('updating history results', function() {
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
+ // Check that the search term is bolded correctly in the history-item.
+ assertGT(title.children[0].innerHTML.indexOf('<b>google</b>'), -1);
+ });
+ });
- return PolymerTest.flushTasks().then(function() {
- var items =
- polymerSelectAll(element, 'history-item');
- assertTrue(items[3].isCardStart);
- assertTrue(items[5].isCardEnd);
+ test('correct display message when no history available', function() {
+ app.historyResult(createHistoryInfo(), []);
- assertTrue(items[6].isCardStart);
- assertTrue(items[6].isCardEnd);
+ return PolymerTest.flushTasks().then(function() {
+ assertFalse(element.$['no-results'].hidden);
+ assertTrue(element.$['infinite-list'].hidden);
- assertTrue(items[7].isCardStart);
- assertTrue(items[7].isCardEnd);
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ assertTrue(element.$['no-results'].hidden);
+ assertFalse(element.$['infinite-list'].hidden);
+ });
+ });
+
+ test('more from this site sends and sets correct data', function(done) {
+ app.queryState_.queryingDisabled = false;
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ PolymerTest.flushTasks().then(function () {
+ registerMessageCallback('queryHistory', this, function (info) {
+ assertEquals('www.google.com', info[0]);
+ PolymerTest.flushTasks().then(function() {
+ assertEquals(
+ 'www.google.com',
+ toolbar.$['main-toolbar'].getSearchField().getValue());
+ done();
});
});
- test('deleting multiple items from view', function() {
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
- return PolymerTest.flushTasks().then(function() {
-
- element.removeItemsByPath([
- 'historyData_.2', 'historyData_.5', 'historyData_.7'
- ]);
-
+ items = polymerSelectAll(element, 'history-item');
+ MockInteractions.tap(items[0].$['menu-button']);
+ app.$.history.$.sharedMenu.get();
+ MockInteractions.tap(app.$.history.$$('#menuMoreButton'));
+ });
+ });
+
+ test('scrolling history list closes overflow menu', function() {
+ var lazyMenu = app.$.history.$.sharedMenu;
+ for (var i = 0; i < 10; i++)
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ items = polymerSelectAll(element, 'history-item');
+
+ MockInteractions.tap(items[2].$['menu-button']);
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ assertTrue(lazyMenu.getIfExists().menuOpen);
+ element.$['infinite-list'].scrollToIndex(20);
+ return waitForEvent(lazyMenu.getIfExists(), 'menu-open-changed');
+ }).then(function() {
+ assertFalse(lazyMenu.getIfExists().menuOpen);
+ });
+ });
+
+ // TODO(calamity): Reenable this test after fixing flakiness.
+ // See http://crbug.com/640862.
+ test.skip('scrolling history list causes toolbar shadow to appear',
+ () => {
+ for (var i = 0; i < 10; i++)
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ assertFalse(app.toolbarShadow_);
+ element.$['infinite-list'].scrollToIndex(20);
+ return waitForEvent(app, 'toolbar-shadow_-changed');
+ }).then(() => {
+ assertTrue(app.toolbarShadow_);
+ element.$['infinite-list'].scrollToIndex(0);
+ return waitForEvent(app, 'toolbar-shadow_-changed');
+ }).then(() => {
+ assertFalse(app.toolbarShadow_);
+ });
+ });
+
+ test('changing search deselects items', function() {
+ app.historyResult(
+ createHistoryInfo('ex'),
+ [createHistoryEntry('2016-06-9', 'https://www.example.com')]);
+ return PolymerTest.flushTasks().then(function() {
+ var item = element.$$('history-item');
+ MockInteractions.tap(item.$.checkbox);
+
+ assertEquals(1, toolbar.count);
+ app.queryState_.incremental = false;
+
+ app.historyResult(
+ createHistoryInfo('ample'),
+ [createHistoryEntry('2016-06-9', 'https://www.example.com')]);
+ assertEquals(0, toolbar.count);
+ });
+ });
+
+ test('delete items end to end', function(done) {
+ var listContainer = app.$.history;
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
+ app.historyResult(createHistoryInfo(), [
+ createHistoryEntry('2015-01-01', 'http://example.com'),
+ createHistoryEntry('2015-01-01', 'http://example.com'),
+ createHistoryEntry('2015-01-01', 'http://example.com')
+ ]);
+ PolymerTest.flushTasks().then(function() {
+ items = polymerSelectAll(element, 'history-item');
+
+ MockInteractions.tap(items[2].$.checkbox);
+ MockInteractions.tap(items[5].$.checkbox);
+ MockInteractions.tap(items[7].$.checkbox);
+ MockInteractions.tap(items[8].$.checkbox);
+ MockInteractions.tap(items[9].$.checkbox);
+ MockInteractions.tap(items[10].$.checkbox);
+
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ MockInteractions.tap(app.$.toolbar.$$('#delete-button'));
+
+ var dialog = listContainer.$.dialog.get();
+ registerMessageCallback('removeVisits', this, function() {
+ PolymerTest.flushTasks().then(function() {
+ deleteComplete();
return PolymerTest.flushTasks();
}).then(function() {
- items = polymerSelectAll(element, 'history-item');
-
assertEquals(element.historyData_.length, 5);
- assertEquals(element.historyData_[0].dateRelativeDay,
- '2016-03-15');
- assertEquals(element.historyData_[2].dateRelativeDay,
- '2016-03-13');
- assertEquals(element.historyData_[4].dateRelativeDay,
- '2016-03-11');
-
- // Checks that the first and last items have been reset correctly.
- assertTrue(items[2].isCardStart);
- assertTrue(items[3].isCardEnd);
- assertTrue(items[4].isCardStart);
- assertTrue(items[4].isCardEnd);
- });
- });
-
- test('search results display with correct item title', function() {
- app.historyResult(createHistoryInfo(),
- [createHistoryEntry('2016-03-15', 'https://www.google.com')]);
- element.searchedTerm = 'Google';
-
- return PolymerTest.flushTasks().then(function() {
- var item = element.$$('history-item');
- assertTrue(item.isCardStart);
- var heading = item.$$('#date-accessed').textContent;
- var title = item.$.title;
-
- // Check that the card title displays the search term somewhere.
- var index = heading.indexOf('Google');
- assertTrue(index != -1);
-
- // Check that the search term is bolded correctly in the history-item.
- assertGT(
- title.children[0].innerHTML.indexOf('<b>google</b>'),
- -1);
- });
- });
-
- test('correct display message when no history available', function() {
- app.historyResult(createHistoryInfo(), []);
-
- return PolymerTest.flushTasks().then(function() {
- assertFalse(element.$['no-results'].hidden);
- assertTrue(element.$['infinite-list'].hidden);
-
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks();
- }).then(function() {
- assertTrue(element.$['no-results'].hidden);
- assertFalse(element.$['infinite-list'].hidden);
- });
- });
-
- test('more from this site sends and sets correct data', function(done) {
- app.queryState_.queryingDisabled = false;
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- PolymerTest.flushTasks().then(function () {
- registerMessageCallback('queryHistory', this, function (info) {
- assertEquals('www.google.com', info[0]);
- PolymerTest.flushTasks().then(function() {
- assertEquals(
- 'www.google.com',
- toolbar.$['main-toolbar'].getSearchField().getValue());
- done();
- });
- });
-
- items = polymerSelectAll(element, 'history-item');
- MockInteractions.tap(items[0].$['menu-button']);
- app.$.history.$.sharedMenu.get();
- MockInteractions.tap(app.$.history.$$('#menuMoreButton'));
- });
- });
+ assertEquals(element.historyData_[0].dateRelativeDay, '2016-03-15');
+ assertEquals(element.historyData_[2].dateRelativeDay, '2016-03-13');
+ assertEquals(element.historyData_[4].dateRelativeDay, '2016-03-11');
+ assertFalse(dialog.open);
- test('scrolling history list closes overflow menu', function() {
- var lazyMenu = app.$.history.$.sharedMenu;
- for (var i = 0; i < 10; i++)
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
+ // Ensure the UI is correctly updated.
items = polymerSelectAll(element, 'history-item');
+ assertEquals('https://www.google.com', items[0].item.title);
+ assertEquals('https://www.example.com', items[1].item.title);
+ assertEquals('https://en.wikipedia.org', items[2].item.title);
+ assertEquals('https://en.wikipedia.org', items[3].item.title);
+ assertEquals('https://www.google.com', items[4].item.title);
- MockInteractions.tap(items[2].$['menu-button']);
- return PolymerTest.flushTasks();
- }).then(function() {
- assertTrue(lazyMenu.getIfExists().menuOpen);
- element.$['infinite-list'].scrollToIndex(20);
- return waitForEvent(lazyMenu.getIfExists(), 'menu-open-changed');
- }).then(function() {
- assertFalse(lazyMenu.getIfExists().menuOpen);
- });
- });
-
- // TODO(calamity): Reenable this test after fixing flakiness.
- // See http://crbug.com/640862.
- test.skip('scrolling history list causes toolbar shadow to appear',
- () => {
- for (var i = 0; i < 10; i++)
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- assertFalse(app.toolbarShadow_);
- element.$['infinite-list'].scrollToIndex(20);
- return waitForEvent(app, 'toolbar-shadow_-changed');
- }).then(() => {
- assertTrue(app.toolbarShadow_);
- element.$['infinite-list'].scrollToIndex(0);
- return waitForEvent(app, 'toolbar-shadow_-changed');
- }).then(() => {
- assertFalse(app.toolbarShadow_);
- });
- });
-
- test('changing search deselects items', function() {
- app.historyResult(
- createHistoryInfo('ex'),
- [createHistoryEntry('2016-06-9', 'https://www.example.com')]);
- return PolymerTest.flushTasks().then(function() {
- var item = element.$$('history-item');
- MockInteractions.tap(item.$.checkbox);
-
- assertEquals(1, toolbar.count);
- app.queryState_.incremental = false;
-
- app.historyResult(
- createHistoryInfo('ample'),
- [createHistoryEntry('2016-06-9', 'https://www.example.com')]);
- assertEquals(0, toolbar.count);
+ assertFalse(dialog.open);
+ done();
});
});
- test('delete items end to end', function(done) {
- var listContainer = app.$.history;
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
- app.historyResult(createHistoryInfo(), [
- createHistoryEntry('2015-01-01', 'http://example.com'),
- createHistoryEntry('2015-01-01', 'http://example.com'),
- createHistoryEntry('2015-01-01', 'http://example.com')
- ]);
- PolymerTest.flushTasks().then(function() {
- items = polymerSelectAll(element, 'history-item');
-
- MockInteractions.tap(items[2].$.checkbox);
- MockInteractions.tap(items[5].$.checkbox);
- MockInteractions.tap(items[7].$.checkbox);
- MockInteractions.tap(items[8].$.checkbox);
- MockInteractions.tap(items[9].$.checkbox);
- MockInteractions.tap(items[10].$.checkbox);
-
- return PolymerTest.flushTasks();
- }).then(function() {
- MockInteractions.tap(app.$.toolbar.$$('#delete-button'));
-
- var dialog = listContainer.$.dialog.get();
- registerMessageCallback('removeVisits', this, function() {
- PolymerTest.flushTasks().then(function() {
- deleteComplete();
- return PolymerTest.flushTasks();
- }).then(function() {
- assertEquals(element.historyData_.length, 5);
- assertEquals(element.historyData_[0].dateRelativeDay,
- '2016-03-15');
- assertEquals(element.historyData_[2].dateRelativeDay,
- '2016-03-13');
- assertEquals(element.historyData_[4].dateRelativeDay,
- '2016-03-11');
- assertFalse(dialog.open);
-
- // Ensure the UI is correctly updated.
- items = polymerSelectAll(element, 'history-item');
- assertEquals('https://www.google.com', items[0].item.title);
- assertEquals('https://www.example.com', items[1].item.title);
- assertEquals('https://en.wikipedia.org', items[2].item.title);
- assertEquals('https://en.wikipedia.org', items[3].item.title);
- assertEquals('https://www.google.com', items[4].item.title);
-
- assertFalse(dialog.open);
- done();
- });
- });
-
- // Confirmation dialog should appear.
- assertTrue(dialog.open);
- MockInteractions.tap(listContainer.$$('.action-button'));
- });
- });
+ // Confirmation dialog should appear.
+ assertTrue(dialog.open);
+ MockInteractions.tap(listContainer.$$('.action-button'));
+ });
+ });
- test('delete via menu button', function(done) {
- var listContainer = app.$.history;
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ test('delete via menu button', function(done) {
+ var listContainer = app.$.history;
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ PolymerTest.flushTasks().then(function() {
+ items = polymerSelectAll(element, 'history-item');
+ registerMessageCallback('removeVisits', this, function() {
PolymerTest.flushTasks().then(function() {
- items = polymerSelectAll(element, 'history-item');
- registerMessageCallback('removeVisits', this, function() {
- PolymerTest.flushTasks().then(function() {
- deleteComplete();
- return PolymerTest.flushTasks();
- }).then(function() {
- assertDeepEquals([
- 'https://www.google.com',
- 'https://www.google.com',
- 'https://en.wikipedia.org',
- ], element.historyData_.map(item => item.title));
-
- // Deletion should deselect all.
- assertDeepEquals(
- [false, false, false],
- items.slice(0, 3).map(i => i.selected));
-
- done();
- });
- });
-
- MockInteractions.tap(items[1].$.checkbox);
- MockInteractions.tap(items[3].$.checkbox);
- MockInteractions.tap(items[1].$['menu-button']);
- app.$.history.$.sharedMenu.get();
- MockInteractions.tap(app.$.history.$$('#menuRemoveButton'));
- });
- });
-
- test('deleting items using shortcuts', function(done) {
- var listContainer = app.$.history;
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- var dialog = listContainer.$.dialog.get();
- return PolymerTest.flushTasks().then(function() {
- items = polymerSelectAll(element, 'history-item');
-
- // Dialog should not appear when there is no item selected.
- MockInteractions.pressAndReleaseKeyOn(
- document.body, 46, '', 'Delete');
+ deleteComplete();
return PolymerTest.flushTasks();
}).then(function() {
- assertFalse(dialog.open);
-
- MockInteractions.tap(items[1].$.checkbox);
- MockInteractions.tap(items[2].$.checkbox);
-
- assertEquals(2, toolbar.count);
+ assertDeepEquals([
+ 'https://www.google.com',
+ 'https://www.google.com',
+ 'https://en.wikipedia.org',
+ ], element.historyData_.map(item => item.title));
- MockInteractions.pressAndReleaseKeyOn(
- document.body, 46, '', 'Delete');
- return PolymerTest.flushTasks();
- }).then(function() {
- assertTrue(dialog.open);
- MockInteractions.tap(listContainer.$$('.cancel-button'));
- assertFalse(dialog.open);
-
- MockInteractions.pressAndReleaseKeyOn(
- document.body, 8, '', 'Backspace');
- return PolymerTest.flushTasks();
- }).then(function() {
- assertTrue(dialog.open);
-
- registerMessageCallback('removeVisits', this, function(toRemove) {
- assertEquals('https://www.example.com', toRemove[0].url);
- assertEquals('https://www.google.com', toRemove[1].url);
- assertEquals('2016-03-14 10:00 UTC', toRemove[0].timestamps[0]);
- assertEquals('2016-03-14 9:00 UTC', toRemove[1].timestamps[0]);
- done();
- });
-
- MockInteractions.tap(listContainer.$$('.action-button'));
- });
- });
-
- test('delete dialog closed on url change', function() {
- app.queryState_.queryingDisabled = false;
- var listContainer = app.$.history;
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- items = Polymer.dom(element.root).querySelectorAll('history-item');
-
- MockInteractions.tap(items[2].$.checkbox);
- return PolymerTest.flushTasks();
- }).then(function() {
- MockInteractions.tap(app.$.toolbar.$$('#delete-button'));
- return PolymerTest.flushTasks();
- }).then(function() {
- // Confirmation dialog should appear.
- assertTrue(listContainer.$.dialog.getIfExists().open);
+ // Deletion should deselect all.
+ assertDeepEquals(
+ [false, false, false],
+ items.slice(0, 3).map(i => i.selected));
- app.set('queryState_.searchTerm', 'something else');
- assertFalse(listContainer.$.dialog.getIfExists().open);
+ done();
});
});
- test('clicking file:// url sends message to chrome', function(done) {
- var fileURL = 'file:///home/myfile';
- app.historyResult(createHistoryInfo(), [
- createHistoryEntry('2016-03-15', fileURL),
- ]);
- PolymerTest.flushTasks().then(function() {
- var items =
- Polymer.dom(element.root).querySelectorAll('history-item');
-
- registerMessageCallback('navigateToUrl', this, function(info) {
- assertEquals(fileURL, info[0]);
- done();
- });
-
- MockInteractions.tap(items[0].$.title);
- });
+ MockInteractions.tap(items[1].$.checkbox);
+ MockInteractions.tap(items[3].$.checkbox);
+ MockInteractions.tap(items[1].$['menu-button']);
+ app.$.history.$.sharedMenu.get();
+ MockInteractions.tap(app.$.history.$$('#menuRemoveButton'));
+ });
+ });
+
+ test('deleting items using shortcuts', function(done) {
+ var listContainer = app.$.history;
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ var dialog = listContainer.$.dialog.get();
+ return PolymerTest.flushTasks().then(function() {
+ items = polymerSelectAll(element, 'history-item');
+
+ // Dialog should not appear when there is no item selected.
+ MockInteractions.pressAndReleaseKeyOn(document.body, 46, '', 'Delete');
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ assertFalse(dialog.open);
+
+ MockInteractions.tap(items[1].$.checkbox);
+ MockInteractions.tap(items[2].$.checkbox);
+
+ assertEquals(2, toolbar.count);
+
+ MockInteractions.pressAndReleaseKeyOn(document.body, 46, '', 'Delete');
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ assertTrue(dialog.open);
+ MockInteractions.tap(listContainer.$$('.cancel-button'));
+ assertFalse(dialog.open);
+
+ MockInteractions.pressAndReleaseKeyOn(document.body, 8, '', 'Backspace');
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ assertTrue(dialog.open);
+
+ registerMessageCallback('removeVisits', this, function(toRemove) {
+ assertEquals('https://www.example.com', toRemove[0].url);
+ assertEquals('https://www.google.com', toRemove[1].url);
+ assertEquals('2016-03-14 10:00 UTC', toRemove[0].timestamps[0]);
+ assertEquals('2016-03-14 9:00 UTC', toRemove[1].timestamps[0]);
+ done();
});
- test('focus and keyboard nav', function(done) {
- app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
- PolymerTest.flushTasks().then(function() {
- var items = polymerSelectAll(element, 'history-item');
-
- var focused = items[2].$.checkbox;
- focused.focus();
-
- // Wait for next render to ensure that focus handlers have been
- // registered (see HistoryItemElement.attached).
- Polymer.RenderStatus.afterNextRender(this, function() {
- MockInteractions.pressAndReleaseKeyOn(
- focused, 39, [], 'ArrowRight');
- focused = items[2].$.title;
- assertEquals(focused, element.lastFocused_);
- assertTrue(items[2].row_.isActive());
- assertFalse(items[3].row_.isActive());
-
- MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
- focused = items[3].$.title;
- assertEquals(focused, element.lastFocused_);
- assertFalse(items[2].row_.isActive());
- assertTrue(items[3].row_.isActive());
-
- MockInteractions.pressAndReleaseKeyOn(
- focused, 39, [], 'ArrowRight');
- focused = items[3].$['menu-button'];
- assertEquals(focused, element.lastFocused_);
- assertFalse(items[2].row_.isActive());
- assertTrue(items[3].row_.isActive());
-
- MockInteractions.pressAndReleaseKeyOn(focused, 38, [], 'ArrowUp');
- focused = items[2].$['menu-button'];
- assertEquals(focused, element.lastFocused_);
- assertTrue(items[2].row_.isActive());
- assertFalse(items[3].row_.isActive());
-
- MockInteractions.pressAndReleaseKeyOn(focused, 37, [], 'ArrowLeft');
- focused = items[2].$$('#bookmark-star');
- assertEquals(focused, element.lastFocused_);
- assertTrue(items[2].row_.isActive());
- assertFalse(items[3].row_.isActive());
-
- MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
- focused = items[3].$.title;
- assertEquals(focused, element.lastFocused_);
- assertFalse(items[2].row_.isActive());
- assertTrue(items[3].row_.isActive());
-
- done();
- });
- });
+ MockInteractions.tap(listContainer.$$('.action-button'));
+ });
+ });
+
+ test('delete dialog closed on url change', function() {
+ app.queryState_.queryingDisabled = false;
+ var listContainer = app.$.history;
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ app.historyResult(createHistoryInfo(), ADDITIONAL_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ items = Polymer.dom(element.root).querySelectorAll('history-item');
+
+ MockInteractions.tap(items[2].$.checkbox);
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ MockInteractions.tap(app.$.toolbar.$$('#delete-button'));
+ return PolymerTest.flushTasks();
+ }).then(function() {
+ // Confirmation dialog should appear.
+ assertTrue(listContainer.$.dialog.getIfExists().open);
+
+ app.set('queryState_.searchTerm', 'something else');
+ assertFalse(listContainer.$.dialog.getIfExists().open);
+ });
+ });
+
+ test('clicking file:// url sends message to chrome', function(done) {
+ var fileURL = 'file:///home/myfile';
+ app.historyResult(createHistoryInfo(), [
+ createHistoryEntry('2016-03-15', fileURL),
+ ]);
+ PolymerTest.flushTasks().then(function() {
+ var items = Polymer.dom(element.root).querySelectorAll('history-item');
+
+ registerMessageCallback('navigateToUrl', this, function(info) {
+ assertEquals(fileURL, info[0]);
+ done();
});
- teardown(function() {
- registerMessageCallback('removeVisits', this, undefined);
- registerMessageCallback('queryHistory', this, function() {});
- registerMessageCallback('navigateToUrl', this, undefined);
- app.set('queryState_.searchTerm', '');
+ MockInteractions.tap(items[0].$.title);
+ });
+ });
+
+ test('focus and keyboard nav', function(done) {
+ app.historyResult(createHistoryInfo(), TEST_HISTORY_RESULTS);
+ PolymerTest.flushTasks().then(function() {
+ var items = polymerSelectAll(element, 'history-item');
+
+ var focused = items[2].$.checkbox;
+ focused.focus();
+
+ // Wait for next render to ensure that focus handlers have been
+ // registered (see HistoryItemElement.attached).
+ Polymer.RenderStatus.afterNextRender(this, function() {
+ MockInteractions.pressAndReleaseKeyOn(
+ focused, 39, [], 'ArrowRight');
+ focused = items[2].$.title;
+ assertEquals(focused, element.lastFocused_);
+ assertTrue(items[2].row_.isActive());
+ assertFalse(items[3].row_.isActive());
+
+ MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
+ focused = items[3].$.title;
+ assertEquals(focused, element.lastFocused_);
+ assertFalse(items[2].row_.isActive());
+ assertTrue(items[3].row_.isActive());
+
+ MockInteractions.pressAndReleaseKeyOn(
+ focused, 39, [], 'ArrowRight');
+ focused = items[3].$['menu-button'];
+ assertEquals(focused, element.lastFocused_);
+ assertFalse(items[2].row_.isActive());
+ assertTrue(items[3].row_.isActive());
+
+ MockInteractions.pressAndReleaseKeyOn(focused, 38, [], 'ArrowUp');
+ focused = items[2].$['menu-button'];
+ assertEquals(focused, element.lastFocused_);
+ assertTrue(items[2].row_.isActive());
+ assertFalse(items[3].row_.isActive());
+
+ MockInteractions.pressAndReleaseKeyOn(focused, 37, [], 'ArrowLeft');
+ focused = items[2].$$('#bookmark-star');
+ assertEquals(focused, element.lastFocused_);
+ assertTrue(items[2].row_.isActive());
+ assertFalse(items[3].row_.isActive());
+
+ MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
+ focused = items[3].$.title;
+ assertEquals(focused, element.lastFocused_);
+ assertFalse(items[2].row_.isActive());
+ assertTrue(items[3].row_.isActive());
+
+ done();
});
});
- }
-
- return {
- registerTests: registerTests
- };
+ });
+
+ teardown(function() {
+ registerMessageCallback('removeVisits', this, undefined);
+ registerMessageCallback('queryHistory', this, function() {});
+ registerMessageCallback('navigateToUrl', this, undefined);
+ app.set('queryState_.searchTerm', '');
+ });
});
« no previous file with comments | « chrome/test/data/webui/md_history/history_item_test.js ('k') | chrome/test/data/webui/md_history/history_metrics_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698