From 4d36a203c09d2e04bf4304ba4a5b63f66b3e2adf Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 21 Sep 2019 15:32:30 +0900 Subject: Use latest lanthan --- e2e/blacklist.test.js | 37 ++++++------- e2e/clipboard.test.js | 48 ++++++++-------- e2e/command_addbookmark.test.js | 37 ++++++------- e2e/command_bdelete.test.js | 102 ++++++++++++++++------------------ e2e/command_buffer.test.js | 120 +++++++++++++++++++--------------------- e2e/command_open.test.js | 67 +++++++++++----------- e2e/command_quit.test.js | 66 +++++++++++----------- e2e/command_tabopen.test.js | 67 +++++++++++----------- e2e/command_winopen.test.js | 68 +++++++++++------------ e2e/completion.test.js | 51 ++++++++--------- e2e/completion_buffers.test.js | 67 +++++++++++----------- e2e/completion_open.test.js | 77 +++++++++++++------------- e2e/completion_set.test.js | 36 ++++++------ e2e/console.test.js | 73 ++++++++++++------------ e2e/follow.test.js | 108 +++++++++++++++++++----------------- e2e/follow_properties.test.js | 80 +++++++++++++-------------- e2e/lib/Console.js | 12 ++-- e2e/mark.test.js | 71 ++++++++++++------------ e2e/navigate.test.js | 102 +++++++++++++++++----------------- e2e/options.test.js | 50 ++++++++--------- e2e/options_form.test.js | 67 +++++++++++----------- e2e/repeat.test.js | 43 +++++++------- e2e/scroll.test.js | 97 ++++++++++++++++---------------- e2e/tab.test.js | 72 ++++++++++++------------ e2e/zoom.test.js | 28 +++++----- 25 files changed, 814 insertions(+), 832 deletions(-) (limited to 'e2e') diff --git a/e2e/blacklist.test.js b/e2e/blacklist.test.js index fa8e8db..8a8996e 100644 --- a/e2e/blacklist.test.js +++ b/e2e/blacklist.test.js @@ -1,8 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const settings = require('./settings'); +const { Builder } = require('lanthan'); +const { By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -19,26 +20,24 @@ describe("navigate test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } http.close(); }); @@ -56,21 +55,21 @@ describe("navigate test", () => { }, }); - await session.navigateTo(`http://127.0.0.1:${port}/a`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/a`); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('j'); // not works - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 0); - await session.navigateTo(`http://127.0.0.1:${port}/ab`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/ab`); + body = await webdriver.findElement(By.css('body')); await body.sendKeys('j'); // works - pageYOffset = await session.executeScript(() => window.pageYOffset); + pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 64); }); }); diff --git a/e2e/clipboard.test.js b/e2e/clipboard.test.js index 82e45fc..df31770 100644 --- a/e2e/clipboard.test.js +++ b/e2e/clipboard.test.js @@ -1,12 +1,11 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const clipboard = require('./lib/clipboard'); const settings = require('./settings'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -20,18 +19,19 @@ describe("navigate test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); await browser.storage.local.set({ settings, @@ -39,8 +39,8 @@ describe("navigate test", () => { }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } http.close(); }); @@ -53,8 +53,8 @@ describe("navigate test", () => { }) it('should copy current URL by y', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/#should_copy_url`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/#should_copy_url`); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('y'); await eventually(async() => { @@ -64,8 +64,8 @@ describe("navigate test", () => { }); it('should open an URL from clipboard by p', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); await clipboard.write(`http://127.0.0.1:${port}/#open_from_clipboard`); await body.sendKeys('p'); @@ -77,11 +77,11 @@ describe("navigate test", () => { }); it('should open an URL from clipboard to new tab by P', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); await clipboard.write(`http://127.0.0.1:${port}/#open_to_new_tab`); - await body.sendKeys(Key.Shift, 'p'); + await body.sendKeys(Key.SHIFT, 'p'); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -93,8 +93,8 @@ describe("navigate test", () => { }); it('should open search result with keywords in clipboard by p', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); await clipboard.write(`an apple`); await body.sendKeys('p'); @@ -106,11 +106,11 @@ describe("navigate test", () => { }); it('should open search result with keywords in clipboard to new tabby P', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); await clipboard.write(`an apple`); - await body.sendKeys(Key.Shift, 'p'); + await body.sendKeys(Key.SHIFT, 'p'); await eventually(async() => { let tabs = await browser.tabs.query({}); diff --git a/e2e/command_addbookmark.test.js b/e2e/command_addbookmark.test.js index e8995bc..68d1c6d 100644 --- a/e2e/command_addbookmark.test.js +++ b/e2e/command_addbookmark.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -22,41 +21,39 @@ const newApp = () => { describe('addbookmark command test', () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}/happy`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/happy`); }); it('should add a bookmark from the current page', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('addbookmark how to be happy', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('addbookmark how to be happy', Key.ENTER); await eventually(async() => { var bookmarks = await browser.bookmarks.search({ title: 'how to be happy' }); diff --git a/e2e/command_bdelete.test.js b/e2e/command_bdelete.test.js index 1f416db..aae5b67 100644 --- a/e2e/command_bdelete.test.js +++ b/e2e/command_bdelete.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -23,27 +22,24 @@ const newApp = () => { describe('bdelete/bdeletes command test', () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); @@ -59,22 +55,22 @@ describe('bdelete/bdeletes command test', () => { await browser.tabs.create({ url: `http://127.0.0.1:${port}/site5` }) await eventually(async() => { - let handles = await session.getWindowHandles(); + let handles = await webdriver.getAllWindowHandles(); assert.equal(handles.length, 5); - await session.switchToWindow(handles[2]); - await session.findElementByCSS('iframe'); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); }); await new Promise((resolve) => setTimeout(resolve, 100)); }); it('should delete an unpinned tab by bdelete command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdelete site5', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete site5', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -88,12 +84,12 @@ describe('bdelete/bdeletes command test', () => { }); it('should not delete an pinned tab by bdelete command by bdelete command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdelete site1', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete site1', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -102,42 +98,42 @@ describe('bdelete/bdeletes command test', () => { }); it('should show an error when no tabs are matched by bdelete command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdelete xyz', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete xyz', Key.ENTER); await eventually(async() => { - let p = await session.findElementByCSS('.vimvixen-console-error'); + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); let text = await p.getText(); assert.equal(text, 'No matching buffer for xyz'); }); }); it('should show an error when more than one tabs are matched by bdelete command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdelete site', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete site', Key.ENTER); await eventually(async() => { - let p = await session.findElementByCSS('.vimvixen-console-error'); + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); let text = await p.getText(); assert.equal(text, 'More than one match for site'); }); }); it('should delete an unpinned tab by bdelete! command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdelete! site5', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete! site5', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -151,12 +147,12 @@ describe('bdelete/bdeletes command test', () => { }); it('should delete an pinned tab by bdelete! command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdelete! site1', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete! site1', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -170,12 +166,12 @@ describe('bdelete/bdeletes command test', () => { }); it('should delete unpinned tabs by bdeletes command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdeletes site', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdeletes site', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -188,12 +184,12 @@ describe('bdelete/bdeletes command test', () => { }); it('should delete both pinned and unpinned tabs by bdeletes! command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('bdeletes! site', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdeletes! site', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); diff --git a/e2e/command_buffer.test.js b/e2e/command_buffer.test.js index bf94428..b3336dc 100644 --- a/e2e/command_buffer.test.js +++ b/e2e/command_buffer.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -23,27 +22,24 @@ const newApp = () => { describe('buffer command test', () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); @@ -58,22 +54,22 @@ describe('buffer command test', () => { } await eventually(async() => { - let handles = await session.getWindowHandles(); + let handles = await webdriver.getAllWindowHandles(); assert.equal(handles.length, 5); - await session.switchToWindow(handles[2]); - await session.findElementByCSS('iframe'); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); }); await new Promise((resolve) => setTimeout(resolve, 100)); }); it('should do nothing by buffer command with no parameters', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -82,12 +78,12 @@ describe('buffer command test', () => { }); it('should select a tab by buffer command with a number', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -96,41 +92,41 @@ describe('buffer command test', () => { }); it('should should an out of range error by buffer commands', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer 0', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer 0', Key.ENTER); await eventually(async() => { - let p = await session.findElementByCSS('.vimvixen-console-error'); + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); let text = await p.getText(); assert.equal(text, 'tab 0 does not exist'); }); - await session.switchToParentFrame(); - body = await session.findElementByCSS('body'); + await webdriver.switchTo().parentFrame(); + body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - input = await session.findElementByCSS('input'); - await input.sendKeys('buffer 9', Key.Enter); + await webdriver.switchTo().frame(0); + input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer 9', Key.ENTER); await eventually(async() => { - let p = await session.findElementByCSS('.vimvixen-console-error'); + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); let text = await p.getText(); assert.equal(text, 'tab 9 does not exist'); }); }); it('should select a tab by buffer command with a title', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer my_site1', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer my_site1', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -139,12 +135,12 @@ describe('buffer command test', () => { }); it('should select a tab by buffer command with an URL', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer /site1', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer /site1', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -153,15 +149,15 @@ describe('buffer command test', () => { }); it('should select tabs rotately', async() => { - let handles = await session.getWindowHandles(); - await session.switchToWindow(handles[4]); + let handles = await webdriver.getAllWindowHandles(); + await webdriver.switchTo().window(handles[4]); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer site', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer site', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -170,12 +166,12 @@ describe('buffer command test', () => { }); it('should do nothing by ":buffer %"', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer %', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer %', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -184,15 +180,15 @@ describe('buffer command test', () => { }); it('should selects last selected tab by ":buffer #"', async() => { - let handles = await session.getWindowHandles(); - await session.switchToWindow(handles[1]); + let handles = await webdriver.getAllWindowHandles(); + await webdriver.switchTo().window(handles[1]); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('buffer #', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer #', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); diff --git a/e2e/command_open.test.js b/e2e/command_open.test.js index 0d41f96..ccf7393 100644 --- a/e2e/command_open.test.js +++ b/e2e/command_open.test.js @@ -1,11 +1,10 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { @@ -30,20 +29,18 @@ const newApp = () => { describe("open command test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); http = newApp().listen(port); await browser.storage.local.set({ @@ -53,22 +50,22 @@ describe("open command test", () => { after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }) it('should open default search for keywords by open command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('open an apple', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open an apple', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }); @@ -80,9 +77,9 @@ describe("open command test", () => { it('should open certain search page for keywords by open command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('open yahoo an apple', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open yahoo an apple', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }) @@ -94,9 +91,9 @@ describe("open command test", () => { it('should open default engine with empty keywords by open command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('open', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }) @@ -108,9 +105,9 @@ describe("open command test", () => { it('should open certain search page for empty keywords by open command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('open yahoo', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open yahoo', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }) @@ -122,9 +119,9 @@ describe("open command test", () => { it('should open a site with domain by open command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('open i-beam.org', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open i-beam.org', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }) @@ -136,9 +133,9 @@ describe("open command test", () => { it('should open a site with URL by open command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('open https://i-beam.org', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open https://i-beam.org', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({ active: true }) diff --git a/e2e/command_quit.test.js b/e2e/command_quit.test.js index ee4c2d8..07e770a 100644 --- a/e2e/command_quit.test.js +++ b/e2e/command_quit.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -23,27 +22,24 @@ const newApp = () => { describe('quit/quitall command test', () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); @@ -58,22 +54,22 @@ describe('quit/quitall command test', () => { } await eventually(async() => { - let handles = await session.getWindowHandles(); + let handles = await webdriver.getAllWindowHandles(); assert.equal(handles.length, 5); - await session.switchToWindow(handles[2]); - await session.findElementByCSS('iframe'); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); }); await new Promise((resolve) => setTimeout(resolve, 100)); }); it('should current tab by q command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('q', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('q', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -82,12 +78,12 @@ describe('quit/quitall command test', () => { }); it('should current tab by quit command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('quit', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('quit', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -96,12 +92,12 @@ describe('quit/quitall command test', () => { }); it('should current tab by qa command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('qa', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('qa', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -110,12 +106,12 @@ describe('quit/quitall command test', () => { }); it('should current tab by quitall command', async() => { - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - await input.sendKeys('quitall', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('quitall', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); diff --git a/e2e/command_tabopen.test.js b/e2e/command_tabopen.test.js index 9c5cf3a..78f5d7f 100644 --- a/e2e/command_tabopen.test.js +++ b/e2e/command_tabopen.test.js @@ -1,11 +1,10 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { @@ -30,22 +29,20 @@ const newApp = () => { describe("tabopen command test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; await browser.storage.local.set({ settings, }); @@ -53,8 +50,8 @@ describe("tabopen command test", () => { after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); @@ -64,16 +61,16 @@ describe("tabopen command test", () => { await browser.tabs.remove(tab.id); } - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }) it('should open default search for keywords by tabopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('tabopen an apple', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen an apple', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -86,9 +83,9 @@ describe("tabopen command test", () => { it('should open certain search page for keywords by tabopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('tabopen yahoo an apple', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen yahoo an apple', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -101,9 +98,9 @@ describe("tabopen command test", () => { it('should open default engine with empty keywords by tabopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('tabopen', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -116,9 +113,9 @@ describe("tabopen command test", () => { it('should open certain search page for empty keywords by tabopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('tabopen yahoo', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen yahoo', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -131,9 +128,9 @@ describe("tabopen command test", () => { it('should open a site with domain by tabopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('tabopen i-beam.org', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen i-beam.org', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -146,9 +143,9 @@ describe("tabopen command test", () => { it('should open a site with URL by tabopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('tabopen https://i-beam.org', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen https://i-beam.org', Key.ENTER); await eventually(async() => { let tabs = await browser.tabs.query({}); diff --git a/e2e/command_winopen.test.js b/e2e/command_winopen.test.js index 536d759..149d775 100644 --- a/e2e/command_winopen.test.js +++ b/e2e/command_winopen.test.js @@ -1,11 +1,10 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { @@ -30,22 +29,19 @@ const newApp = () => { describe("winopen command test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { http = newApp().listen(port); - - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); await browser.storage.local.set({ settings, }); @@ -53,8 +49,8 @@ describe("winopen command test", () => { after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); @@ -64,16 +60,16 @@ describe("winopen command test", () => { await browser.windows.remove(win.id); } - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }) it('should open default search for keywords by winopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('winopen an apple', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen an apple', Key.ENTER); await eventually(async() => { let wins = await browser.windows.getAll(); @@ -88,9 +84,9 @@ describe("winopen command test", () => { it('should open certain search page for keywords by winopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('winopen yahoo an apple', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen yahoo an apple', Key.ENTER); await eventually(async() => { let wins = await browser.windows.getAll(); @@ -105,9 +101,9 @@ describe("winopen command test", () => { it('should open default engine with empty keywords by winopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('winopen', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen', Key.ENTER); await eventually(async() => { let wins = await browser.windows.getAll(); @@ -122,9 +118,9 @@ describe("winopen command test", () => { it('should open certain search page for empty keywords by winopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('winopen yahoo', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen yahoo', Key.ENTER); await eventually(async() => { let wins = await browser.windows.getAll(); @@ -139,9 +135,9 @@ describe("winopen command test", () => { it('should open a site with domain by winopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('winopen i-beam.org', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen i-beam.org', Key.ENTER); await eventually(async() => { let wins = await browser.windows.getAll(); @@ -156,9 +152,9 @@ describe("winopen command test", () => { it('should open a site with URL by winopen command ', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys('winopen https://i-beam.org', Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen https://i-beam.org', Key.ENTER); await eventually(async() => { let wins = await browser.windows.getAll(); diff --git a/e2e/completion.test.js b/e2e/completion.test.js index 5d910c6..fc87df0 100644 --- a/e2e/completion.test.js +++ b/e2e/completion.test.js @@ -1,13 +1,12 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const Console = require('./lib/Console'); -const Key = lanthan.Key; - const newApp = () => { let app = express(); app.get('/', (req, res) => { @@ -22,20 +21,18 @@ const newApp = () => { describe("general completion test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); http = newApp().listen(port); await browser.storage.local.set({ @@ -45,21 +42,21 @@ describe("general completion test", () => { after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }); it('should all commands on empty line', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await eventually(async() => { let items = await c.getCompletions(); @@ -74,8 +71,8 @@ describe("general completion test", () => { it('should only commands filtered by prefix', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('b'); await eventually(async() => { @@ -91,8 +88,8 @@ describe("general completion test", () => { it('selects completion items by / keys', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('b'); await eventually(async() => { @@ -100,7 +97,7 @@ describe("general completion test", () => { assert.equal(items.length, 4); }); - await c.sendKeys(Key.Tab); + await c.sendKeys(Key.TAB); await eventually(async() => { let items = await c.getCompletions(); assert(items[1].highlight) @@ -109,7 +106,7 @@ describe("general completion test", () => { assert.equal(v, 'buffer'); }); - await c.sendKeys(Key.Tab, Key.Tab); + await c.sendKeys(Key.TAB, Key.TAB); await eventually(async() => { let items = await c.getCompletions(); assert(items[3].highlight) @@ -118,13 +115,13 @@ describe("general completion test", () => { assert.equal(v, 'bdeletes'); }); - await c.sendKeys(Key.Tab); + await c.sendKeys(Key.TAB); await eventually(async() => { let v = await c.currentValue(); assert.equal(v, 'b'); }); - await c.sendKeys(Key.Shift, Key.Tab); + await c.sendKeys(Key.SHIFT, Key.TAB); await eventually(async() => { let items = await c.getCompletions(); assert(items[3].highlight) diff --git a/e2e/completion_buffers.test.js b/e2e/completion_buffers.test.js index de26747..87d2397 100644 --- a/e2e/completion_buffers.test.js +++ b/e2e/completion_buffers.test.js @@ -1,12 +1,11 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); const Console = require('./lib/Console'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const newApp = () => { @@ -26,20 +25,18 @@ const newApp = () => { describe("completion on buffer/bdelete/bdeletes", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); http = newApp().listen(port); await browser.storage.local.set({ @@ -49,8 +46,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); @@ -67,12 +64,12 @@ describe("completion on buffer/bdelete/bdeletes", () => { } await eventually(async() => { - let handles = await session.getWindowHandles(); + let handles = await webdriver.getAllWindowHandles(); assert.equal(handles.length, 5); - await session.switchToWindow(handles[2]); - await session.findElementByCSS('iframe'); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); }); - body = await session.findElementByCSS('body'); + body = await webdriver.findElement(By.css('body')); await new Promise((resolve) => setTimeout(resolve, 100)); }); @@ -80,8 +77,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should all tabs by "buffer" command with empty params', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('buffer '); await eventually(async() => { @@ -102,8 +99,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should filter items with URLs by keywords on "buffer" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('buffer title_site2'); await eventually(async() => { @@ -118,8 +115,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should filter items with titles by keywords on "buffer" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('buffer /site2'); await eventually(async() => { @@ -132,8 +129,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should show one item by number on "buffer" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('buffer 2'); await eventually(async() => { @@ -147,8 +144,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should show unpinned tabs "bdelete" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('bdelete site'); await eventually(async() => { @@ -163,8 +160,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should show unpinned tabs "bdeletes" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('bdelete site'); await eventually(async() => { @@ -179,8 +176,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should show both pinned and unpinned tabs "bdelete!" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('bdelete! site'); await eventually(async() => { @@ -197,8 +194,8 @@ describe("completion on buffer/bdelete/bdeletes", () => { it('should show both pinned and unpinned tabs "bdeletes!" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('bdeletes! site'); await eventually(async() => { diff --git a/e2e/completion_open.test.js b/e2e/completion_open.test.js index 5828768..b2b7484 100644 --- a/e2e/completion_open.test.js +++ b/e2e/completion_open.test.js @@ -4,10 +4,10 @@ const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); +const { Builder } = require('lanthan'); +const { By, Key } = require('selenium-webdriver'); const Console = require('./lib/Console'); -const Key = lanthan.Key; - const newApp = () => { let app = express(); @@ -23,20 +23,18 @@ const newApp = () => { describe("completion on open/tabopen/winopen commands", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); http = newApp().listen(port); await browser.storage.local.set({ @@ -44,26 +42,26 @@ describe("completion on open/tabopen/winopen commands", () => { }); // Add item into hitories - await session.navigateTo(`https://i-beam.org/404`); + await webdriver.navigate().to(`https://i-beam.org/404`); }); after(async() => { http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }); it('should show completions from search engines, bookmarks, and histories by "open" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('open '); await eventually(async() => { @@ -77,8 +75,8 @@ describe("completion on open/tabopen/winopen commands", () => { it('should filter items with URLs by keywords on "open" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('open https://'); await eventually(async() => { @@ -91,8 +89,8 @@ describe("completion on open/tabopen/winopen commands", () => { it('should filter items with titles by keywords on "open" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('open getting'); await eventually(async() => { @@ -105,8 +103,8 @@ describe("completion on open/tabopen/winopen commands", () => { it('should filter items with titles by keywords on "tabopen" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('tabopen https://'); await eventually(async() => { @@ -119,8 +117,8 @@ describe("completion on open/tabopen/winopen commands", () => { it('should filter items with titles by keywords on "winopen" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('winopen https://'); await eventually(async() => { @@ -131,24 +129,26 @@ describe("completion on open/tabopen/winopen commands", () => { }) it('should display only specified items in "complete" property by set command', async() => { - let c = new Console(session); + let c = new Console(webdriver); const execCommand = async(line) => { await body.sendKeys(':'); - await session.switchToFrame(0); - await c.sendKeys(line, Key.Enter); - await session.switchToParentFrame(); + await webdriver.switchTo().frame(0); + await c.sendKeys(line, Key.ENTER); + await new Promise(resolve => setTimeout(resolve, 100)); + await webdriver.switchTo().parentFrame(); } const typeCommand = async(...keys) => { await body.sendKeys(':'); - await session.switchToFrame(0); + await webdriver.switchTo().frame(0); await c.sendKeys(...keys); } const cancel = async() => { - await c.sendKeys(Key.Escape); - await session.switchToParentFrame(); + await c.sendKeys(Key.ESCAPE); + await new Promise(resolve => setTimeout(resolve, 100)); + await webdriver.switchTo().parentFrame(); } await execCommand('set complete=sbh'); @@ -189,17 +189,18 @@ describe("completion on open/tabopen/winopen commands", () => { }; await browser.storage.local.set({ settings, }); - let c = new Console(session); + let c = new Console(webdriver); const typeCommand = async(...keys) => { await body.sendKeys(':'); - await session.switchToFrame(0); + await webdriver.switchTo().frame(0); await c.sendKeys(...keys); } const cancel = async() => { - await c.sendKeys(Key.Escape); - await session.switchToParentFrame(); + await c.sendKeys(Key.ESCAPE); + await new Promise(resolve => setTimeout(resolve, 100)); + await webdriver.switchTo().parentFrame(); } await browser.storage.local.set({ settings: { diff --git a/e2e/completion_set.test.js b/e2e/completion_set.test.js index cf5ff5b..a6ec248 100644 --- a/e2e/completion_set.test.js +++ b/e2e/completion_set.test.js @@ -5,25 +5,23 @@ const assert = require('assert'); const eventually = require('./eventually'); const settings = require('./settings'); const Console = require('./lib/Console'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By } = require('selenium-webdriver'); describe("completion on set commands", () => { const port = 12321; - let firefox; + let lanthan; let session; let browser; let body; before(async() => { - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); await browser.storage.local.set({ settings, @@ -31,21 +29,21 @@ describe("completion on set commands", () => { }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }); beforeEach(async() => { - await session.navigateTo(`about:blank`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`about:blank`); + body = await webdriver.findElement(By.css('body')); }); it('should show all property names by "set" command with empty params', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('set '); await eventually(async() => { @@ -62,8 +60,8 @@ describe("completion on set commands", () => { it('should show filtered property names by "set" command', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); - let c = new Console(session); + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); await c.sendKeys('set no'); await eventually(async() => { diff --git a/e2e/console.test.js b/e2e/console.test.js index 6f6341f..131a4ef 100644 --- a/e2e/console.test.js +++ b/e2e/console.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -23,102 +22,106 @@ const newApp = () => { describe("console test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let tab; let body; before(async() => { - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { - http.close(); - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); + } + if (http) { + http.close(); } }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }); it('open console with :', async() => { await body.sendKeys(':'); - await session.switchToFrame(0); + await webdriver.switchTo().frame(0); - let input = await session.findElementByCSS('input'); + let input = await webdriver.findElement(By.css('input')); assert.equal(await input.isDisplayed(), true); }); it('open console with open command by o', async() => { await body.sendKeys('o'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, 'open '); }); it('open console with open command and current URL by O', async() => { - await body.sendKeys(Key.Shift, 'o'); + await body.sendKeys(Key.SHIFT, 'o'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, `open http://127.0.0.1:${port}/`); }); it('open console with tabopen command by t', async() => { await body.sendKeys('t'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, 'tabopen '); }); it('open console with tabopen command and current URL by T', async() => { - await body.sendKeys(Key.Shift, 't'); + await body.sendKeys(Key.SHIFT, 't'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, `tabopen http://127.0.0.1:${port}/`); }); it('open console with winopen command by w', async() => { await body.sendKeys('w'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, 'winopen '); }); it('open console with winopen command and current URL by W', async() => { - await body.sendKeys(Key.Shift, 'W'); + await body.sendKeys(Key.SHIFT, 'W'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, `winopen http://127.0.0.1:${port}/`); }); it('open console with buffer command by b', async() => { await body.sendKeys('b'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, `buffer `); }); it('open console with addbookmark command with title by a', async() => { await body.sendKeys('a'); - await session.switchToFrame(0); - let value = await session.executeScript(() => document.querySelector('input').value); + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input').value); assert.equal(value, `addbookmark Hello, world!`); }); }); diff --git a/e2e/follow.test.js b/e2e/follow.test.js index 7e49119..336d673 100644 --- a/e2e/follow.test.js +++ b/e2e/follow.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -119,9 +118,9 @@ const newApp = () => { return app; }; -const waitForHints = async(session) => { +const waitForHints = async(webdriver) => { await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert(hints.length > 0); }); }; @@ -130,24 +129,27 @@ describe('follow test', () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); + } + if (http) { + http.close(); } - http.close(); }); afterEach(async() => { @@ -158,45 +160,49 @@ describe('follow test', () => { }); it('should focus an input by f', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/follow-input`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/follow-input`); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('f'); - await waitForHints(session); + await waitForHints(webdriver); await body.sendKeys('a'); - let tagName = await session.executeScript(() => document.activeElement.tagName); + let tagName = await webdriver.executeScript(() => document.activeElement.tagName); assert.equal(tagName.toLowerCase(), 'input'); }); it('should open a link by f', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); - let body = await session.findElementByCSS('body'); - await body.sendKeys('f', 'a'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys('f'); + await waitForHints(webdriver); + await body.sendKeys('a'); - let hash = await session.executeScript('location.pathname'); - await body.sendKeys(hash, '/hello'); + await eventually(async() => { + let hash = await webdriver.executeScript('return location.pathname'); + assert.equal(hash, '/hello'); + }); }); it('should focus an input by F', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/follow-input`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/follow-input`); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'f'); - await waitForHints(session); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'f'); + await waitForHints(webdriver); await body.sendKeys('a'); - let tagName = await session.executeScript(() => document.activeElement.tagName); + let tagName = await webdriver.executeScript(() => document.activeElement.tagName); assert.equal(tagName.toLowerCase(), 'input'); }); it('should open a link to new tab by F', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'f'); - await waitForHints(session); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'f'); + await waitForHints(webdriver); await body.sendKeys('a'); await eventually(async() => { @@ -208,49 +214,49 @@ describe('follow test', () => { }); it('should show hints of links in area', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/area`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/area`); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'f'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'f'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 3); }); }); it('should shows hints only in viewport', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/test1`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/test1`); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'f'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'f'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 1); }); }); it('should shows hints only in window of the frame', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/test2`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/test2`); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'f'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'f'); - await session.switchToFrame(0); + await webdriver.switchTo().frame(0); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 1); }); }); it('should shows hints only in the frame', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/test3`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/test3`); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'f'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'f'); - await session.switchToFrame(0); + await webdriver.switchTo().frame(0); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 1); }); }); diff --git a/e2e/follow_properties.test.js b/e2e/follow_properties.test.js index 223923e..5e22a40 100644 --- a/e2e/follow_properties.test.js +++ b/e2e/follow_properties.test.js @@ -1,11 +1,10 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); const Console = require('./lib/Console'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -25,9 +24,9 @@ const newApp = () => { return app; }; -const waitForHints = async(session) => { +const waitForHints = async(webdriver) => { await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert(hints.length > 0); }); }; @@ -36,22 +35,20 @@ describe('follow properties test', () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; let body; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - }, - }); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); await browser.storage.local.set({ settings: { source: 'json', @@ -74,15 +71,15 @@ describe('follow properties test', () => { }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } http.close(); }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}/`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + body = await webdriver.findElement(By.css('body')); }); afterEach(async() => { @@ -95,7 +92,7 @@ describe('follow properties test', () => { it('should show hints with hintchars by settings', async () => { await body.sendKeys('f'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 5); assert.equal(await hints[0].getText(), 'J'); @@ -108,20 +105,20 @@ describe('follow properties test', () => { await body.sendKeys('j'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); - assert.equal(await hints[0].getStyle('display'), 'block'); - assert.equal(await hints[1].getStyle('display'), 'none'); - assert.equal(await hints[2].getStyle('display'), 'block'); - assert.equal(await hints[3].getStyle('display'), 'block'); - assert.equal(await hints[4].getStyle('display'), 'none'); + assert.equal(await hints[0].getCssValue('display'), 'block'); + assert.equal(await hints[1].getCssValue('display'), 'none'); + assert.equal(await hints[2].getCssValue('display'), 'block'); + assert.equal(await hints[3].getCssValue('display'), 'block'); + assert.equal(await hints[4].getCssValue('display'), 'none'); }); }); it('should open tab in background by background:false', async () => { - await body.sendKeys(Key.Shift, 'f'); + await body.sendKeys(Key.SHIFT, 'f'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 5); }); await body.sendKeys('jj'); @@ -134,9 +131,9 @@ describe('follow properties test', () => { }); it('should open tab in background by background:true', async () => { - await body.sendKeys(Key.Control, 'f'); + await body.sendKeys(Key.CONTROL, 'f'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 5); }); await body.sendKeys('jj'); @@ -149,16 +146,17 @@ describe('follow properties test', () => { }); it('should show hints with hintchars by settings', async () => { - let c = new Console(session); + let c = new Console(webdriver); await body.sendKeys(':'); - await session.switchToFrame(0); - await c.sendKeys('set hintchars=abc', Key.Enter); - await session.switchToParentFrame(); + await webdriver.switchTo().frame(0); + await c.sendKeys('set hintchars=abc', Key.ENTER); + await new Promise(resolve => setTimeout(resolve, 100)); + await webdriver.switchTo().parentFrame(); await body.sendKeys('f'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); assert.equal(hints.length, 5); assert.equal(await hints[0].getText(), 'A'); @@ -170,13 +168,13 @@ describe('follow properties test', () => { await body.sendKeys('a'); await eventually(async() => { - let hints = await session.findElementsByCSS('.vimvixen-hint'); + let hints = await webdriver.findElements(By.css(`.vimvixen-hint`)); - assert.equal(await hints[0].getStyle('display'), 'block'); - assert.equal(await hints[1].getStyle('display'), 'none'); - assert.equal(await hints[2].getStyle('display'), 'none'); - assert.equal(await hints[3].getStyle('display'), 'block'); - assert.equal(await hints[4].getStyle('display'), 'block'); + assert.equal(await hints[0].getCssValue('display'), 'block'); + assert.equal(await hints[1].getCssValue('display'), 'none'); + assert.equal(await hints[2].getCssValue('display'), 'none'); + assert.equal(await hints[3].getCssValue('display'), 'block'); + assert.equal(await hints[4].getCssValue('display'), 'block'); }); }); }); diff --git a/e2e/lib/Console.js b/e2e/lib/Console.js index 3a39b64..6016de1 100644 --- a/e2e/lib/Console.js +++ b/e2e/lib/Console.js @@ -1,22 +1,24 @@ +const { By } = require('selenium-webdriver'); + class Console { - constructor(session) { - this.session = session; + constructor(webdriver) { + this.webdriver = webdriver; } async sendKeys(...keys) { - let input = await this.session.findElementByCSS('input'); + let input = await this.webdriver.findElement(By.css('input')); input.sendKeys(...keys); } async currentValue() { - return await this.session.executeScript(() => { + return await this.webdriver.executeScript(() => { let input = document.querySelector('input'); return input.value; }); } async getCompletions() { - return await this.session.executeScript(() => { + return await this.webdriver.executeScript(() => { let items = document.querySelectorAll('.vimvixen-console-completion > li'); if (items.length === 0) { throw new Error('completion items not found'); diff --git a/e2e/mark.test.js b/e2e/mark.test.js index 8716c1e..cc32c85 100644 --- a/e2e/mark.test.js +++ b/e2e/mark.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -21,61 +20,65 @@ describe("mark test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); + } + if (http) { + http.close(); } - http.close(); }); it('should set a local mark and jump to it', async () => { - await session.navigateTo(`http://127.0.0.1:${port}`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + let body = await webdriver.findElement(By.css('body')); - await session.executeScript(() => window.scrollTo(200, 200)); + await webdriver.executeScript(() => window.scrollTo(200, 200)); await body.sendKeys('m', 'a'); - await session.executeScript(() => window.scrollTo(500, 500)); + await webdriver.executeScript(() => window.scrollTo(500, 500)); await body.sendKeys('\'', 'a'); await eventually(async() => { - let pageXOffset = await session.executeScript(() => window.pageXOffset); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageXOffset, 200); assert.equal(pageYOffset, 200); }); }); it('should set a global mark and jump to it', async () => { - await session.navigateTo(`http://127.0.0.1:${port}#first`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}#first`); + let body = await webdriver.findElement(By.css('body')); - await session.executeScript(() => window.scrollTo(200, 200)); + await webdriver.executeScript(() => window.scrollTo(200, 200)); await body.sendKeys('m', 'A'); - await session.executeScript(() => window.scrollTo(500, 500)); + await webdriver.executeScript(() => window.scrollTo(500, 500)); await body.sendKeys('\'', 'A'); await eventually(async() => { - let pageXOffset = await session.executeScript(() => window.pageXOffset); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageXOffset, 200); assert.equal(pageYOffset, 200); }); await browser.tabs.create({ url: `http://127.0.0.1:${port}#second` }); - body = await session.findElementByCSS('body'); + body = await webdriver.findElement(By.css('body')); await body.sendKeys('\'', 'A'); await eventually(async() => { @@ -83,17 +86,17 @@ describe("mark test", () => { let url = new URL(tab.url); assert.equal(url.hash, '#first'); - let pageXOffset = await session.executeScript(() => window.pageXOffset); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageXOffset, 200); assert.equal(pageYOffset, 200); }); }); it('set a global mark and creates new tab from gone', async () => { - await session.navigateTo(`http://127.0.0.1:${port}#first`); - await session.executeScript(() => window.scrollTo(500, 500)); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}#first`); + await webdriver.executeScript(() => window.scrollTo(500, 500)); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('m', 'A'); let tab = (await browser.tabs.query({ active: true }))[0]; @@ -102,12 +105,12 @@ describe("mark test", () => { let handles; await eventually(async() => { - handles = await session.getWindowHandles(); + handles = await webdriver.getAllWindowHandles(); assert.equal(handles.length, 2); }); - await session.switchToWindow(handles[0]); - await session.navigateTo(`http://127.0.0.1:${port}#second`); - body = await session.findElementByCSS('body'); + await webdriver.switchTo().window(handles[0]); + await webdriver.navigate().to(`http://127.0.0.1:${port}#second`); + body = await webdriver.findElement(By.css('body')); await body.sendKeys('\'', 'A'); await eventually(async() => { diff --git a/e2e/navigate.test.js b/e2e/navigate.test.js index 17552e5..e4b8f69 100644 --- a/e2e/navigate.test.js +++ b/e2e/navigate.test.js @@ -1,10 +1,10 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Options: FirefoxOptions } = require('selenium-webdriver/firefox'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -47,26 +47,26 @@ describe("navigate test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let browser; before(async() => { + let opts = new FirefoxOptions() + .setPreference('browser.startup.homepage', `http://127.0.0.1:${port}#home`); http = newApp().listen(port); - - firefox = await lanthan.firefox({ - prefs: { - 'browser.startup.homepage': `http://127.0.0.1:${port}#home`, - } - }); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .setOptions(opts) + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } http.close(); }); @@ -79,8 +79,8 @@ describe("navigate test", () => { }) it('should go to parent path without hash by gu', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/a/b/c`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/a/b/c`); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('g', 'u'); @@ -92,8 +92,8 @@ describe("navigate test", () => { }); it('should remove hash by gu', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/a/b/c#hash`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/a/b/c#hash`); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('g', 'u'); @@ -106,10 +106,10 @@ describe("navigate test", () => { }); it('should go to root path by gU', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/a/b/c#hash`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/a/b/c#hash`); + let body = await webdriver.findElement(By.css('body')); - await body.sendKeys('g', Key.Shift, 'u'); + await body.sendKeys('g', Key.SHIFT, 'u'); await eventually(async() => { let tab = (await browser.tabs.query({}))[0]; @@ -119,11 +119,11 @@ describe("navigate test", () => { }); it('should go back and forward in history by H and L', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/first`); - await session.navigateTo(`http://127.0.0.1:${port}/second`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/first`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/second`); + let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(Key.Shift, 'h'); + await body.sendKeys(Key.SHIFT, 'h'); await eventually(async() => { let tab = (await browser.tabs.query({}))[0]; @@ -131,8 +131,8 @@ describe("navigate test", () => { assert.equal(url.pathname, `/first`) }); - body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'l'); + body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'l'); await eventually(async() => { tab = (await browser.tabs.query({}))[0]; @@ -142,9 +142,9 @@ describe("navigate test", () => { }); it('should go previous and next page in by [[ and ]]', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/pagenation-a/10`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/pagenation-a/10`); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('[', '['); await eventually(async() => { @@ -155,8 +155,8 @@ describe("navigate test", () => { }); it('should go next page in by ]]', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/pagenation-a/10`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/pagenation-a/10`); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(']', ']'); await eventually(async() => { @@ -167,9 +167,9 @@ describe("navigate test", () => { }); it('should go previous page in by ]]', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/pagenation-link/10`); + await webdriver.navigate().to(`http://127.0.0.1:${port}/pagenation-link/10`); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('[', '['); await eventually(async() => { @@ -180,8 +180,8 @@ describe("navigate test", () => { }); it('should go next page by in by [[', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/pagenation-link/10`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}/pagenation-link/10`); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(']', ']'); await eventually(async() => { @@ -192,8 +192,8 @@ describe("navigate test", () => { }); it('should go to home page into current tab by gh', async () => { - await session.navigateTo(`http://127.0.0.1:${port}`); - let body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('g', 'h'); await eventually(async() => { @@ -204,9 +204,9 @@ describe("navigate test", () => { }); it('should go to home page into current tab by gH', async () => { - await session.navigateTo(`http://127.0.0.1:${port}`); - let body = await session.findElementByCSS('body'); - await body.sendKeys('g', Key.Shift, 'H'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys('g', Key.SHIFT, 'H'); await eventually(async() => { let tabs = await browser.tabs.query({}); @@ -218,8 +218,8 @@ describe("navigate test", () => { }); it('should reload current tab by r', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/reload`); - await session.executeScript(() => window.scrollTo(500, 500)); + await webdriver.navigate().to(`http://127.0.0.1:${port}/reload`); + await webdriver.executeScript(() => window.scrollTo(500, 500)); let before await eventually(async() => { let tab = (await browser.tabs.query({}))[0]; @@ -227,7 +227,7 @@ describe("navigate test", () => { assert(before > 0); }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('r'); let after @@ -238,14 +238,14 @@ describe("navigate test", () => { }); await eventually(async() => { - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 500); }); }); it('should reload current tab without cache by R', async () => { - await session.navigateTo(`http://127.0.0.1:${port}/reload`); - await session.executeScript(() => window.scrollTo(500, 500)); + await webdriver.navigate().to(`http://127.0.0.1:${port}/reload`); + await webdriver.executeScript(() => window.scrollTo(500, 500)); let before await eventually(async() => { let tab = (await browser.tabs.query({}))[0]; @@ -253,8 +253,8 @@ describe("navigate test", () => { assert(before > 0); }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'R'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'R'); let after await eventually(async() => { @@ -266,7 +266,7 @@ describe("navigate test", () => { // assert that the page offset is reset to 0, and 'eventually' is timed-out. await assert.rejects(async () => { await eventually(async() => { - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 500); }); }); diff --git a/e2e/options.test.js b/e2e/options.test.js index e8045c2..456c80b 100644 --- a/e2e/options.test.js +++ b/e2e/options.test.js @@ -1,8 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); +const { Builder } = require('lanthan'); +const { By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -18,31 +19,28 @@ const newApp = () => { describe("options page", () => { const port = 12321; let http; - let firefox; + let lanthan; let session; let browser; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - builder.addFile('build/settings.html'); - }, - }); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); + } + if (http) { + http.close(); } - - http.close(); }); beforeEach(async() => { @@ -53,15 +51,15 @@ describe("options page", () => { }) const updateTextarea = async(value) => { - let textarea = await session.findElementByCSS('textarea'); - await session.executeScript(`document.querySelector('textarea').value = '${value}'`) + let textarea = await webdriver.findElement(By.css('textarea')); + await webdriver.executeScript(`document.querySelector('textarea').value = '${value}'`) await textarea.sendKeys(' '); - await session.executeScript(() => document.querySelector('textarea').blur()); + await webdriver.executeScript(() => document.querySelector('textarea').blur()); } it('saves current config on blur', async () => { let url = await browser.runtime.getURL("build/settings.html") - await session.navigateTo(url); + await webdriver.navigate().to(url); await updateTextarea(`{ "blacklist": [ "https://example.com" ] }`); @@ -75,7 +73,7 @@ describe("options page", () => { assert.equal(settings.source, 'json') assert.equal(settings.json, '{ "blacklist": [ "https://example.com" ] } ') - let error = await session.findElementByCSS('.settings-ui-input-error'); + let error = await webdriver.findElement(By.css('.settings-ui-input-error')); let text = await error.getText(); assert.ok(text.startsWith('SyntaxError:')) }); @@ -83,17 +81,17 @@ describe("options page", () => { it('updates keymaps without reloading', async () => { await browser.tabs.create({ url: `http://127.0.0.1:${port}`, active: false }); let url = await browser.runtime.getURL("build/settings.html") - await session.navigateTo(url); + await webdriver.navigate().to(url); - let handles = await session.getWindowHandles(); await updateTextarea(`{ "keymaps": { "zz": { "type": "scroll.vertically", "count": 10 } } }`); - await session.switchToWindow(handles[1]); + let handles = await webdriver.getAllWindowHandles(); + await webdriver.switchTo().window(handles[1]); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('zz') - let y = await session.executeScript(() => window.pageYOffset); + let y = await webdriver.executeScript(() => window.pageYOffset); assert.equal(y, 640); }) }); diff --git a/e2e/options_form.test.js b/e2e/options_form.test.js index f86d995..4f41738 100644 --- a/e2e/options_form.test.js +++ b/e2e/options_form.test.js @@ -1,23 +1,20 @@ -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); +const { Builder } = require('lanthan'); +const { By } = require('selenium-webdriver'); describe("options form page", () => { - let firefox; - let session; + let lanthan; + let webdriver; let browser; beforeEach(async() => { - firefox = await lanthan.firefox({ - spy: path.join(__dirname, '..'), - builderf: (builder) => { - builder.addFile('build/settings.js'); - builder.addFile('build/settings.html'); - }, - }); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); let tabs = await browser.tabs.query({}); for (let tab of tabs.slice(1)) { @@ -26,37 +23,37 @@ describe("options form page", () => { }) afterEach(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); } }) const setBlacklistValue = async(nth, value) => { let selector = '.form-blacklist-form .column-url'; - let input = (await session.findElementsByCSS(selector))[nth]; + let input = (await webdriver.findElements(By.css(selector)))[nth]; await input.sendKeys(value); - await session.executeScript(`document.querySelectorAll('${selector}')[${nth}].blur()`); + await webdriver.executeScript(`document.querySelectorAll('${selector}')[${nth}].blur()`); } const setSearchEngineValue = async(nth, name, url) => { let selector = '.form-search-form input.column-name'; - let input = (await session.findElementsByCSS(selector))[nth]; + let input = (await webdriver.findElements(By.css(selector)))[nth]; await input.sendKeys(name); - await session.executeScript(`document.querySelectorAll('${selector}')[${nth}].blur()`); + await webdriver.executeScript(`document.querySelectorAll('${selector}')[${nth}].blur()`); selector = '.form-search-form input.column-url'; - input = (await session.findElementsByCSS(selector))[nth]; + input = (await webdriver.findElements(By.css(selector)))[nth]; await input.sendKeys(url); - await session.executeScript(`document.querySelectorAll('${selector}')[${nth}].blur()`); + await webdriver.executeScript(`document.querySelectorAll('${selector}')[${nth}].blur()`); } it('switch to form settings', async () => { let url = await browser.runtime.getURL("build/settings.html") - await session.navigateTo(url); + await webdriver.navigate().to(url); - let useFormInput = await session.findElementByCSS('#setting-source-form'); + let useFormInput = await webdriver.findElement(By.css('#setting-source-form')); await useFormInput.click(); - await session.acceptAlert(); + await webdriver.switchTo().alert().accept(); let { settings } = await browser.storage.local.get('settings'); assert.equal(settings.source, 'form') @@ -64,19 +61,19 @@ describe("options form page", () => { it('add blacklist', async () => { let url = await browser.runtime.getURL("build/settings.html") - await session.navigateTo(url); + await webdriver.navigate().to(url); - let useFormInput = await session.findElementByCSS('#setting-source-form'); + let useFormInput = await webdriver.findElement(By.css('#setting-source-form')); await useFormInput.click(); - await session.acceptAlert(); - await session.executeScript(() => window.scrollBy(0, 1000)); + await webdriver.switchTo().alert().accept(); + await webdriver.executeScript(() => window.scrollBy(0, 1000)); // assert default let settings = (await browser.storage.local.get('settings')).settings; assert.deepEqual(settings.form.blacklist, []) // add blacklist items - let addButton = await session.findElementByCSS('.form-blacklist-form .ui-add-button'); + let addButton = await webdriver.findElement(By.css('.form-blacklist-form .ui-add-button')) await addButton.click(); await setBlacklistValue(0, 'google.com') @@ -90,7 +87,7 @@ describe("options form page", () => { assert.deepEqual(settings.form.blacklist, ['google.com', 'yahoo.com']) // delete first item - let deleteButton = (await session.findElementsByCSS('.form-blacklist-form .ui-delete-button'))[0]; + let deleteButton = (await webdriver.findElements(By.css('.form-blacklist-form .ui-delete-button')))[0]; await deleteButton.click() settings = (await browser.storage.local.get('settings')).settings; @@ -99,23 +96,23 @@ describe("options form page", () => { it('add search engines', async () => { let url = await browser.runtime.getURL("build/settings.html") - await session.navigateTo(url); + await webdriver.navigate().to(url); - let useFormInput = await session.findElementByCSS('#setting-source-form'); + let useFormInput = await webdriver.findElement(By.css('#setting-source-form')); await useFormInput.click(); - await session.acceptAlert(); + await webdriver.switchTo().alert().accept(); // assert default let settings = (await browser.storage.local.get('settings')).settings; assert.deepEqual(settings.form.search.default, 'google'); // change default - let radio = (await session.findElementsByCSS('.form-search-form input[type=radio]'))[2]; + let radio = (await webdriver.findElements(By.css('.form-search-form input[type=radio]')))[2]; await radio.click(); settings = (await browser.storage.local.get('settings')).settings; assert.deepEqual(settings.form.search.default, 'bing'); - let addButton = await session.findElementByCSS('.form-search-form .ui-add-button'); + let addButton = await webdriver.findElement(By.css('.form-search-form .ui-add-button')) await addButton.click(); await setSearchEngineValue(6, 'yippy', 'https://www.yippy.com/search?query={}'); diff --git a/e2e/repeat.test.js b/e2e/repeat.test.js index 4072005..b068b18 100644 --- a/e2e/repeat.test.js +++ b/e2e/repeat.test.js @@ -1,10 +1,9 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -20,44 +19,48 @@ describe("tab test", () => { const url = `http://127.0.0.1:${port}/`; let http; - let firefox; - let session; + let lanthan; + let webdriver let browser; let tabs; before(async() => { - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); http = newApp().listen(port); - await session.navigateTo(`${url}`); + await webdriver.navigate().to(`${url}`); }); after(async() => { - http.close(); - if (firefox) { - await firefox.close(); + if (http) { + http.close(); + } + if (lanthan) { + await lanthan.quit(); } }); it('repeats last operation', async () => { let before = await browser.tabs.query({}); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys(':'); - await session.switchToFrame(0); - let input = await session.findElementByCSS('input'); - input.sendKeys(`tabopen ${url}newtab`, Key.Enter); + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys(`tabopen ${url}newtab`, Key.ENTER); await eventually(async() => { let current = await browser.tabs.query({ url: `*://*/newtab` }); assert.equal(current.length, 1); }); - body = await session.findElementByCSS('body'); + body = await webdriver.findElement(By.css('body')); await body.sendKeys('.'); await eventually(async() => { @@ -72,7 +75,7 @@ describe("tab test", () => { } let before = await browser.tabs.query({}); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('d'); await eventually(async() => { @@ -81,7 +84,7 @@ describe("tab test", () => { }); await browser.tabs.update(before[2].id, { active: true }); - body = await session.findElementByCSS('body'); + body = await webdriver.findElement(By.css('body')); await body.sendKeys('.'); await eventually(async() => { diff --git a/e2e/scroll.test.js b/e2e/scroll.test.js index 0ce3ec6..b728f47 100644 --- a/e2e/scroll.test.js +++ b/e2e/scroll.test.js @@ -1,9 +1,8 @@ const express = require('express'); -const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -20,131 +19,135 @@ describe("scroll test", () => { const port = 12321; let http; - let firefox; - let session; + let lanthan; + let webdriver; let body; before(async() => { http = newApp().listen(port); - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); }); after(async() => { - if (firefox) { - await firefox.close(); + if (lanthan) { + await lanthan.quit(); + } + if (http) { + http.close(); } - http.close(); }); beforeEach(async() => { - await session.navigateTo(`http://127.0.0.1:${port}`); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); }); it('scrolls up by k', async () => { await body.sendKeys('j'); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 64); }); it('scrolls down by j', async () => { - await session.executeScript(() => window.scrollTo(0, 200)); + await webdriver.executeScript(() => window.scrollTo(0, 200)); await body.sendKeys('k'); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 136); }); it('scrolls left by h', async () => { - await session.executeScript(() => window.scrollTo(100, 100)); + await webdriver.executeScript(() => window.scrollTo(100, 100)); await body.sendKeys('h'); - let pageXOffset = await session.executeScript(() => window.pageXOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); assert.equal(pageXOffset, 36); }); it('scrolls left by l', async () => { - await session.executeScript(() => window.scrollTo(100, 100)); + await webdriver.executeScript(() => window.scrollTo(100, 100)); await body.sendKeys('l'); - let pageXOffset = await session.executeScript(() => window.pageXOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); assert.equal(pageXOffset, 164); }); it('scrolls top by gg', async () => { - await session.executeScript(() => window.scrollTo(0, 100)); + await webdriver.executeScript(() => window.scrollTo(0, 100)); await body.sendKeys('g', 'g'); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert.equal(pageYOffset, 0); }); it('scrolls bottom by G', async () => { - await session.executeScript(() => window.scrollTo(0, 100)); - await body.sendKeys(Key.Shift, 'g'); + await webdriver.executeScript(() => window.scrollTo(0, 100)); + await body.sendKeys(Key.SHIFT, 'g'); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert(pageYOffset > 5000); }); it('scrolls bottom by 0', async () => { - await session.executeScript(() => window.scrollTo(0, 100)); - await body.sendKeys(Key.Shift, '0'); + await webdriver.executeScript(() => window.scrollTo(0, 100)); + await body.sendKeys(Key.SHIFT, '0'); - let pageXOffset = await session.executeScript(() => window.pageXOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); assert(pageXOffset === 0); }); it('scrolls bottom by $', async () => { - await session.executeScript(() => window.scrollTo(0, 100)); - await body.sendKeys(Key.Shift, '$'); + await webdriver.executeScript(() => window.scrollTo(0, 100)); + await body.sendKeys(Key.SHIFT, '$'); - let pageXOffset = await session.executeScript(() => window.pageXOffset); + let pageXOffset = await webdriver.executeScript(() => window.pageXOffset); assert(pageXOffset > 5000); }); it('scrolls bottom by ', async () => { - await session.executeScript(() => window.scrollTo(0, 1000)); - await body.sendKeys(Key.Control, 'u'); + await webdriver.executeScript(() => window.scrollTo(0, 1000)); + await body.sendKeys(Key.CONTROL, 'u'); let pageHeight = - await session.executeScript(() => window.document.documentElement.clientHeight); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + await webdriver.executeScript(() => window.document.documentElement.clientHeight); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert(Math.abs(pageYOffset - (1000 - Math.floor(pageHeight / 2))) < 5); }); it('scrolls bottom by ', async () => { - await session.executeScript(() => window.scrollTo(0, 1000)); - await body.sendKeys(Key.Control, 'd'); + await webdriver.executeScript(() => window.scrollTo(0, 1000)); + await body.sendKeys(Key.CONTROL, 'd'); let pageHeight = - await session.executeScript(() => window.document.documentElement.clientHeight); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + await webdriver.executeScript(() => window.document.documentElement.clientHeight); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert(Math.abs(pageYOffset - (1000 + Math.floor(pageHeight / 2))) < 5); }); it('scrolls bottom by ', async () => { - await session.executeScript(() => window.scrollTo(0, 1000)); - await body.sendKeys(Key.Control, 'b'); + await webdriver.executeScript(() => window.scrollTo(0, 1000)); + await body.sendKeys(Key.CONTROL, 'b'); let pageHeight = - await session.executeScript(() => window.document.documentElement.clientHeight); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + await webdriver.executeScript(() => window.document.documentElement.clientHeight); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert(Math.abs(pageYOffset - (1000 - pageHeight)) < 5); }); it('scrolls bottom by ', async () => { - await session.executeScript(() => window.scrollTo(0, 1000)); - await body.sendKeys(Key.Control, 'f'); + await webdriver.executeScript(() => window.scrollTo(0, 1000)); + await body.sendKeys(Key.CONTROL, 'f'); let pageHeight = - await session.executeScript(() => window.document.documentElement.clientHeight); - let pageYOffset = await session.executeScript(() => window.pageYOffset); + await webdriver.executeScript(() => window.document.documentElement.clientHeight); + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); assert(Math.abs(pageYOffset - (1000 + pageHeight)) < 5); }); }); diff --git a/e2e/tab.test.js b/e2e/tab.test.js index 99f0374..4e3a681 100644 --- a/e2e/tab.test.js +++ b/e2e/tab.test.js @@ -3,8 +3,8 @@ const lanthan = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Builder } = require('lanthan'); +const { Key, By } = require('selenium-webdriver'); const newApp = () => { let app = express(); @@ -20,24 +20,28 @@ describe("tab test", () => { const url = `http://127.0.0.1:${port}/`; let http; - let firefox; - let session; + let lanthan; + let webdriver let browser; let win; let tabs; before(async() => { - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); http = newApp().listen(port); }); after(async() => { - http.close(); - if (firefox) { - await firefox.close(); + if (http) { + http.close(); + } + if (lanthan) { + await lanthan.quit(); } }); @@ -45,7 +49,7 @@ describe("tab test", () => { win = await browser.windows.create({ url: `${url}#0` }); for (let i = 1; i < 5; ++i) { await browser.tabs.create({ url: `${url}#${i}`, windowId: win.id }); - await session.navigateTo(`${url}#${i}`); + await webdriver.navigate().to(`${url}#${i}`); } tabs = await browser.tabs.query({ windowId: win.id }); tabs.sort((t1, t2) => t1.index - t2.index); @@ -57,7 +61,7 @@ describe("tab test", () => { it('deletes tab and selects right by d', async () => { await browser.tabs.update(tabs[3].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('d'); let current = await browser.tabs.query({ windowId: win.id }); @@ -68,8 +72,8 @@ describe("tab test", () => { it('deletes tab and selects left by D', async () => { await browser.tabs.update(tabs[3].id, { active: true }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'D'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'D'); await eventually(async() => { let current = await browser.tabs.query({ windowId: win.id }); @@ -81,7 +85,7 @@ describe("tab test", () => { it('deletes all tabs to the right by x$', async () => { await browser.tabs.update(tabs[1].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('x', '$'); let current = await browser.tabs.query({ windowId: win.id }); @@ -90,7 +94,7 @@ describe("tab test", () => { it('duplicates tab by zd', async () => { await browser.tabs.update(tabs[0].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('z', 'd'); await eventually(async() => { @@ -103,7 +107,7 @@ describe("tab test", () => { it('makes pinned by zp', async () => { await browser.tabs.update(tabs[0].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('z', 'p'); let current = await browser.tabs.query({ windowId: win.id }); @@ -112,8 +116,8 @@ describe("tab test", () => { it('selects previous tab by K', async () => { await browser.tabs.update(tabs[2].id, { active: true }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'K'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'K'); let current = await browser.tabs.query({ windowId: win.id }); assert(current[1].active); @@ -121,8 +125,8 @@ describe("tab test", () => { it('selects previous tab by K rotatory', async () => { await browser.tabs.update(tabs[0].id, { active: true }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'K'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'K'); let current = await browser.tabs.query({ windowId: win.id }); assert(current[current.length - 1].active) @@ -130,8 +134,8 @@ describe("tab test", () => { it('selects next tab by J', async () => { await browser.tabs.update(tabs[2].id, { active: true }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'J'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'J'); let current = await browser.tabs.query({ windowId: win.id }); assert(current[3].active); @@ -139,8 +143,8 @@ describe("tab test", () => { it('selects previous tab by J rotatory', async () => { await browser.tabs.update(tabs[tabs.length - 1].id, { active: true }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'J'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.SHIFT, 'J'); let current = await browser.tabs.query({ windowId: win.id }); assert(current[0].active) @@ -148,7 +152,7 @@ describe("tab test", () => { it('selects first tab by g0', async () => { await browser.tabs.update(tabs[2].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('g', '0'); let current = await browser.tabs.query({ windowId: win.id }); @@ -157,7 +161,7 @@ describe("tab test", () => { it('selects last tab by g$', async () => { await browser.tabs.update(tabs[2].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('g', '$'); let current = await browser.tabs.query({ windowId: win.id }); @@ -168,8 +172,8 @@ describe("tab test", () => { await browser.tabs.update(tabs[1].id, { active: true }); await browser.tabs.update(tabs[4].id, { active: true }); - let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Control, '6'); + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(Key.CONTROL, '6'); let current = await browser.tabs.query({ windowId: win.id }); assert(current[1].active) @@ -179,7 +183,7 @@ describe("tab test", () => { // This might be a bug in Firefox. it.skip('reopen tab by u', async () => { await browser.tabs.remove(tabs[1].id); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('u'); let current = await browser.tabs.query({ windowId: win.id }); @@ -188,7 +192,7 @@ describe("tab test", () => { it('does not delete pinned tab by d', async () => { await browser.tabs.update(tabs[0].id, { active: true, pinned: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('d'); let current = await browser.tabs.query({ windowId: win.id }); @@ -197,7 +201,7 @@ describe("tab test", () => { it('deletes pinned tab by !d', async () => { await browser.tabs.update(tabs[0].id, { active: true, pinned: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('!', 'd'); let current = await browser.tabs.query({ windowId: win.id }); @@ -206,7 +210,7 @@ describe("tab test", () => { it('opens view-source by gf', async () => { await browser.tabs.update(tabs[0].id, { active: true }); - let body = await session.findElementByCSS('body'); + let body = await webdriver.findElement(By.css('body')); await body.sendKeys('g', 'f'); await eventually(async() => { diff --git a/e2e/zoom.test.js b/e2e/zoom.test.js index 186f67f..c11ed1e 100644 --- a/e2e/zoom.test.js +++ b/e2e/zoom.test.js @@ -1,36 +1,34 @@ const express = require('express'); -const lanthan = require('lanthan'); +const { Builder } = require('lanthan'); const path = require('path'); const assert = require('assert'); const eventually = require('./eventually'); - -const Key = lanthan.Key; +const { Key, By } = require('selenium-webdriver'); describe("zoom test", () => { - - let firefox; - let session; + let lanthan; + let webdriver; let browser; let tab; let body; before(async() => { - firefox = await lanthan.firefox(); - await firefox.session.installAddonFromPath(path.join(__dirname, '..')); - session = firefox.session; - browser = firefox.browser; + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); tab = (await browser.tabs.query({}))[0] }); after(async() => { - if (firefox) { - await firefox.close(); - } + await lanthan.quit(); }); beforeEach(async() => { - await session.navigateTo('about:blank'); - body = await session.findElementByCSS('body'); + await webdriver.navigate().to('about:blank'); + body = await webdriver.findElement(By.css('body')); }); it('should zoom in by zi', async () => { -- cgit v1.2.3 From 7e77e31ad64c3649888eae337e0c984fd9c2ea2a Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 22 Sep 2019 16:13:12 +0900 Subject: Migrate e2e tests to TypeScript --- e2e/blacklist.test.js | 76 ----------- e2e/blacklist.test.ts | 74 +++++++++++ e2e/clipboard.test.js | 123 ------------------ e2e/clipboard.test.ts | 125 ++++++++++++++++++ e2e/command_addbookmark.test.js | 64 ---------- e2e/command_addbookmark.test.ts | 66 ++++++++++ e2e/command_bdelete.test.js | 199 ----------------------------- e2e/command_bdelete.test.ts | 201 +++++++++++++++++++++++++++++ e2e/command_buffer.test.js | 198 ---------------------------- e2e/command_buffer.test.ts | 200 +++++++++++++++++++++++++++++ e2e/command_open.test.js | 146 --------------------- e2e/command_open.test.ts | 148 +++++++++++++++++++++ e2e/command_quit.test.js | 121 ------------------ e2e/command_quit.test.ts | 124 ++++++++++++++++++ e2e/command_tabopen.test.js | 157 ----------------------- e2e/command_tabopen.test.ts | 160 +++++++++++++++++++++++ e2e/command_winopen.test.js | 168 ------------------------ e2e/command_winopen.test.ts | 170 +++++++++++++++++++++++++ e2e/completion.test.js | 133 ------------------- e2e/completion.test.ts | 135 ++++++++++++++++++++ e2e/completion_buffers.test.js | 211 ------------------------------ e2e/completion_buffers.test.ts | 213 +++++++++++++++++++++++++++++++ e2e/completion_open.test.js | 256 ------------------------------------- e2e/completion_open.test.ts | 257 +++++++++++++++++++++++++++++++++++++ e2e/completion_set.test.js | 73 ----------- e2e/completion_set.test.ts | 71 +++++++++++ e2e/console.test.js | 128 ------------------- e2e/console.test.ts | 126 ++++++++++++++++++ e2e/eventually.js | 23 ---- e2e/eventually.ts | 30 +++++ e2e/follow.test.js | 263 -------------------------------------- e2e/follow.test.ts | 265 ++++++++++++++++++++++++++++++++++++++ e2e/follow_properties.test.js | 180 -------------------------- e2e/follow_properties.test.ts | 174 +++++++++++++++++++++++++ e2e/lib/Console.js | 43 ------- e2e/lib/Console.ts | 49 +++++++ e2e/lib/clipboard.js | 63 --------- e2e/lib/clipboard.ts | 66 ++++++++++ e2e/mark.test.js | 124 ------------------ e2e/mark.test.ts | 126 ++++++++++++++++++ e2e/navigate.test.js | 274 --------------------------------------- e2e/navigate.test.ts | 276 ++++++++++++++++++++++++++++++++++++++++ e2e/options.test.js | 97 -------------- e2e/options.test.ts | 98 ++++++++++++++ e2e/options_form.test.js | 122 ------------------ e2e/options_form.test.ts | 124 ++++++++++++++++++ e2e/repeat.test.js | 95 -------------- e2e/repeat.test.ts | 94 ++++++++++++++ e2e/scroll.test.js | 153 ---------------------- e2e/scroll.test.ts | 154 ++++++++++++++++++++++ e2e/settings.js | 86 ------------- e2e/settings.ts | 86 +++++++++++++ e2e/tab.test.js | 222 -------------------------------- e2e/tab.test.ts | 222 ++++++++++++++++++++++++++++++++ e2e/zoom.test.js | 64 ---------- e2e/zoom.test.ts | 65 ++++++++++ 56 files changed, 3899 insertions(+), 3862 deletions(-) delete mode 100644 e2e/blacklist.test.js create mode 100644 e2e/blacklist.test.ts delete mode 100644 e2e/clipboard.test.js create mode 100644 e2e/clipboard.test.ts delete mode 100644 e2e/command_addbookmark.test.js create mode 100644 e2e/command_addbookmark.test.ts delete mode 100644 e2e/command_bdelete.test.js create mode 100644 e2e/command_bdelete.test.ts delete mode 100644 e2e/command_buffer.test.js create mode 100644 e2e/command_buffer.test.ts delete mode 100644 e2e/command_open.test.js create mode 100644 e2e/command_open.test.ts delete mode 100644 e2e/command_quit.test.js create mode 100644 e2e/command_quit.test.ts delete mode 100644 e2e/command_tabopen.test.js create mode 100644 e2e/command_tabopen.test.ts delete mode 100644 e2e/command_winopen.test.js create mode 100644 e2e/command_winopen.test.ts delete mode 100644 e2e/completion.test.js create mode 100644 e2e/completion.test.ts delete mode 100644 e2e/completion_buffers.test.js create mode 100644 e2e/completion_buffers.test.ts delete mode 100644 e2e/completion_open.test.js create mode 100644 e2e/completion_open.test.ts delete mode 100644 e2e/completion_set.test.js create mode 100644 e2e/completion_set.test.ts delete mode 100644 e2e/console.test.js create mode 100644 e2e/console.test.ts delete mode 100644 e2e/eventually.js create mode 100644 e2e/eventually.ts delete mode 100644 e2e/follow.test.js create mode 100644 e2e/follow.test.ts delete mode 100644 e2e/follow_properties.test.js create mode 100644 e2e/follow_properties.test.ts delete mode 100644 e2e/lib/Console.js create mode 100644 e2e/lib/Console.ts delete mode 100644 e2e/lib/clipboard.js create mode 100644 e2e/lib/clipboard.ts delete mode 100644 e2e/mark.test.js create mode 100644 e2e/mark.test.ts delete mode 100644 e2e/navigate.test.js create mode 100644 e2e/navigate.test.ts delete mode 100644 e2e/options.test.js create mode 100644 e2e/options.test.ts delete mode 100644 e2e/options_form.test.js create mode 100644 e2e/options_form.test.ts delete mode 100644 e2e/repeat.test.js create mode 100644 e2e/repeat.test.ts delete mode 100644 e2e/scroll.test.js create mode 100644 e2e/scroll.test.ts delete mode 100644 e2e/settings.js create mode 100644 e2e/settings.ts delete mode 100644 e2e/tab.test.js create mode 100644 e2e/tab.test.ts delete mode 100644 e2e/zoom.test.js create mode 100644 e2e/zoom.test.ts (limited to 'e2e') diff --git a/e2e/blacklist.test.js b/e2e/blacklist.test.js deleted file mode 100644 index 8a8996e..0000000 --- a/e2e/blacklist.test.js +++ /dev/null @@ -1,76 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/*', (req, res) => { - res.status(200).send(` - - -`); - }); - return app; -}; - -describe("navigate test", () => { - - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - - before(async() => { - http = newApp().listen(port); - - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - }); - - after(async() => { - if (lanthan) { - await lanthan.quit(); - } - http.close(); - }); - - it('should disable add-on if the URL is in the blacklist', async () => { - await browser.storage.local.set({ - settings: { - source: 'json', - json: `{ - "keymaps": { - "j": { "type": "scroll.vertically", "count": 1 } - }, - "blacklist": [ "127.0.0.1:${port}/a" ] - }`, - }, - }); - - await webdriver.navigate().to(`http://127.0.0.1:${port}/a`); - - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys('j'); - - // not works - let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); - assert.equal(pageYOffset, 0); - - await webdriver.navigate().to(`http://127.0.0.1:${port}/ab`); - body = await webdriver.findElement(By.css('body')); - await body.sendKeys('j'); - - // works - pageYOffset = await webdriver.executeScript(() => window.pageYOffset); - assert.equal(pageYOffset, 64); - }); -}); - diff --git a/e2e/blacklist.test.ts b/e2e/blacklist.test.ts new file mode 100644 index 0000000..c88f655 --- /dev/null +++ b/e2e/blacklist.test.ts @@ -0,0 +1,74 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, By } from 'selenium-webdriver'; +import * as http from 'http'; + +const newApp = () => { + let app = express(); + app.get('/*', (_req, res) => { + res.status(200).send(` + + +`); + }); + return app; +}; + +describe("navigate test", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + + before(async() => { + http = newApp().listen(port); + + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + }); + + after(async() => { + if (lanthan) { + await lanthan.quit(); + } + http.close(); + }); + + it('should disable add-on if the URL is in the blacklist', async () => { + await browser.storage.local.set({ + settings: { + source: 'json', + json: `{ + "keymaps": { + "j": { "type": "scroll.vertically", "count": 1 } + }, + "blacklist": [ "127.0.0.1:${port}/a" ] + }`, + }, + }); + + await webdriver.navigate().to(`http://127.0.0.1:${port}/a`); + + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys('j'); + + // not works + let pageYOffset = await webdriver.executeScript(() => window.pageYOffset); + assert.equal(pageYOffset, 0); + + await webdriver.navigate().to(`http://127.0.0.1:${port}/ab`); + body = await webdriver.findElement(By.css('body')); + await body.sendKeys('j'); + + // works + pageYOffset = await webdriver.executeScript(() => window.pageYOffset); + assert.equal(pageYOffset, 64); + }); +}); diff --git a/e2e/clipboard.test.js b/e2e/clipboard.test.js deleted file mode 100644 index df31770..0000000 --- a/e2e/clipboard.test.js +++ /dev/null @@ -1,123 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const clipboard = require('./lib/clipboard'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/', (req, res) => { - res.status(200).send(``); - }); - return app; -}; - -describe("navigate test", () => { - - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - - before(async() => { - http = newApp().listen(port); - - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - if (lanthan) { - await lanthan.quit(); - } - http.close(); - }); - - beforeEach(async() => { - let tabs = await browser.tabs.query({}); - for (let tab of tabs.slice(1)) { - await browser.tabs.remove(tab.id); - } - }) - - it('should copy current URL by y', async () => { - await webdriver.navigate().to(`http://127.0.0.1:${port}/#should_copy_url`); - let body = await webdriver.findElement(By.css('body')); - - await body.sendKeys('y'); - await eventually(async() => { - let data = await clipboard.read(); - assert.equal(data, `http://127.0.0.1:${port}/#should_copy_url`); - }); - }); - - it('should open an URL from clipboard by p', async () => { - await webdriver.navigate().to(`http://127.0.0.1:${port}/`); - let body = await webdriver.findElement(By.css('body')); - - await clipboard.write(`http://127.0.0.1:${port}/#open_from_clipboard`); - await body.sendKeys('p'); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].url, `http://127.0.0.1:${port}/#open_from_clipboard`); - }); - }); - - it('should open an URL from clipboard to new tab by P', async () => { - await webdriver.navigate().to(`http://127.0.0.1:${port}/`); - let body = await webdriver.findElement(By.css('body')); - - await clipboard.write(`http://127.0.0.1:${port}/#open_to_new_tab`); - await body.sendKeys(Key.SHIFT, 'p'); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.deepEqual(tabs.map(t => t.url), [ - `http://127.0.0.1:${port}/`, - `http://127.0.0.1:${port}/#open_to_new_tab`, - ]); - }); - }); - - it('should open search result with keywords in clipboard by p', async () => { - await webdriver.navigate().to(`http://127.0.0.1:${port}/`); - let body = await webdriver.findElement(By.css('body')); - - await clipboard.write(`an apple`); - await body.sendKeys('p'); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs[0].url, `http://127.0.0.1:${port}/google?q=an%20apple`); - }); - }); - - it('should open search result with keywords in clipboard to new tabby P', async () => { - await webdriver.navigate().to(`http://127.0.0.1:${port}/`); - let body = await webdriver.findElement(By.css('body')); - - await clipboard.write(`an apple`); - await body.sendKeys(Key.SHIFT, 'p'); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.deepEqual(tabs.map(t => t.url), [ - `http://127.0.0.1:${port}/`, - `http://127.0.0.1:${port}/google?q=an%20apple`, - ]); - }); - }); -}); diff --git a/e2e/clipboard.test.ts b/e2e/clipboard.test.ts new file mode 100644 index 0000000..dbc00de --- /dev/null +++ b/e2e/clipboard.test.ts @@ -0,0 +1,125 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import eventually from './eventually'; +import * as clipboard from './lib/clipboard'; +import settings from './settings'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + let app = express(); + app.get('/', (_req, res) => { + res.status(200).send(``); + }); + return app; +}; + +describe("navigate test", () => { + + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + + before(async() => { + http = newApp().listen(port); + + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + if (lanthan) { + await lanthan.quit(); + } + http.close(); + }); + + beforeEach(async() => { + let tabs = await browser.tabs.query({}); + for (let tab of tabs.slice(1)) { + await browser.tabs.remove(tab.id); + } + }) + + it('should copy current URL by y', async () => { + await webdriver.navigate().to(`http://127.0.0.1:${port}/#should_copy_url`); + let body = await webdriver.findElement(By.css('body')); + + await body.sendKeys('y'); + await eventually(async() => { + let data = await clipboard.read(); + assert.equal(data, `http://127.0.0.1:${port}/#should_copy_url`); + }); + }); + + it('should open an URL from clipboard by p', async () => { + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); + + await clipboard.write(`http://127.0.0.1:${port}/#open_from_clipboard`); + await body.sendKeys('p'); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].url, `http://127.0.0.1:${port}/#open_from_clipboard`); + }); + }); + + it('should open an URL from clipboard to new tab by P', async () => { + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); + + await clipboard.write(`http://127.0.0.1:${port}/#open_to_new_tab`); + await body.sendKeys(Key.SHIFT, 'p'); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.deepEqual(tabs.map((t: any) => t.url), [ + `http://127.0.0.1:${port}/`, + `http://127.0.0.1:${port}/#open_to_new_tab`, + ]); + }); + }); + + it('should open search result with keywords in clipboard by p', async () => { + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); + + await clipboard.write(`an apple`); + await body.sendKeys('p'); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs[0].url, `http://127.0.0.1:${port}/google?q=an%20apple`); + }); + }); + + it('should open search result with keywords in clipboard to new tabby P', async () => { + await webdriver.navigate().to(`http://127.0.0.1:${port}/`); + let body = await webdriver.findElement(By.css('body')); + + await clipboard.write(`an apple`); + await body.sendKeys(Key.SHIFT, 'p'); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.deepEqual(tabs.map((t: any) => t.url), [ + `http://127.0.0.1:${port}/`, + `http://127.0.0.1:${port}/google?q=an%20apple`, + ]); + }); + }); +}); diff --git a/e2e/command_addbookmark.test.js b/e2e/command_addbookmark.test.js deleted file mode 100644 index 68d1c6d..0000000 --- a/e2e/command_addbookmark.test.js +++ /dev/null @@ -1,64 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/happy', (req, res) => { - res.send(` - - - how to be happy - -`); - }); - return app; -}; - -describe('addbookmark command test', () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - - before(async() => { - http = newApp().listen(port); - - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - await webdriver.navigate().to(`http://127.0.0.1:${port}/happy`); - }); - - it('should add a bookmark from the current page', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('addbookmark how to be happy', Key.ENTER); - - await eventually(async() => { - var bookmarks = await browser.bookmarks.search({ title: 'how to be happy' }); - assert.equal(bookmarks.length, 1); - assert.equal(bookmarks[0].url, `http://127.0.0.1:${port}/happy`); - }); - }); -}); diff --git a/e2e/command_addbookmark.test.ts b/e2e/command_addbookmark.test.ts new file mode 100644 index 0000000..ad94494 --- /dev/null +++ b/e2e/command_addbookmark.test.ts @@ -0,0 +1,66 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + let app = express(); + app.get('/happy', (_req, res) => { + res.send(` + + + how to be happy + +`); + }); + return app; +}; + +describe('addbookmark command test', () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + + before(async() => { + http = newApp().listen(port); + + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + await webdriver.navigate().to(`http://127.0.0.1:${port}/happy`); + }); + + it('should add a bookmark from the current page', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('addbookmark how to be happy', Key.ENTER); + + await eventually(async() => { + var bookmarks = await browser.bookmarks.search({ title: 'how to be happy' }); + assert.equal(bookmarks.length, 1); + assert.equal(bookmarks[0].url, `http://127.0.0.1:${port}/happy`); + }); + }); +}); diff --git a/e2e/command_bdelete.test.js b/e2e/command_bdelete.test.js deleted file mode 100644 index aae5b67..0000000 --- a/e2e/command_bdelete.test.js +++ /dev/null @@ -1,199 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/*', (req, res) => { - res.send(` - - - my_${req.path.slice(1)} - -

${req.path}

-`); - }); - return app; -}; - -describe('bdelete/bdeletes command test', () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - - before(async() => { - http = newApp().listen(port); - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - let tabs = await browser.tabs.query({}); - for (let tab of tabs.slice(1)) { - await browser.tabs.remove(tab.id); - } - await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1`, pinned: true }); - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site2`, pinned: true }) - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site3`, pinned: true }) - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site4` }) - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site5` }) - - await eventually(async() => { - let handles = await webdriver.getAllWindowHandles(); - assert.equal(handles.length, 5); - await webdriver.switchTo().window(handles[2]); - await webdriver.findElement(By.css('iframe')); - }); - - await new Promise((resolve) => setTimeout(resolve, 100)); - }); - - it('should delete an unpinned tab by bdelete command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdelete site5', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.deepEqual(tabs.map(t => t.url), [ - `http://127.0.0.1:${port}/site1`, - `http://127.0.0.1:${port}/site2`, - `http://127.0.0.1:${port}/site3`, - `http://127.0.0.1:${port}/site4`, - ]) - }); - }); - - it('should not delete an pinned tab by bdelete command by bdelete command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdelete site1', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 5); - }); - }); - - it('should show an error when no tabs are matched by bdelete command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdelete xyz', Key.ENTER); - - await eventually(async() => { - let p = await webdriver.findElement(By.css('.vimvixen-console-error')); - let text = await p.getText(); - assert.equal(text, 'No matching buffer for xyz'); - }); - }); - - it('should show an error when more than one tabs are matched by bdelete command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdelete site', Key.ENTER); - - await eventually(async() => { - let p = await webdriver.findElement(By.css('.vimvixen-console-error')); - let text = await p.getText(); - assert.equal(text, 'More than one match for site'); - }); - }); - - it('should delete an unpinned tab by bdelete! command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdelete! site5', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.deepEqual(tabs.map(t => t.url), [ - `http://127.0.0.1:${port}/site1`, - `http://127.0.0.1:${port}/site2`, - `http://127.0.0.1:${port}/site3`, - `http://127.0.0.1:${port}/site4`, - ]) - }); - }); - - it('should delete an pinned tab by bdelete! command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdelete! site1', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.deepEqual(tabs.map(t => t.url), [ - `http://127.0.0.1:${port}/site2`, - `http://127.0.0.1:${port}/site3`, - `http://127.0.0.1:${port}/site4`, - `http://127.0.0.1:${port}/site5`, - ]) - }); - }); - - it('should delete unpinned tabs by bdeletes command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdeletes site', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.deepEqual(tabs.map(t => t.url), [ - `http://127.0.0.1:${port}/site1`, - `http://127.0.0.1:${port}/site2`, - `http://127.0.0.1:${port}/site3`, - ]) - }); - }); - - it('should delete both pinned and unpinned tabs by bdeletes! command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('bdeletes! site', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 1); - }); - }); -}); diff --git a/e2e/command_bdelete.test.ts b/e2e/command_bdelete.test.ts new file mode 100644 index 0000000..ce54b23 --- /dev/null +++ b/e2e/command_bdelete.test.ts @@ -0,0 +1,201 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + let app = express(); + app.get('/*', (req, res) => { + res.send(` + + + my_${req.path.slice(1)} + +

${req.path}

+`); + }); + return app; +}; + +describe('bdelete/bdeletes command test', () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + + before(async() => { + http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + let tabs = await browser.tabs.query({}); + for (let tab of tabs.slice(1)) { + await browser.tabs.remove(tab.id); + } + await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1`, pinned: true }); + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site2`, pinned: true }) + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site3`, pinned: true }) + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site4` }) + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site5` }) + + await eventually(async() => { + let handles = await webdriver.getAllWindowHandles(); + assert.equal(handles.length, 5); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); + }); + + await new Promise((resolve) => setTimeout(resolve, 100)); + }); + + it('should delete an unpinned tab by bdelete command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete site5', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.deepEqual(tabs.map((t: any) => t.url), [ + `http://127.0.0.1:${port}/site1`, + `http://127.0.0.1:${port}/site2`, + `http://127.0.0.1:${port}/site3`, + `http://127.0.0.1:${port}/site4`, + ]) + }); + }); + + it('should not delete an pinned tab by bdelete command by bdelete command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete site1', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 5); + }); + }); + + it('should show an error when no tabs are matched by bdelete command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete xyz', Key.ENTER); + + await eventually(async() => { + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); + let text = await p.getText(); + assert.equal(text, 'No matching buffer for xyz'); + }); + }); + + it('should show an error when more than one tabs are matched by bdelete command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete site', Key.ENTER); + + await eventually(async() => { + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); + let text = await p.getText(); + assert.equal(text, 'More than one match for site'); + }); + }); + + it('should delete an unpinned tab by bdelete! command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete! site5', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.deepEqual(tabs.map((t: any) => t.url), [ + `http://127.0.0.1:${port}/site1`, + `http://127.0.0.1:${port}/site2`, + `http://127.0.0.1:${port}/site3`, + `http://127.0.0.1:${port}/site4`, + ]) + }); + }); + + it('should delete an pinned tab by bdelete! command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdelete! site1', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.deepEqual(tabs.map((t: any) => t.url), [ + `http://127.0.0.1:${port}/site2`, + `http://127.0.0.1:${port}/site3`, + `http://127.0.0.1:${port}/site4`, + `http://127.0.0.1:${port}/site5`, + ]) + }); + }); + + it('should delete unpinned tabs by bdeletes command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdeletes site', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.deepEqual(tabs.map((t: any) => t.url), [ + `http://127.0.0.1:${port}/site1`, + `http://127.0.0.1:${port}/site2`, + `http://127.0.0.1:${port}/site3`, + ]) + }); + }); + + it('should delete both pinned and unpinned tabs by bdeletes! command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('bdeletes! site', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 1); + }); + }); +}); diff --git a/e2e/command_buffer.test.js b/e2e/command_buffer.test.js deleted file mode 100644 index b3336dc..0000000 --- a/e2e/command_buffer.test.js +++ /dev/null @@ -1,198 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/*', (req, res) => { - res.send(` - - - my_${req.path.slice(1)} - -

${req.path}

-`); - }); - return app; -}; - -describe('buffer command test', () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - - before(async() => { - http = newApp().listen(port); - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - let tabs = await browser.tabs.query({}); - for (let tab of tabs.slice(1)) { - await browser.tabs.remove(tab.id); - } - await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1` }); - for (let i = 2; i <= 5; ++i) { - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site${i}`}) - } - - await eventually(async() => { - let handles = await webdriver.getAllWindowHandles(); - assert.equal(handles.length, 5); - await webdriver.switchTo().window(handles[2]); - await webdriver.findElement(By.css('iframe')); - }); - - await new Promise((resolve) => setTimeout(resolve, 100)); - }); - - it('should do nothing by buffer command with no parameters', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 2); - }); - }); - - it('should select a tab by buffer command with a number', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 2); - }); - }); - - it('should should an out of range error by buffer commands', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer 0', Key.ENTER); - - await eventually(async() => { - let p = await webdriver.findElement(By.css('.vimvixen-console-error')); - let text = await p.getText(); - assert.equal(text, 'tab 0 does not exist'); - }); - - await webdriver.switchTo().parentFrame(); - body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer 9', Key.ENTER); - - await eventually(async() => { - let p = await webdriver.findElement(By.css('.vimvixen-console-error')); - let text = await p.getText(); - assert.equal(text, 'tab 9 does not exist'); - }); - }); - - it('should select a tab by buffer command with a title', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer my_site1', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 0); - }); - }); - - it('should select a tab by buffer command with an URL', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer /site1', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 0); - }); - }); - - it('should select tabs rotately', async() => { - let handles = await webdriver.getAllWindowHandles(); - await webdriver.switchTo().window(handles[4]); - - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer site', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 0); - }); - }); - - it('should do nothing by ":buffer %"', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer %', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 2); - }); - }); - - it('should selects last selected tab by ":buffer #"', async() => { - let handles = await webdriver.getAllWindowHandles(); - await webdriver.switchTo().window(handles[1]); - - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('buffer #', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - assert.equal(tabs[0].index, 2); - }); - }); -}); diff --git a/e2e/command_buffer.test.ts b/e2e/command_buffer.test.ts new file mode 100644 index 0000000..e642673 --- /dev/null +++ b/e2e/command_buffer.test.ts @@ -0,0 +1,200 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + let app = express(); + app.get('/*', (req, res) => { + res.send(` + + + my_${req.path.slice(1)} + +

${req.path}

+`); + }); + return app; +}; + +describe('buffer command test', () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + + before(async() => { + http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + let tabs = await browser.tabs.query({}); + for (let tab of tabs.slice(1)) { + await browser.tabs.remove(tab.id); + } + await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1` }); + for (let i = 2; i <= 5; ++i) { + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site${i}`}) + } + + await eventually(async() => { + let handles = await webdriver.getAllWindowHandles(); + assert.equal(handles.length, 5); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); + }); + + await new Promise((resolve) => setTimeout(resolve, 100)); + }); + + it('should do nothing by buffer command with no parameters', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 2); + }); + }); + + it('should select a tab by buffer command with a number', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 2); + }); + }); + + it('should should an out of range error by buffer commands', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer 0', Key.ENTER); + + await eventually(async() => { + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); + let text = await p.getText(); + assert.equal(text, 'tab 0 does not exist'); + }); + + await (webdriver.switchTo() as any).parentFrame(); + body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer 9', Key.ENTER); + + await eventually(async() => { + let p = await webdriver.findElement(By.css('.vimvixen-console-error')); + let text = await p.getText(); + assert.equal(text, 'tab 9 does not exist'); + }); + }); + + it('should select a tab by buffer command with a title', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer my_site1', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 0); + }); + }); + + it('should select a tab by buffer command with an URL', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer /site1', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 0); + }); + }); + + it('should select tabs rotately', async() => { + let handles = await webdriver.getAllWindowHandles(); + await webdriver.switchTo().window(handles[4]); + + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer site', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 0); + }); + }); + + it('should do nothing by ":buffer %"', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer %', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 2); + }); + }); + + it('should selects last selected tab by ":buffer #"', async() => { + let handles = await webdriver.getAllWindowHandles(); + await webdriver.switchTo().window(handles[1]); + + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('buffer #', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + assert.equal(tabs[0].index, 2); + }); + }); +}); diff --git a/e2e/command_open.test.js b/e2e/command_open.test.js deleted file mode 100644 index ccf7393..0000000 --- a/e2e/command_open.test.js +++ /dev/null @@ -1,146 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - - let app = express(); - for (let name of ['google', 'yahoo', 'bing', 'duckduckgo', 'twitter', 'wikipedia']) { - app.get('/' + name, (req, res) => { - res.send(` - -

${name.charAt(0).toUpperCase() + name.slice(1)}

-`); - }); - } - app.get('/', (req, res) => { - res.send(` - -

home

-`); - }); - return app; -}; - -describe("open command test", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let body; - - before(async() => { - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - http = newApp().listen(port); - - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - await webdriver.navigate().to(`http://127.0.0.1:${port}`); - body = await webdriver.findElement(By.css('body')); - }) - - it('should open default search for keywords by open command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('open an apple', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }); - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/google?q=an%20apple`) - }); - }); - - it('should open certain search page for keywords by open command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('open yahoo an apple', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }) - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=an%20apple`) - }); - }); - - it('should open default engine with empty keywords by open command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('open', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }) - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/google?q=`) - }); - }); - - it('should open certain search page for empty keywords by open command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('open yahoo', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }) - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=`) - }); - }); - - it('should open a site with domain by open command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('open i-beam.org', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }) - let url = new URL(tabs[0].url); - assert.equal(url.href, 'https://i-beam.org/') - }); - }); - - it('should open a site with URL by open command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('open https://i-beam.org', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({ active: true }) - let url = new URL(tabs[0].url); - assert.equal(url.href, 'https://i-beam.org/') - }); - }); -}); diff --git a/e2e/command_open.test.ts b/e2e/command_open.test.ts new file mode 100644 index 0000000..cfaee15 --- /dev/null +++ b/e2e/command_open.test.ts @@ -0,0 +1,148 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + + let app = express(); + for (let name of ['google', 'yahoo', 'bing', 'duckduckgo', 'twitter', 'wikipedia']) { + app.get('/' + name, (_req, res) => { + res.send(` + +

${name.charAt(0).toUpperCase() + name.slice(1)}

+`); + }); + } + app.get('/', (_req, res) => { + res.send(` + +

home

+`); + }); + return app; +}; + +describe("open command test", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + http = newApp().listen(port); + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); + }) + + it('should open default search for keywords by open command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open an apple', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }); + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/google?q=an%20apple`) + }); + }); + + it('should open certain search page for keywords by open command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open yahoo an apple', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }) + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=an%20apple`) + }); + }); + + it('should open default engine with empty keywords by open command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }) + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/google?q=`) + }); + }); + + it('should open certain search page for empty keywords by open command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open yahoo', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }) + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=`) + }); + }); + + it('should open a site with domain by open command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open i-beam.org', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }) + let url = new URL(tabs[0].url); + assert.equal(url.href, 'https://i-beam.org/') + }); + }); + + it('should open a site with URL by open command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('open https://i-beam.org', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({ active: true }) + let url = new URL(tabs[0].url); + assert.equal(url.href, 'https://i-beam.org/') + }); + }); +}); diff --git a/e2e/command_quit.test.js b/e2e/command_quit.test.js deleted file mode 100644 index 07e770a..0000000 --- a/e2e/command_quit.test.js +++ /dev/null @@ -1,121 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/*', (req, res) => { - res.send(` - - - my_${req.path.slice(1)} - -

${req.path}

-`); - }); - return app; -}; - -describe('quit/quitall command test', () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - - before(async() => { - http = newApp().listen(port); - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - let tabs = await browser.tabs.query({}); - for (let tab of tabs.slice(1)) { - await browser.tabs.remove(tab.id); - } - await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1` }); - for (let i = 2; i <= 5; ++i) { - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site${i}`}) - } - - await eventually(async() => { - let handles = await webdriver.getAllWindowHandles(); - assert.equal(handles.length, 5); - await webdriver.switchTo().window(handles[2]); - await webdriver.findElement(By.css('iframe')); - }); - - await new Promise((resolve) => setTimeout(resolve, 100)); - }); - - it('should current tab by q command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('q', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 4) - }); - }); - - it('should current tab by quit command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('quit', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 4) - }); - }); - - it('should current tab by qa command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('qa', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 1) - }); - }); - - it('should current tab by quitall command', async() => { - let body = await webdriver.findElement(By.css('body')); - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - await input.sendKeys('quitall', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 1) - }); - }); -}); diff --git a/e2e/command_quit.test.ts b/e2e/command_quit.test.ts new file mode 100644 index 0000000..29b947a --- /dev/null +++ b/e2e/command_quit.test.ts @@ -0,0 +1,124 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, By, Key } from 'selenium-webdriver'; + + +const newApp = () => { + let app = express(); + app.get('/*', (req, res) => { + res.send(` + + + my_${req.path.slice(1)} + +

${req.path}

+`); + }); + return app; +}; + +describe('quit/quitall command test', () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + + before(async() => { + http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + let tabs = await browser.tabs.query({}); + for (let tab of tabs.slice(1)) { + await browser.tabs.remove(tab.id); + } + await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1` }); + for (let i = 2; i <= 5; ++i) { + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site${i}`}) + } + + await eventually(async() => { + let handles = await webdriver.getAllWindowHandles(); + assert.equal(handles.length, 5); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); + }); + + await new Promise((resolve) => setTimeout(resolve, 100)); + }); + + it('should current tab by q command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('q', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 4) + }); + }); + + it('should current tab by quit command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('quit', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 4) + }); + }); + + it('should current tab by qa command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('qa', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 1) + }); + }); + + it('should current tab by quitall command', async() => { + let body = await webdriver.findElement(By.css('body')); + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + await input.sendKeys('quitall', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 1) + }); + }); +}); diff --git a/e2e/command_tabopen.test.js b/e2e/command_tabopen.test.js deleted file mode 100644 index 78f5d7f..0000000 --- a/e2e/command_tabopen.test.js +++ /dev/null @@ -1,157 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - - let app = express(); - for (let name of ['google', 'yahoo', 'bing', 'duckduckgo', 'twitter', 'wikipedia']) { - app.get('/' + name, (req, res) => { - res.send(` - -

${name.charAt(0).toUpperCase() + name.slice(1)}

-`); - }); - } - app.get('/', (req, res) => { - res.send(` - -

home

-`); - }); - return app; -}; - -describe("tabopen command test", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let body; - - before(async() => { - http = newApp().listen(port); - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - let tabs = await browser.tabs.query({}); - for (let tab of tabs.slice(1)) { - await browser.tabs.remove(tab.id); - } - - await webdriver.navigate().to(`http://127.0.0.1:${port}`); - body = await webdriver.findElement(By.css('body')); - }) - - it('should open default search for keywords by tabopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('tabopen an apple', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 2); - let url = new URL(tabs[1].url); - assert.equal(url.href, `http://127.0.0.1:${port}/google?q=an%20apple`) - }); - }); - - it('should open certain search page for keywords by tabopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('tabopen yahoo an apple', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 2); - let url = new URL(tabs[1].url); - assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=an%20apple`) - }); - }); - - it('should open default engine with empty keywords by tabopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('tabopen', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 2); - let url = new URL(tabs[1].url); - assert.equal(url.href, `http://127.0.0.1:${port}/google?q=`) - }); - }); - - it('should open certain search page for empty keywords by tabopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('tabopen yahoo', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 2); - let url = new URL(tabs[1].url); - assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=`) - }); - }); - - it('should open a site with domain by tabopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('tabopen i-beam.org', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 2); - let url = new URL(tabs[1].url); - assert.equal(url.href, 'https://i-beam.org/') - }); - }); - - it('should open a site with URL by tabopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('tabopen https://i-beam.org', Key.ENTER); - - await eventually(async() => { - let tabs = await browser.tabs.query({}); - assert.equal(tabs.length, 2); - let url = new URL(tabs[1].url); - assert.equal(url.href, 'https://i-beam.org/') - }); - }); -}); diff --git a/e2e/command_tabopen.test.ts b/e2e/command_tabopen.test.ts new file mode 100644 index 0000000..ca4ad92 --- /dev/null +++ b/e2e/command_tabopen.test.ts @@ -0,0 +1,160 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By, Key } from 'selenium-webdriver'; + + +const newApp = () => { + + let app = express(); + for (let name of ['google', 'yahoo', 'bing', 'duckduckgo', 'twitter', 'wikipedia']) { + app.get('/' + name, (_req, res) => { + res.send(` + +

${name.charAt(0).toUpperCase() + name.slice(1)}

+`); + }); + } + app.get('/', (_req, res) => { + res.send(` + +

home

+`); + }); + return app; +}; + +describe("tabopen command test", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + let tabs = await browser.tabs.query({}); + for (let tab of tabs.slice(1)) { + await browser.tabs.remove(tab.id); + } + + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); + }) + + it('should open default search for keywords by tabopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen an apple', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 2); + let url = new URL(tabs[1].url); + assert.equal(url.href, `http://127.0.0.1:${port}/google?q=an%20apple`) + }); + }); + + it('should open certain search page for keywords by tabopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen yahoo an apple', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 2); + let url = new URL(tabs[1].url); + assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=an%20apple`) + }); + }); + + it('should open default engine with empty keywords by tabopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 2); + let url = new URL(tabs[1].url); + assert.equal(url.href, `http://127.0.0.1:${port}/google?q=`) + }); + }); + + it('should open certain search page for empty keywords by tabopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen yahoo', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 2); + let url = new URL(tabs[1].url); + assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=`) + }); + }); + + it('should open a site with domain by tabopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen i-beam.org', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 2); + let url = new URL(tabs[1].url); + assert.equal(url.href, 'https://i-beam.org/') + }); + }); + + it('should open a site with URL by tabopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('tabopen https://i-beam.org', Key.ENTER); + + await eventually(async() => { + let tabs = await browser.tabs.query({}); + assert.equal(tabs.length, 2); + let url = new URL(tabs[1].url); + assert.equal(url.href, 'https://i-beam.org/') + }); + }); +}); diff --git a/e2e/command_winopen.test.js b/e2e/command_winopen.test.js deleted file mode 100644 index 149d775..0000000 --- a/e2e/command_winopen.test.js +++ /dev/null @@ -1,168 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - - let app = express(); - for (let name of ['google', 'yahoo', 'bing', 'duckduckgo', 'twitter', 'wikipedia']) { - app.get('/' + name, (req, res) => { - res.send(` - -

${name.charAt(0).toUpperCase() + name.slice(1)}

-`); - }); - } - app.get('/', (req, res) => { - res.send(` - -

home

-`); - }); - return app; -}; - -describe("winopen command test", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let body; - - before(async() => { - http = newApp().listen(port); - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - let wins = await browser.windows.getAll(); - for (let win of wins.slice(1)) { - await browser.windows.remove(win.id); - } - - await webdriver.navigate().to(`http://127.0.0.1:${port}`); - body = await webdriver.findElement(By.css('body')); - }) - - it('should open default search for keywords by winopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('winopen an apple', Key.ENTER); - - await eventually(async() => { - let wins = await browser.windows.getAll(); - assert.equal(wins.length, 2); - - let tabs = await browser.tabs.query({ windowId: wins[1].id }); - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/google?q=an%20apple`) - }); - }); - - it('should open certain search page for keywords by winopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('winopen yahoo an apple', Key.ENTER); - - await eventually(async() => { - let wins = await browser.windows.getAll(); - assert.equal(wins.length, 2); - - let tabs = await browser.tabs.query({ windowId: wins[1].id }); - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=an%20apple`) - }); - }); - - it('should open default engine with empty keywords by winopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('winopen', Key.ENTER); - - await eventually(async() => { - let wins = await browser.windows.getAll(); - assert.equal(wins.length, 2); - - let tabs = await browser.tabs.query({ windowId: wins[1].id }); - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/google?q=`) - }); - }); - - it('should open certain search page for empty keywords by winopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('winopen yahoo', Key.ENTER); - - await eventually(async() => { - let wins = await browser.windows.getAll(); - assert.equal(wins.length, 2); - - let tabs = await browser.tabs.query({ windowId: wins[1].id }); - let url = new URL(tabs[0].url); - assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=`) - }); - }); - - it('should open a site with domain by winopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('winopen i-beam.org', Key.ENTER); - - await eventually(async() => { - let wins = await browser.windows.getAll(); - assert.equal(wins.length, 2); - - let tabs = await browser.tabs.query({ windowId: wins[1].id }); - let url = new URL(tabs[0].url); - assert.equal(url.href, 'https://i-beam.org/') - }); - }); - - it('should open a site with URL by winopen command ', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let input = await webdriver.findElement(By.css('input')); - input.sendKeys('winopen https://i-beam.org', Key.ENTER); - - await eventually(async() => { - let wins = await browser.windows.getAll(); - assert.equal(wins.length, 2); - - let tabs = await browser.tabs.query({ windowId: wins[1].id }); - let url = new URL(tabs[0].url); - assert.equal(url.href, 'https://i-beam.org/') - }); - }); -}); diff --git a/e2e/command_winopen.test.ts b/e2e/command_winopen.test.ts new file mode 100644 index 0000000..cdd4c1c --- /dev/null +++ b/e2e/command_winopen.test.ts @@ -0,0 +1,170 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + + let app = express(); + for (let name of ['google', 'yahoo', 'bing', 'duckduckgo', 'twitter', 'wikipedia']) { + app.get('/' + name, (_req, res) => { + res.send(` + +

${name.charAt(0).toUpperCase() + name.slice(1)}

+`); + }); + } + app.get('/', (_req, res) => { + res.send(` + +

home

+`); + }); + return app; +}; + +describe("winopen command test", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + let wins = await browser.windows.getAll(); + for (let win of wins.slice(1)) { + await browser.windows.remove(win.id); + } + + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); + }) + + it('should open default search for keywords by winopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen an apple', Key.ENTER); + + await eventually(async() => { + let wins = await browser.windows.getAll(); + assert.equal(wins.length, 2); + + let tabs = await browser.tabs.query({ windowId: wins[1].id }); + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/google?q=an%20apple`) + }); + }); + + it('should open certain search page for keywords by winopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen yahoo an apple', Key.ENTER); + + await eventually(async() => { + let wins = await browser.windows.getAll(); + assert.equal(wins.length, 2); + + let tabs = await browser.tabs.query({ windowId: wins[1].id }); + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=an%20apple`) + }); + }); + + it('should open default engine with empty keywords by winopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen', Key.ENTER); + + await eventually(async() => { + let wins = await browser.windows.getAll(); + assert.equal(wins.length, 2); + + let tabs = await browser.tabs.query({ windowId: wins[1].id }); + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/google?q=`) + }); + }); + + it('should open certain search page for empty keywords by winopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen yahoo', Key.ENTER); + + await eventually(async() => { + let wins = await browser.windows.getAll(); + assert.equal(wins.length, 2); + + let tabs = await browser.tabs.query({ windowId: wins[1].id }); + let url = new URL(tabs[0].url); + assert.equal(url.href, `http://127.0.0.1:${port}/yahoo?q=`) + }); + }); + + it('should open a site with domain by winopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen i-beam.org', Key.ENTER); + + await eventually(async() => { + let wins = await browser.windows.getAll(); + assert.equal(wins.length, 2); + + let tabs = await browser.tabs.query({ windowId: wins[1].id }); + let url = new URL(tabs[0].url); + assert.equal(url.href, 'https://i-beam.org/') + }); + }); + + it('should open a site with URL by winopen command ', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let input = await webdriver.findElement(By.css('input')); + input.sendKeys('winopen https://i-beam.org', Key.ENTER); + + await eventually(async() => { + let wins = await browser.windows.getAll(); + assert.equal(wins.length, 2); + + let tabs = await browser.tabs.query({ windowId: wins[1].id }); + let url = new URL(tabs[0].url); + assert.equal(url.href, 'https://i-beam.org/') + }); + }); +}); diff --git a/e2e/completion.test.js b/e2e/completion.test.js deleted file mode 100644 index fc87df0..0000000 --- a/e2e/completion.test.js +++ /dev/null @@ -1,133 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); -const Console = require('./lib/Console'); - -const newApp = () => { - let app = express(); - app.get('/', (req, res) => { - res.send(` - - ok -`); - }); - return app; -}; - -describe("general completion test", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let body; - - before(async() => { - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - http = newApp().listen(port); - - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - await webdriver.navigate().to(`http://127.0.0.1:${port}`); - body = await webdriver.findElement(By.css('body')); - }); - - it('should all commands on empty line', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 10); - assert.deepEqual(items[0], { type: 'title', text: 'Console Command' }); - assert(items[1].text.startsWith('set')) - assert(items[2].text.startsWith('open')) - assert(items[3].text.startsWith('tabopen')) - }); - }); - - it('should only commands filtered by prefix', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('b'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 4); - assert.deepEqual(items[0], { type: 'title', text: 'Console Command' }); - assert(items[1].text.startsWith('buffer')) - assert(items[2].text.startsWith('bdelete')) - assert(items[3].text.startsWith('bdeletes')) - }); - }); - - it('selects completion items by / keys', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('b'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 4); - }); - - await c.sendKeys(Key.TAB); - await eventually(async() => { - let items = await c.getCompletions(); - assert(items[1].highlight) - - let v = await c.currentValue(); - assert.equal(v, 'buffer'); - }); - - await c.sendKeys(Key.TAB, Key.TAB); - await eventually(async() => { - let items = await c.getCompletions(); - assert(items[3].highlight) - - let v = await c.currentValue(); - assert.equal(v, 'bdeletes'); - }); - - await c.sendKeys(Key.TAB); - await eventually(async() => { - let v = await c.currentValue(); - assert.equal(v, 'b'); - }); - - await c.sendKeys(Key.SHIFT, Key.TAB); - await eventually(async() => { - let items = await c.getCompletions(); - assert(items[3].highlight) - - let v = await c.currentValue(); - assert.equal(v, 'bdeletes'); - }); - }); -}); diff --git a/e2e/completion.test.ts b/e2e/completion.test.ts new file mode 100644 index 0000000..fd58f74 --- /dev/null +++ b/e2e/completion.test.ts @@ -0,0 +1,135 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By, Key } from 'selenium-webdriver'; +import { Console } from './lib/Console'; + +const newApp = () => { + let app = express(); + app.get('/', (_req, res) => { + res.send(` + + ok +`); + }); + return app; +}; + +describe("general completion test", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + http = newApp().listen(port); + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); + }); + + it('should all commands on empty line', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 10); + assert.deepEqual(items[0], { type: 'title', text: 'Console Command' }); + assert.ok(items[1].text.startsWith('set')) + assert.ok(items[2].text.startsWith('open')) + assert.ok(items[3].text.startsWith('tabopen')) + }); + }); + + it('should only commands filtered by prefix', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('b'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 4); + assert.deepEqual(items[0], { type: 'title', text: 'Console Command' }); + assert.ok(items[1].text.startsWith('buffer')) + assert.ok(items[2].text.startsWith('bdelete')) + assert.ok(items[3].text.startsWith('bdeletes')) + }); + }); + + it('selects completion items by / keys', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('b'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 4); + }); + + await c.sendKeys(Key.TAB); + await eventually(async() => { + let items = await c.getCompletions(); + assert.ok(items[1].highlight) + + let v = await c.currentValue(); + assert.equal(v, 'buffer'); + }); + + await c.sendKeys(Key.TAB, Key.TAB); + await eventually(async() => { + let items = await c.getCompletions(); + assert.ok(items[3].highlight) + + let v = await c.currentValue(); + assert.equal(v, 'bdeletes'); + }); + + await c.sendKeys(Key.TAB); + await eventually(async() => { + let v = await c.currentValue(); + assert.equal(v, 'b'); + }); + + await c.sendKeys(Key.SHIFT, Key.TAB); + await eventually(async() => { + let items = await c.getCompletions(); + assert.ok(items[3].highlight) + + let v = await c.currentValue(); + assert.equal(v, 'bdeletes'); + }); + }); +}); diff --git a/e2e/completion_buffers.test.js b/e2e/completion_buffers.test.js deleted file mode 100644 index 87d2397..0000000 --- a/e2e/completion_buffers.test.js +++ /dev/null @@ -1,211 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const Console = require('./lib/Console'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); - -const newApp = () => { - - let app = express(); - app.get('/*', (req, res) => { - res.send(` - - - title_${req.path.slice(1)} - -

home

-`); - }); - return app; -}; - -describe("completion on buffer/bdelete/bdeletes", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let body; - - before(async() => { - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - http = newApp().listen(port); - - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - let tabs = await browser.tabs.query({}); - for (let tab of tabs.slice(1)) { - await browser.tabs.remove(tab.id); - } - - await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1`, pinned: true }); - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site2`, pinned: true }) - for (let i = 3; i <= 5; ++i) { - await browser.tabs.create({ url: `http://127.0.0.1:${port}/site${i}` }) - } - - await eventually(async() => { - let handles = await webdriver.getAllWindowHandles(); - assert.equal(handles.length, 5); - await webdriver.switchTo().window(handles[2]); - await webdriver.findElement(By.css('iframe')); - }); - body = await webdriver.findElement(By.css('body')); - - await new Promise((resolve) => setTimeout(resolve, 100)); - }); - - it('should all tabs by "buffer" command with empty params', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('buffer '); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 6); - assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); - assert(items[1].text.startsWith('1:')); - assert(items[2].text.startsWith('2:')); - assert(items[3].text.startsWith('3:')); - assert(items[4].text.startsWith('4:')); - assert(items[5].text.startsWith('5:')); - - assert(items[3].text.includes('%')); - assert(items[5].text.includes('#')); - }); - }) - - it('should filter items with URLs by keywords on "buffer" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('buffer title_site2'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); - assert(items[1].text.startsWith('2:')); - assert(items[1].text.includes('title_site2')); - assert(items[1].text.includes(`http://127.0.0.1:${port}/site2`)); - }); - }) - - it('should filter items with titles by keywords on "buffer" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('buffer /site2'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); - assert(items[1].text.startsWith('2:')); - }); - }) - - it('should show one item by number on "buffer" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('buffer 2'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 2); - assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); - assert(items[1].text.startsWith('2:')); - }); - }) - - it('should show unpinned tabs "bdelete" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('bdelete site'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 4); - assert(items[1].text.includes('site3')); - assert(items[2].text.includes('site4')); - assert(items[3].text.includes('site5')); - }); - }) - - it('should show unpinned tabs "bdeletes" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('bdelete site'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 4); - assert(items[1].text.includes('site3')); - assert(items[2].text.includes('site4')); - assert(items[3].text.includes('site5')); - }); - }) - - it('should show both pinned and unpinned tabs "bdelete!" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('bdelete! site'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 6); - assert(items[1].text.includes('site1')); - assert(items[2].text.includes('site2')); - assert(items[3].text.includes('site3')); - assert(items[4].text.includes('site4')); - assert(items[5].text.includes('site5')); - }); - }) - - it('should show both pinned and unpinned tabs "bdeletes!" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('bdeletes! site'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 6); - assert(items[1].text.includes('site1')); - assert(items[2].text.includes('site2')); - assert(items[3].text.includes('site3')); - assert(items[4].text.includes('site4')); - assert(items[5].text.includes('site5')); - }); - }) -}); diff --git a/e2e/completion_buffers.test.ts b/e2e/completion_buffers.test.ts new file mode 100644 index 0000000..9c212cc --- /dev/null +++ b/e2e/completion_buffers.test.ts @@ -0,0 +1,213 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By } from 'selenium-webdriver'; +import { Console } from './lib/Console'; + +const newApp = () => { + + let app = express(); + app.get('/*', (req, res) => { + res.send(` + + + title_${req.path.slice(1)} + +

home

+`); + }); + return app; +}; + +describe("completion on buffer/bdelete/bdeletes", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + http = newApp().listen(port); + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + let tabs = await browser.tabs.query({}); + for (let tab of tabs.slice(1)) { + await browser.tabs.remove(tab.id); + } + + await browser.tabs.update(tabs[0].id, { url: `http://127.0.0.1:${port}/site1`, pinned: true }); + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site2`, pinned: true }) + for (let i = 3; i <= 5; ++i) { + await browser.tabs.create({ url: `http://127.0.0.1:${port}/site${i}` }) + } + + await eventually(async() => { + let handles = await webdriver.getAllWindowHandles(); + assert.equal(handles.length, 5); + await webdriver.switchTo().window(handles[2]); + await webdriver.findElement(By.css('iframe')); + }); + body = await webdriver.findElement(By.css('body')); + + await new Promise((resolve) => setTimeout(resolve, 100)); + }); + + it('should all tabs by "buffer" command with empty params', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('buffer '); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 6); + assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); + assert.ok(items[1].text.startsWith('1:')); + assert.ok(items[2].text.startsWith('2:')); + assert.ok(items[3].text.startsWith('3:')); + assert.ok(items[4].text.startsWith('4:')); + assert.ok(items[5].text.startsWith('5:')); + + assert.ok(items[3].text.includes('%')); + assert.ok(items[5].text.includes('#')); + }); + }) + + it('should filter items with URLs by keywords on "buffer" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('buffer title_site2'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); + assert.ok(items[1].text.startsWith('2:')); + assert.ok(items[1].text.includes('title_site2')); + assert.ok(items[1].text.includes(`http://127.0.0.1:${port}/site2`)); + }); + }) + + it('should filter items with titles by keywords on "buffer" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('buffer /site2'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); + assert.ok(items[1].text.startsWith('2:')); + }); + }) + + it('should show one item by number on "buffer" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('buffer 2'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 2); + assert.deepEqual(items[0], { type: 'title', text: 'Buffers' }); + assert.ok(items[1].text.startsWith('2:')); + }); + }) + + it('should show unpinned tabs "bdelete" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('bdelete site'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 4); + assert.ok(items[1].text.includes('site3')); + assert.ok(items[2].text.includes('site4')); + assert.ok(items[3].text.includes('site5')); + }); + }) + + it('should show unpinned tabs "bdeletes" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('bdelete site'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 4); + assert.ok(items[1].text.includes('site3')); + assert.ok(items[2].text.includes('site4')); + assert.ok(items[3].text.includes('site5')); + }); + }) + + it('should show both pinned and unpinned tabs "bdelete!" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('bdelete! site'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 6); + assert.ok(items[1].text.includes('site1')); + assert.ok(items[2].text.includes('site2')); + assert.ok(items[3].text.includes('site3')); + assert.ok(items[4].text.includes('site4')); + assert.ok(items[5].text.includes('site5')); + }); + }) + + it('should show both pinned and unpinned tabs "bdeletes!" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('bdeletes! site'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 6); + assert.ok(items[1].text.includes('site1')); + assert.ok(items[2].text.includes('site2')); + assert.ok(items[3].text.includes('site3')); + assert.ok(items[4].text.includes('site4')); + assert.ok(items[5].text.includes('site5')); + }); + }) +}); diff --git a/e2e/completion_open.test.js b/e2e/completion_open.test.js deleted file mode 100644 index b2b7484..0000000 --- a/e2e/completion_open.test.js +++ /dev/null @@ -1,256 +0,0 @@ -const express = require('express'); -const lanthan = require('lanthan'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const { Builder } = require('lanthan'); -const { By, Key } = require('selenium-webdriver'); -const Console = require('./lib/Console'); - -const newApp = () => { - - let app = express(); - app.get('/', (req, res) => { - res.send(` - - ok -`); - }); - return app; -}; - -describe("completion on open/tabopen/winopen commands", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let body; - - before(async() => { - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - http = newApp().listen(port); - - await browser.storage.local.set({ - settings, - }); - - // Add item into hitories - await webdriver.navigate().to(`https://i-beam.org/404`); - }); - - after(async() => { - http.close(); - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - await webdriver.navigate().to(`http://127.0.0.1:${port}`); - body = await webdriver.findElement(By.css('body')); - }); - - it('should show completions from search engines, bookmarks, and histories by "open" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('open '); - - await eventually(async() => { - let completions = await c.getCompletions(); - assert(completions.find(x => x.type === 'title' && x.text === 'Search Engines')); - assert(completions.find(x => x.type === 'title' && x.text === 'Bookmarks')); - assert(completions.find(x => x.type === 'title' && x.text === 'History')); - }); - }); - - it('should filter items with URLs by keywords on "open" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('open https://'); - - await eventually(async() => { - let completions = await c.getCompletions(); - let items = completions.filter(x => x.type === 'item').map(x => x.text); - assert(items.every(x => x.includes('https://'))); - }); - }) - - it('should filter items with titles by keywords on "open" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('open getting'); - - await eventually(async() => { - let completions = await c.getCompletions(); - let items = completions.filter(x => x.type === 'item').map(x => x.text); - assert(items.every(x => x.toLowerCase().includes('getting'))); - }); - }) - - it('should filter items with titles by keywords on "tabopen" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('tabopen https://'); - - await eventually(async() => { - let completions = await c.getCompletions(); - let items = completions.filter(x => x.type === 'item').map(x => x.text); - assert(items.every(x => x.includes('https://'))); - }); - }) - - it('should filter items with titles by keywords on "winopen" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('winopen https://'); - - await eventually(async() => { - let completions = await c.getCompletions(); - let items = completions.filter(x => x.type === 'item').map(x => x.text); - assert(items.every(x => x.includes('https://'))); - }); - }) - - it('should display only specified items in "complete" property by set command', async() => { - let c = new Console(webdriver); - - const execCommand = async(line) => { - await body.sendKeys(':'); - await webdriver.switchTo().frame(0); - await c.sendKeys(line, Key.ENTER); - await new Promise(resolve => setTimeout(resolve, 100)); - await webdriver.switchTo().parentFrame(); - } - - const typeCommand = async(...keys) => { - await body.sendKeys(':'); - await webdriver.switchTo().frame(0); - await c.sendKeys(...keys); - } - - const cancel = async() => { - await c.sendKeys(Key.ESCAPE); - await new Promise(resolve => setTimeout(resolve, 100)); - await webdriver.switchTo().parentFrame(); - } - - await execCommand('set complete=sbh'); - await typeCommand('open '); - - await eventually(async() => { - let completions = await c.getCompletions(); - let titles = completions.filter(x => x.type === 'title').map(x => x.text); - assert.deepEqual(titles, ['Search Engines', 'Bookmarks', 'History']) - }); - - await cancel(); - await execCommand('set complete=bss'); - await typeCommand('open '); - - await eventually(async() => { - let completions = await c.getCompletions(); - let titles = completions.filter(x => x.type === 'title').map(x => x.text); - assert.deepEqual(titles, ['Bookmarks', 'Search Engines', 'Search Engines']) - }); - }) - - it('should display only specified items in "complete" property by setting', async() => { - const settings = { - source: 'json', - json: `{ - "keymaps": { - ":": { "type": "command.show" } - }, - "search": { - "default": "google", - "engines": { "google": "https://google.com/search?q={}" } - }, - "properties": { - "complete": "sbh" - } - }`, - }; - await browser.storage.local.set({ settings, }); - - let c = new Console(webdriver); - - const typeCommand = async(...keys) => { - await body.sendKeys(':'); - await webdriver.switchTo().frame(0); - await c.sendKeys(...keys); - } - - const cancel = async() => { - await c.sendKeys(Key.ESCAPE); - await new Promise(resolve => setTimeout(resolve, 100)); - await webdriver.switchTo().parentFrame(); - } - - await browser.storage.local.set({ settings: { - source: 'json', - json: `{ - "keymaps": { - ":": { "type": "command.show" } - }, - "search": { - "default": "google", - "engines": { "google": "https://google.com/search?q={}" } - }, - "properties": { - "complete": "sbh" - } - }`, - }}); - await typeCommand('open '); - - await eventually(async() => { - let completions = await c.getCompletions(); - let titles = completions.filter(x => x.type === 'title').map(x => x.text); - assert.deepEqual(titles, ['Search Engines', 'Bookmarks', 'History']) - }); - - await cancel(); - - await browser.storage.local.set({ settings: { - source: 'json', - json: `{ - "keymaps": { - ":": { "type": "command.show" } - }, - "search": { - "default": "google", - "engines": { "google": "https://google.com/search?q={}" } - }, - "properties": { - "complete": "bss" - } - }`, - }}); - await typeCommand('open '); - - await eventually(async() => { - let completions = await c.getCompletions(); - let titles = completions.filter(x => x.type === 'title').map(x => x.text); - assert.deepEqual(titles, ['Bookmarks', 'Search Engines', 'Search Engines']) - }); - - - }) -}); diff --git a/e2e/completion_open.test.ts b/e2e/completion_open.test.ts new file mode 100644 index 0000000..dcd1829 --- /dev/null +++ b/e2e/completion_open.test.ts @@ -0,0 +1,257 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By, Key } from 'selenium-webdriver'; +import { Console } from './lib/Console'; + +const newApp = () => { + + let app = express(); + app.get('/', (_req, res) => { + res.send(` + + ok +`); + }); + return app; +}; + +describe("completion on open/tabopen/winopen commands", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + http = newApp().listen(port); + + await browser.storage.local.set({ + settings, + }); + + // Add item into hitories + await webdriver.navigate().to(`https://i-beam.org/404`); + }); + + after(async() => { + http.close(); + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); + }); + + it('should show completions from search engines, bookmarks, and histories by "open" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('open '); + + await eventually(async() => { + let completions = await c.getCompletions(); + assert.ok(completions.find(x => x.type === 'title' && x.text === 'Search Engines')); + assert.ok(completions.find(x => x.type === 'title' && x.text === 'Bookmarks')); + assert.ok(completions.find(x => x.type === 'title' && x.text === 'History')); + }); + }); + + it('should filter items with URLs by keywords on "open" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('open https://'); + + await eventually(async() => { + let completions = await c.getCompletions(); + let items = completions.filter(x => x.type === 'item').map(x => x.text); + assert.ok(items.every(x => x.includes('https://'))); + }); + }) + + it('should filter items with titles by keywords on "open" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('open getting'); + + await eventually(async() => { + let completions = await c.getCompletions(); + let items = completions.filter(x => x.type === 'item').map(x => x.text); + assert.ok(items.every(x => x.toLowerCase().includes('getting'))); + }); + }) + + it('should filter items with titles by keywords on "tabopen" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('tabopen https://'); + + await eventually(async() => { + let completions = await c.getCompletions(); + let items = completions.filter(x => x.type === 'item').map(x => x.text); + assert.ok(items.every(x => x.includes('https://'))); + }); + }) + + it('should filter items with titles by keywords on "winopen" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('winopen https://'); + + await eventually(async() => { + let completions = await c.getCompletions(); + let items = completions.filter(x => x.type === 'item').map(x => x.text); + assert.ok(items.every(x => x.includes('https://'))); + }); + }) + + it('should display only specified items in "complete" property by set command', async() => { + let c = new Console(webdriver); + + const execCommand = async(line: string) => { + await body.sendKeys(':'); + await webdriver.switchTo().frame(0); + await c.sendKeys(line, Key.ENTER); + await new Promise(resolve => setTimeout(resolve, 100)); + await (webdriver.switchTo() as any).parentFrame(); + } + + const typeCommand = async(...keys: string[]) => { + await body.sendKeys(':'); + await webdriver.switchTo().frame(0); + await c.sendKeys(...keys); + } + + const cancel = async() => { + await c.sendKeys(Key.ESCAPE); + await new Promise(resolve => setTimeout(resolve, 100)); + await (webdriver.switchTo() as any).parentFrame(); + } + + await execCommand('set complete=sbh'); + await typeCommand('open '); + + await eventually(async() => { + let completions = await c.getCompletions(); + let titles = completions.filter(x => x.type === 'title').map(x => x.text); + assert.deepEqual(titles, ['Search Engines', 'Bookmarks', 'History']) + }); + + await cancel(); + await execCommand('set complete=bss'); + await typeCommand('open '); + + await eventually(async() => { + let completions = await c.getCompletions(); + let titles = completions.filter(x => x.type === 'title').map(x => x.text); + assert.deepEqual(titles, ['Bookmarks', 'Search Engines', 'Search Engines']) + }); + }) + + it('should display only specified items in "complete" property by setting', async() => { + const settings = { + source: 'json', + json: `{ + "keymaps": { + ":": { "type": "command.show" } + }, + "search": { + "default": "google", + "engines": { "google": "https://google.com/search?q={}" } + }, + "properties": { + "complete": "sbh" + } + }`, + }; + await browser.storage.local.set({ settings, }); + + let c = new Console(webdriver); + + const typeCommand = async(...keys: string[]) => { + await body.sendKeys(':'); + await webdriver.switchTo().frame(0); + await c.sendKeys(...keys); + } + + const cancel = async() => { + await c.sendKeys(Key.ESCAPE); + await new Promise(resolve => setTimeout(resolve, 100)); + await (webdriver.switchTo() as any).parentFrame(); + } + + await browser.storage.local.set({ settings: { + source: 'json', + json: `{ + "keymaps": { + ":": { "type": "command.show" } + }, + "search": { + "default": "google", + "engines": { "google": "https://google.com/search?q={}" } + }, + "properties": { + "complete": "sbh" + } + }`, + }}); + await typeCommand('open '); + + await eventually(async() => { + let completions = await c.getCompletions(); + let titles = completions.filter(x => x.type === 'title').map(x => x.text); + assert.deepEqual(titles, ['Search Engines', 'Bookmarks', 'History']) + }); + + await cancel(); + + await browser.storage.local.set({ settings: { + source: 'json', + json: `{ + "keymaps": { + ":": { "type": "command.show" } + }, + "search": { + "default": "google", + "engines": { "google": "https://google.com/search?q={}" } + }, + "properties": { + "complete": "bss" + } + }`, + }}); + await typeCommand('open '); + + await eventually(async() => { + let completions = await c.getCompletions(); + let titles = completions.filter(x => x.type === 'title').map(x => x.text); + assert.deepEqual(titles, ['Bookmarks', 'Search Engines', 'Search Engines']) + }); + + + }) +}); diff --git a/e2e/completion_set.test.js b/e2e/completion_set.test.js deleted file mode 100644 index a6ec248..0000000 --- a/e2e/completion_set.test.js +++ /dev/null @@ -1,73 +0,0 @@ -const express = require('express'); -const lanthan = require('lanthan'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const settings = require('./settings'); -const Console = require('./lib/Console'); -const { Builder } = require('lanthan'); -const { By } = require('selenium-webdriver'); - -describe("completion on set commands", () => { - const port = 12321; - let lanthan; - let session; - let browser; - let body; - - before(async() => { - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - - await browser.storage.local.set({ - settings, - }); - }); - - after(async() => { - if (lanthan) { - await lanthan.quit(); - } - }); - - beforeEach(async() => { - await webdriver.navigate().to(`about:blank`); - body = await webdriver.findElement(By.css('body')); - }); - - it('should show all property names by "set" command with empty params', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('set '); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 5); - assert.deepEqual(items[0], { type: 'title', text: 'Properties' }); - assert(items[1].text.startsWith('hintchars')) - assert(items[2].text.startsWith('smoothscroll')) - assert(items[3].text.startsWith('nosmoothscroll')) - assert(items[4].text.startsWith('complete')) - }); - }); - - it('should show filtered property names by "set" command', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - let c = new Console(webdriver); - await c.sendKeys('set no'); - - await eventually(async() => { - let items = await c.getCompletions(); - assert.equal(items.length, 2); - assert(items[1].text.includes('nosmoothscroll')) - }); - }); -}); diff --git a/e2e/completion_set.test.ts b/e2e/completion_set.test.ts new file mode 100644 index 0000000..018479f --- /dev/null +++ b/e2e/completion_set.test.ts @@ -0,0 +1,71 @@ +import * as path from 'path'; +import * as assert from 'assert'; + +import settings from './settings'; +import eventually from './eventually'; +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By } from 'selenium-webdriver'; +import { Console } from './lib/Console'; + +describe("completion on set commands", () => { + let lanthan: Lanthan; + let webdriver: WebDriver; + let browser: any; + let body: WebElement; + + before(async() => { + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + browser = lanthan.getWebExtBrowser(); + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + if (lanthan) { + await lanthan.quit(); + } + }); + + beforeEach(async() => { + await webdriver.navigate().to(`about:blank`); + body = await webdriver.findElement(By.css('body')); + }); + + it('should show all property names by "set" command with empty params', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('set '); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 5); + assert.deepEqual(items[0], { type: 'title', text: 'Properties' }); + assert.ok(items[1].text.startsWith('hintchars')) + assert.ok(items[2].text.startsWith('smoothscroll')) + assert.ok(items[3].text.startsWith('nosmoothscroll')) + assert.ok(items[4].text.startsWith('complete')) + }); + }); + + it('should show filtered property names by "set" command', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + let c = new Console(webdriver); + await c.sendKeys('set no'); + + await eventually(async() => { + let items = await c.getCompletions(); + assert.equal(items.length, 2); + assert.ok(items[1].text.includes('nosmoothscroll')) + }); + }); +}); diff --git a/e2e/console.test.js b/e2e/console.test.js deleted file mode 100644 index 131a4ef..0000000 --- a/e2e/console.test.js +++ /dev/null @@ -1,128 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const { Builder } = require('lanthan'); -const { Key, By } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - app.get('/', (req, res) => { - res.send(` - - - Hello, world! - -`); - }); - return app; -}; - - -describe("console test", () => { - const port = 12321; - let http; - let lanthan; - let webdriver; - let browser; - let tab; - let body; - - before(async() => { - http = newApp().listen(port); - lanthan = await Builder - .forBrowser('firefox') - .spyAddon(path.join(__dirname, '..')) - .build(); - webdriver = lanthan.getWebDriver(); - browser = lanthan.getWebExtBrowser(); - }); - - after(async() => { - if (lanthan) { - await lanthan.quit(); - } - if (http) { - http.close(); - } - }); - - beforeEach(async() => { - await webdriver.navigate().to(`http://127.0.0.1:${port}`); - body = await webdriver.findElement(By.css('body')); - }); - - it('open console with :', async() => { - await body.sendKeys(':'); - - await webdriver.switchTo().frame(0); - - let input = await webdriver.findElement(By.css('input')); - assert.equal(await input.isDisplayed(), true); - }); - - it('open console with open command by o', async() => { - await body.sendKeys('o'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, 'open '); - }); - - it('open console with open command and current URL by O', async() => { - await body.sendKeys(Key.SHIFT, 'o'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, `open http://127.0.0.1:${port}/`); - }); - - it('open console with tabopen command by t', async() => { - await body.sendKeys('t'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, 'tabopen '); - }); - - it('open console with tabopen command and current URL by T', async() => { - await body.sendKeys(Key.SHIFT, 't'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, `tabopen http://127.0.0.1:${port}/`); - }); - - it('open console with winopen command by w', async() => { - await body.sendKeys('w'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, 'winopen '); - }); - - it('open console with winopen command and current URL by W', async() => { - await body.sendKeys(Key.SHIFT, 'W'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, `winopen http://127.0.0.1:${port}/`); - }); - - it('open console with buffer command by b', async() => { - await body.sendKeys('b'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, `buffer `); - }); - - it('open console with addbookmark command with title by a', async() => { - await body.sendKeys('a'); - - await webdriver.switchTo().frame(0); - let value = await webdriver.executeScript(() => document.querySelector('input').value); - assert.equal(value, `addbookmark Hello, world!`); - }); -}); - diff --git a/e2e/console.test.ts b/e2e/console.test.ts new file mode 100644 index 0000000..65c5d2d --- /dev/null +++ b/e2e/console.test.ts @@ -0,0 +1,126 @@ +import express from 'express'; +import * as path from 'path'; +import * as assert from 'assert'; +import * as http from 'http'; + +import { Builder, Lanthan } from 'lanthan'; +import { WebDriver, WebElement, By, Key } from 'selenium-webdriver'; + +const newApp = () => { + let app = express(); + app.get('/', (_req, res) => { + res.send(` + + + Hello, world! + +`); + }); + return app; +}; + + +describe("console test", () => { + const port = 12321; + let http: http.Server; + let lanthan: Lanthan; + let webdriver: WebDriver; + let body: WebElement; + + before(async() => { + http = newApp().listen(port); + lanthan = await Builder + .forBrowser('firefox') + .spyAddon(path.join(__dirname, '..')) + .build(); + webdriver = lanthan.getWebDriver(); + }); + + after(async() => { + if (lanthan) { + await lanthan.quit(); + } + if (http) { + http.close(); + } + }); + + beforeEach(async() => { + await webdriver.navigate().to(`http://127.0.0.1:${port}`); + body = await webdriver.findElement(By.css('body')); + }); + + it('open console with :', async() => { + await body.sendKeys(':'); + + await webdriver.switchTo().frame(0); + + let input = await webdriver.findElement(By.css('input')); + assert.equal(await input.isDisplayed(), true); + }); + + it('open console with open command by o', async() => { + await body.sendKeys('o'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, 'open '); + }); + + it('open console with open command and current URL by O', async() => { + await body.sendKeys(Key.SHIFT, 'o'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, `open http://127.0.0.1:${port}/`); + }); + + it('open console with tabopen command by t', async() => { + await body.sendKeys('t'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, 'tabopen '); + }); + + it('open console with tabopen command and current URL by T', async() => { + await body.sendKeys(Key.SHIFT, 't'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, `tabopen http://127.0.0.1:${port}/`); + }); + + it('open console with winopen command by w', async() => { + await body.sendKeys('w'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, 'winopen '); + }); + + it('open console with winopen command and current URL by W', async() => { + await body.sendKeys(Key.SHIFT, 'W'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, `winopen http://127.0.0.1:${port}/`); + }); + + it('open console with buffer command by b', async() => { + await body.sendKeys('b'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, `buffer `); + }); + + it('open console with addbookmark command with title by a', async() => { + await body.sendKeys('a'); + + await webdriver.switchTo().frame(0); + let value = await webdriver.executeScript(() => document.querySelector('input')!!.value); + assert.equal(value, `addbookmark Hello, world!`); + }); +}); + diff --git a/e2e/eventually.js b/e2e/eventually.js deleted file mode 100644 index ab0ae25..0000000 --- a/e2e/eventually.js +++ /dev/null @@ -1,23 +0,0 @@ -let defaultInterval = 100; -let defaultTimeout = 2000; - -function sleep(ms) { - return new Promise(resolve => setTimeout(resolve, ms)); -} - -const eventually = async (fn, timeout = defaultTimeout, interval = defaultInterval) => { - let start = Date.now(); - let loop = async() => { - try { - await fn(); - } catch (err) { - if (Date.now() - start > timeout) { - throw err; - } - await new Promise((resolve) => setTimeout(resolve, interval)) - await loop(); - } - }; - await loop(); -}; -module.exports = eventually; diff --git a/e2e/eventually.ts b/e2e/eventually.ts new file mode 100644 index 0000000..12c4552 --- /dev/null +++ b/e2e/eventually.ts @@ -0,0 +1,30 @@ +const defaultInterval = 100; +const defaultTimeout = 2000; + +type Handler = () => void + +const sleep = (ms: number): Promise => { + return new Promise(resolve => setTimeout(resolve, ms)); +} + +const eventually = async ( + fn: Handler, + timeout = defaultTimeout, + interval = defaultInterval, +): Promise => { + let start = Date.now(); + let loop = async() => { + try { + await fn(); + } catch (err) { + if (Date.now() - start > timeout) { + throw err; + } + await sleep(interval); + await loop(); + } + }; + await loop(); +}; + +export default eventually; diff --git a/e2e/follow.test.js b/e2e/follow.test.js deleted file mode 100644 index 336d673..0000000 --- a/e2e/follow.test.js +++ /dev/null @@ -1,263 +0,0 @@ -const express = require('express'); -const path = require('path'); -const assert = require('assert'); -const eventually = require('./eventually'); -const { Builder } = require('lanthan'); -const { Key, By } = require('selenium-webdriver'); - -const newApp = () => { - let app = express(); - - app.get('/', (req, res) => { - res.send(` - - hello -`); - }); - - app.get('/follow-input', (req, res) => { - res.send(` - - -`); - }); - - app.get('/area', (req, res) => { - res.send(` - - - - - - - - - -`); - }); - - /* - * test case: link2 is out of the viewport - * +-----------------+ - * | [link1] |<--- window - * | | - * |=================|<--- viewport - * | [link2] | - * | | - * +-----------------+ - */ - app.get('/test1', (req, res) => { - res.send(` - - -
link1
-
-
link2
- -`); - }); - -/* - * test case 2: link2 and link3 are out of window of the frame - * +-----------------+ - * | +-----------+ | - * | | [link1] | | - * |=================| - * | | [link2] | | - * | +-----------+ | - * | | - * +-----------------+ - */ - app.get('/test2', (req, res) => { - res.send(` - -