Chromium Code Reviews| Index: chrome/test/data/webui/md_history/history_card_manager_test.js |
| diff --git a/chrome/test/data/webui/md_history/history_card_manager_test.js b/chrome/test/data/webui/md_history/history_card_manager_test.js |
| index 007c7252e01b5f568981b4da17552b1276a78524..75685da4ee92e53fc713fbe639e665f1f0278a59 100644 |
| --- a/chrome/test/data/webui/md_history/history_card_manager_test.js |
| +++ b/chrome/test/data/webui/md_history/history_card_manager_test.js |
| @@ -7,19 +7,23 @@ cr.define('md_history.history_card_manager_test', function() { |
| var TEST_HISTORY_RESULTS = [ |
| { |
| "dateRelativeDay": "Today - Wednesday, December 9, 2015", |
| - "url": "https://www.google.com" |
| + "url": "https://www.google.com", |
| + "allTimestamps": "1", |
| }, |
| { |
| "dateRelativeDay": "Yesterday - Tuesday, December 8, 2015", |
| - "url": "https://en.wikipedia.com" |
| + "url": "https://en.wikipedia.com", |
| + "allTimestamps": "2" |
| }, |
| { |
| "dateRelativeDay": "Monday, December 7, 2015", |
| - "url": "https://www.example.com" |
| + "url": "https://www.example.com", |
| + "allTimestamps": "3" |
| }, |
| { |
| "dateRelativeDay": "Monday, December 7, 2015", |
| - "url": "https://www.google.com" |
| + "url": "https://www.google.com", |
| + "allTimestamps": "4" |
|
calamity
2016/01/21 00:11:09
Just as a note: history_browsertest.js has a creat
hsampson
2016/01/21 05:34:47
Acknowledged.
|
| } |
| ]; |
| @@ -77,6 +81,9 @@ cr.define('md_history.history_card_manager_test', function() { |
| var items = Polymer.dom(cards[2].root) |
| .querySelectorAll('history-item'); |
| + items[0].selected = false; |
| + items[1].selected = false; |
| + |
|
calamity
2016/01/21 00:11:09
Why are these necessary?
hsampson
2016/01/21 05:34:47
These were an attempt to reset the state of all th
|
| MockInteractions.tap(items[0].$['checkbox']); |
| MockInteractions.tap(items[1].$['checkbox']); |
| @@ -126,6 +133,71 @@ cr.define('md_history.history_card_manager_test', function() { |
| element.historyDataByDay_[4].historyItems[0].url); |
| }); |
| + test('removeVisits for multiple items', function(done) { |
| + element.addNewResults(TEST_HISTORY_RESULTS); |
| + |
| + // Ensure that the correct identifying data is being used for removal. |
| + registerMessageCallback('removeVisits', this, function (toBeRemoved) { |
| + assertEquals(toBeRemoved[0].url, |
| + element.historyDataByDay_[2].historyItems[0].url); |
| + assertEquals(toBeRemoved[1].url, |
| + element.historyDataByDay_[2].historyItems[1].url); |
| + assertEquals(toBeRemoved[0].timestamps, |
| + element.historyDataByDay_[2].historyItems[0] |
| + .allTimestamps); |
| + assertEquals(toBeRemoved[1].timestamps, |
| + element.historyDataByDay_[2].historyItems[1] |
| + .allTimestamps); |
| + done(); |
| + }); |
| + |
| + var toolbar = $('toolbar'); |
| + |
| + flush(function() { |
| + var cards = Polymer.dom(element.root) |
| + .querySelectorAll('history-card'); |
| + var items = Polymer.dom(cards[2].root) |
| + .querySelectorAll('history-item'); |
| + |
| + items[0].selected = false; |
| + items[1].selected = false; |
| + |
| + MockInteractions.tap(items[0].$['checkbox']); |
| + MockInteractions.tap(items[1].$['checkbox']); |
| + |
| + toolbar.deleteSelection(); |
| + }); |
| + }); |
| + |
| + test('deleting multiple items from view', function(done) { |
| + var toolbar = $('toolbar'); |
| + element.addNewResults(TEST_HISTORY_RESULTS); |
| + |
| + flush(function() { |
| + var cards = Polymer.dom(element.root) |
| + .querySelectorAll('history-card'); |
| + var items = Polymer.dom(cards[2].root) |
| + .querySelectorAll('history-item'); |
| + |
| + items[0].selected = false; |
| + items[1].selected = false; |
| + |
| + MockInteractions.tap(items[0].$['checkbox']); |
| + MockInteractions.tap(items[1].$['checkbox']); |
| + |
| + element.removeDeletedHistory(2); |
| + |
| + flush(function() { |
| + assertEquals(element.historyDataByDay_.length, 2); |
| + assertEquals(element.historyDataByDay_[0].date, |
| + "Today - Wednesday, December 9, 2015"); |
| + assertEquals(element.historyDataByDay_[1].date, |
| + "Yesterday - Tuesday, December 8, 2015"); |
| + done(); |
| + }); |
| + }); |
| + }); |
| + |
| teardown(function() { |
| element.historyDataByDay_ = []; |
| }); |
| @@ -134,4 +206,4 @@ cr.define('md_history.history_card_manager_test', function() { |
| return { |
| registerTests: registerTests |
| }; |
| -}); |
| +}); |