diff options
| -rw-r--r-- | QA.md | 2 | ||||
| -rw-r--r-- | e2e/ambassador/src/background/index.js | 4 | ||||
| -rw-r--r-- | e2e/ambassador/src/background/tabs.js | 2 | ||||
| -rw-r--r-- | e2e/ambassador/src/client/tabs.js | 11 | ||||
| -rw-r--r-- | e2e/ambassador/src/shared/messages.js | 2 | ||||
| -rw-r--r-- | e2e/contents/navigate.test.js | 63 |
6 files changed, 78 insertions, 6 deletions
@@ -31,8 +31,6 @@ The behaviors of the console are tested in [Console section](#consoles). - [ ] <kbd>H</kbd>, <kbd>L</kbd>: go back and forward in history - [ ] <kbd>[</kbd><kbd>[</kbd>, <kbd>]</kbd><kbd>]</kbd>: Open next/prev link in `<link>` tags. - [ ] <kbd>[</kbd><kbd>[</kbd>, <kbd>]</kbd><kbd>]</kbd>: find prev and next links and open it -- [ ] <kbd>g</kbd><kbd>u</kbd>: go to parent directory -- [ ] <kbd>g</kbd><kbd>U</kbd>: go to root directory #### Misc diff --git a/e2e/ambassador/src/background/index.js b/e2e/ambassador/src/background/index.js index db2deb3..c40b4d8 100644 --- a/e2e/ambassador/src/background/index.js +++ b/e2e/ambassador/src/background/index.js @@ -1,6 +1,6 @@ import { WINDOWS_CREATE, WINDOWS_REMOVE, WINDOWS_GET, - TABS_CREATE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM, + TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_GET_ZOOM, TABS_SET_ZOOM, EVENT_KEYPRESS, EVENT_KEYDOWN, EVENT_KEYUP, SCROLL_GET, SCROLL_SET, } from '../shared/messages'; @@ -25,6 +25,8 @@ receiveContentMessage((message) => { windowId: message.windowId, index: message.index, }); + case TABS_GET: + return browser.tabs.get(message.tabId); case TABS_GET_ZOOM: return browser.tabs.getZoom(message.tabId); case TABS_SET_ZOOM: diff --git a/e2e/ambassador/src/background/tabs.js b/e2e/ambassador/src/background/tabs.js index d049500..37156c4 100644 --- a/e2e/ambassador/src/background/tabs.js +++ b/e2e/ambassador/src/background/tabs.js @@ -5,7 +5,7 @@ const create = (props = {}) => { if (tab.url !== 'about:blank' && tabId === createdTab.id && changeInfo.status === 'complete') { browser.tabs.onUpdated.removeListener(callback); - resolve(tab); + setTimeout(() => resolve(tab), 50) // wait for 50 milliseconds to ensure plugin loaded; } }; browser.tabs.onUpdated.addListener(callback); diff --git a/e2e/ambassador/src/client/tabs.js b/e2e/ambassador/src/client/tabs.js index c7b1340..14d524d 100644 --- a/e2e/ambassador/src/client/tabs.js +++ b/e2e/ambassador/src/client/tabs.js @@ -1,5 +1,5 @@ import { - TABS_CREATE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM, + TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_GET_ZOOM, TABS_SET_ZOOM, } from '../shared/messages'; import * as ipc from './ipc'; @@ -19,6 +19,13 @@ const selectAt = (windowId, index) => { }); }; +const get = (tabId) => { + return ipc.send({ + type: TABS_GET, + tabId, + }); +}; + const getZoom = (tabId) => { return ipc.send({ tabId, @@ -34,4 +41,4 @@ const setZoom = (tabId, factor) => { }); }; -export { create, selectAt, getZoom, setZoom }; +export { create, selectAt, get, getZoom, setZoom }; diff --git a/e2e/ambassador/src/shared/messages.js b/e2e/ambassador/src/shared/messages.js index 1fc47d2..34ec5d3 100644 --- a/e2e/ambassador/src/shared/messages.js +++ b/e2e/ambassador/src/shared/messages.js @@ -5,6 +5,7 @@ const WINDOWS_REMOVE = 'windows.remove'; const WINDOWS_GET = 'windows.get'; const TABS_CREATE = 'tabs.create'; const TABS_SELECT_AT = 'tabs.selectAt'; +const TABS_GET = 'tabs.get'; const TABS_GET_ZOOM = 'tabs.get.zoom'; const TABS_SET_ZOOM = 'tabs.set.zoom'; const EVENT_KEYPRESS = 'event.keypress'; @@ -21,6 +22,7 @@ export { WINDOWS_REMOVE, WINDOWS_GET, + TABS_GET, TABS_CREATE, TABS_SELECT_AT, TABS_GET_ZOOM, diff --git a/e2e/contents/navigate.test.js b/e2e/contents/navigate.test.js new file mode 100644 index 0000000..518c3e3 --- /dev/null +++ b/e2e/contents/navigate.test.js @@ -0,0 +1,63 @@ +import * as windows from "../ambassador/src/client/windows"; +import * as tabs from "../ambassador/src/client/tabs"; +import * as keys from "../ambassador/src/client/keys"; +import * as scrolls from "../ambassador/src/client/scrolls"; + +const SERVER_URL = "http://localhost:11111"; + +describe("navigate test", () => { + let targetWindow; + + before(() => { + return windows.create().then((win) => { + targetWindow = win; + return tabs.create(targetWindow.id, SERVER_URL); + }); + }); + + after(() => { + return windows.remove(targetWindow.id); + }); + + it('goes to parent', () => { + let targetTab; + return tabs.create(targetWindow.id, SERVER_URL + '/a/b/c').then((tab) => { + targetTab = tab; + return keys.press(targetTab.id, 'g'); + }).then(() => { + return keys.press(targetTab.id, 'u'); + }).then(() => { + return tabs.get(targetTab.id); + }).then((tab) => { + expect(tab.url).to.be.equal(SERVER_URL + '/a/b/'); + }); + }); + + it('removes hash', () => { + let targetTab; + return tabs.create(targetWindow.id, SERVER_URL + '/a/b/c#navigate').then((tab) => { + targetTab = tab; + return keys.press(targetTab.id, 'g'); + }).then(() => { + return keys.press(targetTab.id, 'u'); + }).then(() => { + return tabs.get(targetTab.id); + }).then((tab) => { + expect(tab.url).to.be.equal(SERVER_URL + '/a/b/c#'); + }); + }); + + it('goes to root', () => { + let targetTab; + return tabs.create(targetWindow.id, SERVER_URL + '/a/b/c').then((tab) => { + targetTab = tab; + return keys.press(targetTab.id, 'g'); + }).then(() => { + return keys.press(targetTab.id, 'U', { shiftKey: true }); + }).then(() => { + return tabs.get(targetTab.id); + }).then((tab) => { + expect(tab.url).to.be.equal(SERVER_URL + '/'); + }); + }); +}); |