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/command_buffer.test.js | 120 ++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 62 deletions(-) (limited to 'e2e/command_buffer.test.js') 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 }); -- cgit v1.2.3