aboutsummaryrefslogtreecommitdiff
path: root/e2e
diff options
context:
space:
mode:
Diffstat (limited to 'e2e')
-rw-r--r--e2e/ambassador/src/background/index.js7
-rw-r--r--e2e/ambassador/src/background/tabs.js4
-rw-r--r--e2e/ambassador/src/client/tabs.js20
-rw-r--r--e2e/ambassador/src/shared/messages.js4
-rw-r--r--e2e/contents/follow.test.js121
-rw-r--r--e2e/contents/navigate.test.js156
-rw-r--r--e2e/contents/scroll.test.js5
-rw-r--r--e2e/contents/tab.test.js104
-rw-r--r--e2e/contents/zoom.test.js7
-rw-r--r--e2e/web-server/index.js92
-rw-r--r--e2e/web-server/url.js5
11 files changed, 477 insertions, 48 deletions
diff --git a/e2e/ambassador/src/background/index.js b/e2e/ambassador/src/background/index.js
index db2deb3..046b8c1 100644
--- a/e2e/ambassador/src/background/index.js
+++ b/e2e/ambassador/src/background/index.js
@@ -1,6 +1,7 @@
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_UPDATE,
+ TABS_GET_ZOOM, TABS_SET_ZOOM,
EVENT_KEYPRESS, EVENT_KEYDOWN, EVENT_KEYUP,
SCROLL_GET, SCROLL_SET,
} from '../shared/messages';
@@ -25,6 +26,10 @@ receiveContentMessage((message) => {
windowId: message.windowId,
index: message.index,
});
+ case TABS_GET:
+ return browser.tabs.get(message.tabId);
+ case TABS_UPDATE:
+ return browser.tabs.update(message.tabId, message.properties);
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..5594134 100644
--- a/e2e/ambassador/src/background/tabs.js
+++ b/e2e/ambassador/src/background/tabs.js
@@ -5,7 +5,9 @@ const create = (props = {}) => {
if (tab.url !== 'about:blank' && tabId === createdTab.id &&
changeInfo.status === 'complete') {
browser.tabs.onUpdated.removeListener(callback);
- resolve(tab);
+
+ // wait for 50 milliseconds to ensure plugin loaded;
+ setTimeout(() => resolve(tab), 50);
}
};
browser.tabs.onUpdated.addListener(callback);
diff --git a/e2e/ambassador/src/client/tabs.js b/e2e/ambassador/src/client/tabs.js
index c7b1340..290428c 100644
--- a/e2e/ambassador/src/client/tabs.js
+++ b/e2e/ambassador/src/client/tabs.js
@@ -1,5 +1,6 @@
import {
- TABS_CREATE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM,
+ TABS_CREATE, TABS_SELECT_AT, TABS_GET, TABS_UPDATE,
+ TABS_GET_ZOOM, TABS_SET_ZOOM,
} from '../shared/messages';
import * as ipc from './ipc';
@@ -19,6 +20,21 @@ const selectAt = (windowId, index) => {
});
};
+const get = (tabId) => {
+ return ipc.send({
+ type: TABS_GET,
+ tabId,
+ });
+};
+
+const update = (tabId, properties) => {
+ return ipc.send({
+ type: TABS_UPDATE,
+ tabId,
+ properties,
+ });
+};
+
const getZoom = (tabId) => {
return ipc.send({
tabId,
@@ -34,4 +50,4 @@ const setZoom = (tabId, factor) => {
});
};
-export { create, selectAt, getZoom, setZoom };
+export { create, selectAt, get, update, getZoom, setZoom };
diff --git a/e2e/ambassador/src/shared/messages.js b/e2e/ambassador/src/shared/messages.js
index 1fc47d2..d148ca0 100644
--- a/e2e/ambassador/src/shared/messages.js
+++ b/e2e/ambassador/src/shared/messages.js
@@ -5,6 +5,8 @@ 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_UPDATE = 'tabs.update';
const TABS_GET_ZOOM = 'tabs.get.zoom';
const TABS_SET_ZOOM = 'tabs.set.zoom';
const EVENT_KEYPRESS = 'event.keypress';
@@ -21,6 +23,8 @@ export {
WINDOWS_REMOVE,
WINDOWS_GET,
+ TABS_GET,
+ TABS_UPDATE,
TABS_CREATE,
TABS_SELECT_AT,
TABS_GET_ZOOM,
diff --git a/e2e/contents/follow.test.js b/e2e/contents/follow.test.js
new file mode 100644
index 0000000..f852dc0
--- /dev/null
+++ b/e2e/contents/follow.test.js
@@ -0,0 +1,121 @@
+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 { CLIENT_URL } from '../web-server/url';
+
+describe("tab test", () => {
+ let targetWindow;
+
+ beforeEach(() => {
+ return windows.create(CLIENT_URL).then((win) => {
+ targetWindow = win;
+ });
+ });
+
+ afterEach(() => {
+ return windows.remove(targetWindow.id);
+ });
+
+ it('follows link by `f`', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/follow').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'f');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return keys.press(targetTab.id, 'a');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/follow#a');
+ });
+ });
+
+ it('follows link into new tab by `F`', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/follow').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'F', { shiftKey: true });
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return keys.press(targetTab.id, 'a');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 500) });
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ let urls = win.tabs.map(t => t.url);
+ expect(urls).to.have.lengthOf(3);
+ expect(urls).to.include(CLIENT_URL + '/');
+ expect(urls).to.include(CLIENT_URL + '/follow');
+ expect(urls).to.include(CLIENT_URL + '/follow#a');
+ });
+ });
+
+ it('follows link with target=_blank into new tab by `f`', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/follow').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'f');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return keys.press(targetTab.id, 'b');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 500) });
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ let urls = win.tabs.map(t => t.url);
+ expect(urls).to.have.lengthOf(3);
+ expect(urls).to.include(CLIENT_URL + '/');
+ expect(urls).to.include(CLIENT_URL + '/follow');
+ expect(urls).to.include(CLIENT_URL + '/follow#external');
+ });
+ });
+
+ it('follows link with target=_blank into new tab by `F`', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/follow').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'F', { shiftKey: true });
+ }).then(() => {
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return keys.press(targetTab.id, 'b');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 500) });
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ let urls = win.tabs.map(t => t.url);
+ expect(urls).to.have.lengthOf(3);
+ expect(urls).to.include(CLIENT_URL + '/');
+ expect(urls).to.include(CLIENT_URL + '/follow');
+ expect(urls).to.include(CLIENT_URL + '/follow#external');
+ });
+ });
+
+ it('follows area by `F`', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/follow').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'f');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return keys.press(targetTab.id, 'c');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/follow#area');
+ });
+ });
+});
diff --git a/e2e/contents/navigate.test.js b/e2e/contents/navigate.test.js
new file mode 100644
index 0000000..b3f5f32
--- /dev/null
+++ b/e2e/contents/navigate.test.js
@@ -0,0 +1,156 @@
+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";
+import { CLIENT_URL } from '../web-server/url';
+
+describe("navigate test", () => {
+ let targetWindow;
+
+ before(() => {
+ return windows.create().then((win) => {
+ targetWindow = win;
+ return tabs.create(targetWindow.id, CLIENT_URL);
+ });
+ });
+
+ after(() => {
+ return windows.remove(targetWindow.id);
+ });
+
+ it('goes to parent', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/a/b/c').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'g');
+ }).then(() => {
+ return keys.press(targetTab.id, 'u');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/a/b/');
+ });
+ });
+
+ it('removes hash', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_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(CLIENT_URL + '/a/b/c#');
+ });
+ });
+
+ it('goes to root', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_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 new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/');
+ });
+ });
+
+ it('goes back and forward in history', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/#navigate').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, 'g');
+ }).then(() => {
+ return keys.press(targetTab.id, 'u');
+ }).then(() => {
+ return keys.press(targetTab.id, 'H', { shiftKey: true });
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url, 'go back in history').to.be.equal(CLIENT_URL + '/#navigate');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return keys.press(targetTab.id, 'L', { shiftKey: true });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url, 'go next in history').to.be.equal(CLIENT_URL + '/#');
+ });
+ });
+
+ it('goes previous page by <a>', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/a-pagenation?page=10').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, '[');
+ }).then(() => {
+ return keys.press(targetTab.id, '[');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/a-pagenation?page=9');
+ });
+ })
+
+ it('goes next page by <a>', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/a-pagenation?page=10').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, ']');
+ }).then(() => {
+ return keys.press(targetTab.id, ']');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/a-pagenation?page=11');
+ });
+ })
+
+ it('goes previous page by <link>', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/link-pagenation?page=10').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, '[');
+ }).then(() => {
+ return keys.press(targetTab.id, '[');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/link-pagenation?page=9');
+ });
+ })
+
+ it('goes next page by <link>', () => {
+ let targetTab;
+ return tabs.create(targetWindow.id, CLIENT_URL + '/link-pagenation?page=10').then((tab) => {
+ targetTab = tab;
+ return keys.press(targetTab.id, ']');
+ }).then(() => {
+ return keys.press(targetTab.id, ']');
+ }).then(() => {
+ return new Promise(resolve => { setTimeout(() => resolve(), 10) });
+ }).then(() => {
+ return tabs.get(targetTab.id);
+ }).then((tab) => {
+ expect(tab.url).to.be.equal(CLIENT_URL + '/link-pagenation?page=11');
+ });
+ })
+});
diff --git a/e2e/contents/scroll.test.js b/e2e/contents/scroll.test.js
index 0a896b3..9410343 100644
--- a/e2e/contents/scroll.test.js
+++ b/e2e/contents/scroll.test.js
@@ -2,8 +2,7 @@ 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 = "localhost:11111";
+import { CLIENT_URL } from '../web-server/url';
describe("scroll test", () => {
let targetWindow;
@@ -12,7 +11,7 @@ describe("scroll test", () => {
before(() => {
return windows.create().then((win) => {
targetWindow = win;
- return tabs.create(targetWindow.id, SERVER_URL);
+ return tabs.create(targetWindow.id, CLIENT_URL + '/scroll');
}).then((tab) => {
targetTab = tab;
});
diff --git a/e2e/contents/tab.test.js b/e2e/contents/tab.test.js
index 880deb8..72479b9 100644
--- a/e2e/contents/tab.test.js
+++ b/e2e/contents/tab.test.js
@@ -1,14 +1,13 @@
import * as windows from "../ambassador/src/client/windows";
import * as tabs from "../ambassador/src/client/tabs";
import * as keys from "../ambassador/src/client/keys";
-
-const SERVER_URL = "localhost:11111/";
+import { CLIENT_URL } from '../web-server/url';
describe("tab test", () => {
let targetWindow;
beforeEach(() => {
- return windows.create(SERVER_URL).then((win) => {
+ return windows.create(CLIENT_URL).then((win) => {
targetWindow = win;
});
});
@@ -20,7 +19,7 @@ describe("tab test", () => {
it('deletes tab by d', () => {
let before;
let targetTab;
- return tabs.create(targetWindow.id, SERVER_URL).then((tab) => {
+ return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => {
targetTab = tab;
return windows.get(targetWindow.id);
}).then((win) => {
@@ -36,7 +35,7 @@ describe("tab test", () => {
it('duplicates tab by zd', () => {
let before;
let targetTab;
- return tabs.create(targetWindow.id, SERVER_URL).then((tab) => {
+ return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => {
targetTab = tab;
return windows.get(targetWindow.id)
}).then((win) => {;
@@ -54,7 +53,7 @@ describe("tab test", () => {
it('makes pinned by zp', () => {
let before;
let targetTab;
- return tabs.create(targetWindow.id, SERVER_URL).then((tab) => {
+ return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => {
targetTab = tab;
return windows.get(targetWindow.id)
}).then((win) => {;
@@ -71,11 +70,11 @@ describe("tab test", () => {
it('selects previous tab by K', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 2);
}).then((tab) => {
@@ -89,11 +88,11 @@ describe("tab test", () => {
it('selects previous tab by K rotatory', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 0);
}).then((tab) => {
@@ -107,11 +106,11 @@ describe("tab test", () => {
it('selects next tab by J', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 2);
}).then((tab) => {
@@ -125,11 +124,11 @@ describe("tab test", () => {
it('selects previous tab by J rotatory', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 3);
}).then((tab) => {
@@ -143,11 +142,11 @@ describe("tab test", () => {
it('selects first tab by g0', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 2);
}).then((tab) => {
@@ -163,11 +162,11 @@ describe("tab test", () => {
it('selects last tab by g$', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 2);
}).then((tab) => {
@@ -183,11 +182,11 @@ describe("tab test", () => {
it('selects last selected tab by <C-6>', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#2')
+ return tabs.create(targetWindow.id, CLIENT_URL + '#2')
}).then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#3');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => {
return tabs.selectAt(targetWindow.id, 1);
}).then(() => {
@@ -203,13 +202,62 @@ describe("tab test", () => {
it('deletes tab by d', () => {
return Promise.resolve().then(() => {
- return tabs.create(targetWindow.id, SERVER_URL + '#1');
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1');
+ }).then((tab) => {
+ return keys.press(tab.id, 'd');
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ expect(win.tabs).to.have.lengthOf(1);
+ });
+ });
+
+ it('reopen tab by u', () => {
+ return Promise.resolve().then(() => {
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1');
}).then((tab) => {
return keys.press(tab.id, 'd');
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs).to.have.lengthOf(1);
+ return keys.press(win.tabs[0].id, 'u');
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ expect(win.tabs).to.have.lengthOf(2);
+ });
+ });
+
+ it('does not delete pinned tab by d', () => {
+ return Promise.resolve().then(() => {
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1');
+ }).then((tab) => {
+ return tabs.update(tab.id, { pinned: true });
+ }).then((tab) => {
+ return keys.press(tab.id, 'd');
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ expect(win.tabs).to.have.lengthOf(2);
+ });
+ });
+
+ it('deletes pinned tab by !d', () => {
+ let target;
+ return Promise.resolve().then(() => {
+ return tabs.create(targetWindow.id, CLIENT_URL + '#1');
+ }).then((tab) => {
+ return tabs.update(tab.id, { pinned: true });
+ }).then((tab) => {
+ target = tab;
+ return keys.press(target.id, '!');
+ }).then(() => {
+ return keys.press(target.id, 'd');
+ }).then(() => {
+ return windows.get(targetWindow.id);
+ }).then((win) => {
+ expect(win.tabs).to.have.lengthOf(1);
});
});
});
diff --git a/e2e/contents/zoom.test.js b/e2e/contents/zoom.test.js
index 10b7cca..c7efc93 100644
--- a/e2e/contents/zoom.test.js
+++ b/e2e/contents/zoom.test.js
@@ -1,15 +1,14 @@
import * as windows from "../ambassador/src/client/windows";
import * as tabs from "../ambassador/src/client/tabs";
import * as keys from "../ambassador/src/client/keys";
-
-const SERVER_URL = "localhost:11111/";
+import { CLIENT_URL } from '../web-server/url';
describe("zoom test", () => {
let targetWindow;
let targetTab;
before(() => {
- return windows.create(SERVER_URL).then((win) => {
+ return windows.create(CLIENT_URL).then((win) => {
targetWindow = win;
});
});
@@ -19,7 +18,7 @@ describe("zoom test", () => {
});
beforeEach(() => {
- return tabs.create(targetWindow.id, SERVER_URL).then((tab) => {
+ return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => {
targetTab = tab;
});
});
diff --git a/e2e/web-server/index.js b/e2e/web-server/index.js
index 81e11c1..bf60078 100644
--- a/e2e/web-server/index.js
+++ b/e2e/web-server/index.js
@@ -1,14 +1,88 @@
+'use strict';
+
+var serverUrl = require('./url');
var http = require('http');
+var url = require('url');
-const content =
-'<!DOCTYPE html>' +
-'<html lang="en">' +
- '<body style="width:10000px; height:10000px">' +
- '</body>' +
-'</html">' ;
+const handleScroll = (req, res) => {
+ res.writeHead(200, {'Content-Type': 'text/html'});
+ res.end('<!DOCTYPEhtml><html lang="en"><body style="width:10000px; height:10000px"></body></html">');
+};
+const handleAPagenation = (req, res) => {
+ let u = url.parse(req.url);
+ let params = new url.URLSearchParams(u.search);
+ let page = params.get('page') === null ? null : Number(params.get('page'));
+ if (page === null || isNaN(page)) {
+ return handle404(req, res);
+ }
+
+ let body = '';
+ let nextLink = u.pathname + '?page=' + (page + 1);
+ let prevLink = u.pathname + '?page=' + (page - 1);
+
+ if (page > 1) {
+ body += '<a href="' + prevLink + '">prev</a> | ';
+ }
+ body += '<a href="' + nextLink + '">next</a>';
+
+ res.writeHead(200, {'Content-Type': 'text/html'});
+ res.end('<!DOCTYPEhtml><html lang="en"><body">' + body + '</body></html">');
+};
+
+const handleLinkPagenation = (req, res) => {
+ let u = url.parse(req.url);
+ let params = new url.URLSearchParams(u.search);
+ let page = params.get('page') === null ? null : Number(params.get('page'));
+ if (page === null || isNaN(page)) {
+ return handle404(req, res);
+ }
+
+ let head = '';
+ let nextLink = u.pathname + '?page=' + (page + 1);
+ let prevLink = u.pathname + '?page=' + (page - 1);
+
+ if (page > 1) {
+ head += '<link rel="prev" href="' + prevLink + '"></link>';
+ }
+ head += '<link rel="next" href="' + nextLink + '"></link>';
-http.createServer(function (req, res) {
res.writeHead(200, {'Content-Type': 'text/html'});
- res.end(content);
-}).listen(11111, '127.0.0.1');
+ res.end('<!DOCTYPEhtml><html lang="en"><head>' + head + '</head><body"></body></html">');
+};
+
+const handleFollow = (req, res) => {
+ let body = '';
+ body += '<a href="#a">a</a>';
+ body += '<a href="#external" target="_blank">external</a>';
+ body += '<img width="320" height="240" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=" usemap="#map"><map name="map"><area href="#area" shape="rect" coords="15,19,126,104"></map>'
+
+ res.writeHead(200, {'Content-Type': 'text/html'});
+ res.end('<!DOCTYPEhtml><html lang="en"><body">' + body + '</body></html">');
+}
+
+const handle404 = (req, res) => {
+ res.writeHead(404, {'Content-Type': 'text/plain'});
+ res.end('not found')
+};
+
+http.createServer(function (req, res) {
+ if (req.method !== 'GET') {
+ handle404(req, res);
+ }
+
+ let u = url.parse(req.url);
+ if (u.pathname === '/scroll') {
+ handleScroll(req, res);
+ } else if (u.pathname === '/a-pagenation') {
+ handleAPagenation(req, res);
+ } else if (u.pathname === '/link-pagenation') {
+ handleLinkPagenation(req, res);
+ } else if (u.pathname === '/follow') {
+ handleFollow(req, res);
+ } else {
+ handle404(req, res);
+ }
+
+ console.log(`"${req.method} ${req.url}"`, res.statusCode)
+}).listen(serverUrl.PORT, serverUrl.HOST);
diff --git a/e2e/web-server/url.js b/e2e/web-server/url.js
new file mode 100644
index 0000000..37f3d84
--- /dev/null
+++ b/e2e/web-server/url.js
@@ -0,0 +1,5 @@
+module.exports = {
+ PORT: 11111,
+ HOST: '127.0.0.1',
+ CLIENT_URL: 'http://127.0.0.1:11111',
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 20:54:53 +0000