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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/webui/md_history/history_item_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 | « no previous file | chrome/test/data/webui/md_history/history_list_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_item_test.js
diff --git a/chrome/test/data/webui/md_history/history_item_test.js b/chrome/test/data/webui/md_history/history_item_test.js
index bbad622e8bf90d53578fab636035929a86ce5e1f..1347f25c8d49ae5b6f25f8b9bbd099f0e426a328 100644
--- a/chrome/test/data/webui/md_history/history_item_test.js
+++ b/chrome/test/data/webui/md_history/history_item_test.js
@@ -2,141 +2,131 @@
// 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_item_test', function() {
- function registerTests() {
- var TEST_HISTORY_RESULTS = [
- createHistoryEntry('2016-03-16 10:00', 'http://www.google.com'),
- createHistoryEntry('2016-03-16 9:00', 'http://www.example.com'),
- createHistoryEntry('2016-03-16 7:01', 'http://www.badssl.com'),
- createHistoryEntry('2016-03-16 7:00', 'http://www.website.com'),
- createHistoryEntry('2016-03-16 4:00', 'http://www.website.com'),
- createHistoryEntry('2016-03-15 11:00', 'http://www.example.com'),
- ];
-
- var SEARCH_HISTORY_RESULTS = [
- createSearchEntry('2016-03-16', "http://www.google.com"),
- createSearchEntry('2016-03-14 11:00', "http://calendar.google.com"),
- createSearchEntry('2016-03-14 10:00', "http://mail.google.com")
- ];
-
- suite('<history-item> unit test', function() {
- var item;
-
- setup(function() {
- item = document.createElement('history-item');
- item.item = TEST_HISTORY_RESULTS[0];
- replaceBody(item);
- });
-
- test('click targets for selection', function() {
- var selectionCount = 0;
- item.addEventListener('history-checkbox-select', function() {
- selectionCount++;
- });
-
- // Checkbox should trigger selection.
- MockInteractions.tap(item.$.checkbox);
- assertEquals(1, selectionCount);
-
- // Non-interactive text should trigger selection.
- MockInteractions.tap(item.$['time-accessed']);
- assertEquals(2, selectionCount);
-
- // Menu button should not trigger selection.
- MockInteractions.tap(item.$['menu-button']);
- assertEquals(2, selectionCount);
- });
-
- test('refocus checkbox on click', function() {
- return PolymerTest.flushTasks().then(function() {
- item.$['menu-button'].focus();
- assertEquals(item.$['menu-button'], item.root.activeElement);
-
- MockInteractions.tap(item.$['time-accessed']);
- assertEquals(item.$['checkbox'], item.root.activeElement);
- });
- });
+var TEST_HISTORY_RESULTS = [
+ createHistoryEntry('2016-03-16 10:00', 'http://www.google.com'),
+ createHistoryEntry('2016-03-16 9:00', 'http://www.example.com'),
+ createHistoryEntry('2016-03-16 7:01', 'http://www.badssl.com'),
+ createHistoryEntry('2016-03-16 7:00', 'http://www.website.com'),
+ createHistoryEntry('2016-03-16 4:00', 'http://www.website.com'),
+ createHistoryEntry('2016-03-15 11:00', 'http://www.example.com'),
+];
+
+var SEARCH_HISTORY_RESULTS = [
+ createSearchEntry('2016-03-16', "http://www.google.com"),
+ createSearchEntry('2016-03-14 11:00', "http://calendar.google.com"),
+ createSearchEntry('2016-03-14 10:00', "http://mail.google.com")
+];
+
+suite('<history-item> unit test', function() {
+ var item;
+
+ setup(function() {
+ item = document.createElement('history-item');
+ item.item = TEST_HISTORY_RESULTS[0];
+ replaceBody(item);
+ });
+
+ test('click targets for selection', function() {
+ var selectionCount = 0;
+ item.addEventListener('history-checkbox-select', function() {
+ selectionCount++;
});
- suite('<history-item> integration test', function() {
- var element;
-
- setup(function() {
- element = replaceApp().$['history'].$['infinite-list'];
- });
-
- test('basic separator insertion', function() {
- element.addNewResults(TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- // Check that the correct number of time gaps are inserted.
- var items =
- Polymer.dom(element.root).querySelectorAll('history-item');
-
- assertTrue(items[0].hasTimeGap);
- assertTrue(items[1].hasTimeGap);
- assertFalse(items[2].hasTimeGap);
- assertTrue(items[3].hasTimeGap);
- assertFalse(items[4].hasTimeGap);
- assertFalse(items[5].hasTimeGap);
- });
- });
-
- test('separator insertion for search', function() {
- element.addNewResults(SEARCH_HISTORY_RESULTS);
- element.searchedTerm = 'search';
-
- return PolymerTest.flushTasks().then(function() {
- var items =
- Polymer.dom(element.root).querySelectorAll('history-item');
-
- assertTrue(items[0].hasTimeGap);
- assertFalse(items[1].hasTimeGap);
- assertFalse(items[2].hasTimeGap);
- });
- });
-
- test('separator insertion after deletion', function() {
- element.addNewResults(TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- var items =
- Polymer.dom(element.root).querySelectorAll('history-item');
-
- element.removeItemsByPath(['historyData_.3']);
- assertEquals(5, element.historyData_.length);
-
- // Checks that a new time gap separator has been inserted.
- assertTrue(items[2].hasTimeGap);
-
- element.removeItemsByPath(['historyData_.3']);
-
- // Checks time gap separator is removed.
- assertFalse(items[2].hasTimeGap);
- });
- });
-
- test('remove bookmarks', function() {
- element.addNewResults(TEST_HISTORY_RESULTS);
- return PolymerTest.flushTasks().then(function() {
- element.set('historyData_.1.starred', true);
- element.set('historyData_.5.starred', true);
- return PolymerTest.flushTasks();
- }).then(function() {
-
- items = Polymer.dom(element.root).querySelectorAll('history-item');
-
- items[1].$$('#bookmark-star').focus();
- MockInteractions.tap(items[1].$$('#bookmark-star'));
-
- // Check that focus is shifted to overflow menu icon.
- assertEquals(items[1].root.activeElement, items[1].$['menu-button']);
- // Check that all items matching this url are unstarred.
- assertEquals(element.historyData_[1].starred, false);
- assertEquals(element.historyData_[5].starred, false);
- });
- });
+ // Checkbox should trigger selection.
+ MockInteractions.tap(item.$.checkbox);
+ assertEquals(1, selectionCount);
+
+ // Non-interactive text should trigger selection.
+ MockInteractions.tap(item.$['time-accessed']);
+ assertEquals(2, selectionCount);
+
+ // Menu button should not trigger selection.
+ MockInteractions.tap(item.$['menu-button']);
+ assertEquals(2, selectionCount);
+ });
+
+ test('refocus checkbox on click', function() {
+ return PolymerTest.flushTasks().then(function() {
+ item.$['menu-button'].focus();
+ assertEquals(item.$['menu-button'], item.root.activeElement);
+
+ MockInteractions.tap(item.$['time-accessed']);
+ assertEquals(item.$['checkbox'], item.root.activeElement);
+ });
+ });
+});
+
+suite('<history-item> integration test', function() {
+ var element;
+
+ setup(function() {
+ element = replaceApp().$['history'].$['infinite-list'];
+ });
+
+ test('basic separator insertion', function() {
+ element.addNewResults(TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ // Check that the correct number of time gaps are inserted.
+ var items = Polymer.dom(element.root).querySelectorAll('history-item');
+
+ assertTrue(items[0].hasTimeGap);
+ assertTrue(items[1].hasTimeGap);
+ assertFalse(items[2].hasTimeGap);
+ assertTrue(items[3].hasTimeGap);
+ assertFalse(items[4].hasTimeGap);
+ assertFalse(items[5].hasTimeGap);
+ });
+ });
+
+ test('separator insertion for search', function() {
+ element.addNewResults(SEARCH_HISTORY_RESULTS);
+ element.searchedTerm = 'search';
+
+ return PolymerTest.flushTasks().then(function() {
+ var items = Polymer.dom(element.root).querySelectorAll('history-item');
+
+ assertTrue(items[0].hasTimeGap);
+ assertFalse(items[1].hasTimeGap);
+ assertFalse(items[2].hasTimeGap);
+ });
+ });
+
+ test('separator insertion after deletion', function() {
+ element.addNewResults(TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ var items = Polymer.dom(element.root).querySelectorAll('history-item');
+
+ element.removeItemsByPath(['historyData_.3']);
+ assertEquals(5, element.historyData_.length);
+
+ // Checks that a new time gap separator has been inserted.
+ assertTrue(items[2].hasTimeGap);
+
+ element.removeItemsByPath(['historyData_.3']);
+
+ // Checks time gap separator is removed.
+ assertFalse(items[2].hasTimeGap);
+ });
+ });
+
+ test('remove bookmarks', function() {
+ element.addNewResults(TEST_HISTORY_RESULTS);
+ return PolymerTest.flushTasks().then(function() {
+ element.set('historyData_.1.starred', true);
+ element.set('historyData_.5.starred', true);
+ return PolymerTest.flushTasks();
+ }).then(function() {
+
+ items = Polymer.dom(element.root).querySelectorAll('history-item');
+
+ items[1].$$('#bookmark-star').focus();
+ MockInteractions.tap(items[1].$$('#bookmark-star'));
+
+ // Check that focus is shifted to overflow menu icon.
+ assertEquals(items[1].root.activeElement, items[1].$['menu-button']);
+ // Check that all items matching this url are unstarred.
+ assertEquals(element.historyData_[1].starred, false);
+ assertEquals(element.historyData_[5].starred, false);
});
- }
- return {
- registerTests: registerTests
- };
+ });
});
« no previous file with comments | « no previous file | chrome/test/data/webui/md_history/history_list_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698