| Index: chrome/test/data/webui/md_history/history_synced_tabs_test.js
|
| diff --git a/chrome/test/data/webui/md_history/history_synced_tabs_test.js b/chrome/test/data/webui/md_history/history_synced_tabs_test.js
|
| index 8336ae087ad6f7924f3a33850e5047f8de9daaea..b4080a4ce50c0fb941f59488075041d67384098f 100644
|
| --- a/chrome/test/data/webui/md_history/history_synced_tabs_test.js
|
| +++ b/chrome/test/data/webui/md_history/history_synced_tabs_test.js
|
| @@ -225,95 +225,6 @@ suite('<history-synced-device-manager>', function() {
|
| });
|
| });
|
|
|
| - // Fails on Mac, http://crbug.com/640862
|
| - test.skip('focus and keyboard nav', function() {
|
| - var sessionList = [
|
| - createSession('Nexus 5', [createWindow([
|
| - 'http://www.example.com', 'http://www.google.com'
|
| - ])]),
|
| - createSession('Pixel C', [createWindow(['http://www.badssl.com'])]),
|
| - createSession('Potato', [createWindow(['http://www.wikipedia.org'])]),
|
| - ];
|
| -
|
| - setForeignSessions(sessionList);
|
| -
|
| - var lastFocused;
|
| - var cards;
|
| - var focused;
|
| - var onFocusHandler = element.focusGrid_.onFocus;
|
| - element.focusGrid_.onFocus = function(row, e) {
|
| - onFocusHandler.call(element.focusGrid_, row, e);
|
| - lastFocused = e.currentTarget;
|
| - };
|
| -
|
| - return PolymerTest.flushTasks().then(function() {
|
| - cards = polymerSelectAll(element, 'history-synced-device-card');
|
| -
|
| - focused = cards[0].$['menu-button'];
|
| - focused.focus();
|
| -
|
| - // Go to the collapse button.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 39, [], 'ArrowRight');
|
| - focused = cards[0].$['collapse-button'];
|
| - assertEquals(focused, lastFocused);
|
| -
|
| - // Go to the first url.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
|
| - focused = polymerSelectAll(cards[0], '.website-title')[0];
|
| - assertEquals(focused, lastFocused);
|
| -
|
| - // Collapse the first card.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 38, [], 'ArrowUp');
|
| - focused = cards[0].$['collapse-button'];
|
| - assertEquals(focused, lastFocused);
|
| - MockInteractions.tap(focused);
|
| - }).then(function() {
|
| - // Pressing down goes to the next card.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
|
| - focused = cards[1].$['collapse-button'];
|
| - assertEquals(focused, lastFocused);
|
| -
|
| - // Expand the first card.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 38, [], 'ArrowUp');
|
| - focused = cards[0].$['collapse-button'];
|
| - assertEquals(focused, lastFocused);
|
| - MockInteractions.tap(focused);
|
| - }).then(function() {
|
| - // First card's urls are focusable again.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
|
| - focused = polymerSelectAll(cards[0], '.website-title')[0];
|
| - assertEquals(focused, lastFocused);
|
| -
|
| - // Remove the second URL from the first card.
|
| - sessionList[0].windows[0].tabs.splice(1, 1);
|
| - setForeignSessions(sessionList.slice());
|
| - return PolymerTest.flushTasks();
|
| - }).then(function() {
|
| - cards = polymerSelectAll(element, 'history-synced-device-card');
|
| -
|
| - // Go to the next card's menu buttons.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
|
| - focused = cards[1].$['collapse-button'];
|
| - assertEquals(focused, lastFocused);
|
| -
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 38, [], 'ArrowUp');
|
| - focused = polymerSelectAll(cards[0], '.website-title')[0];
|
| - assertEquals(focused, lastFocused);
|
| -
|
| - // Remove the second card.
|
| - sessionList.splice(1, 1);
|
| - setForeignSessions(sessionList.slice());
|
| - return PolymerTest.flushTasks();
|
| - }).then(function() {
|
| - cards = polymerSelectAll(element, 'history-synced-device-card');
|
| -
|
| - // Pressing down goes to the next card.
|
| - MockInteractions.pressAndReleaseKeyOn(focused, 40, [], 'ArrowDown');
|
| - focused = cards[1].$['collapse-button'];
|
| - assertEquals(focused, lastFocused);
|
| - });
|
| - });
|
| -
|
| test('click synced tab', function(done) {
|
| setForeignSessions(
|
| [createSession(
|
|
|