From 52b13f85cab26c6149d3f266e6e3309907f81baf Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 15 Apr 2019 21:18:54 +0900 Subject: [PATCH 1/5] Add e2e tests for yank/paste --- QA.md | 5 -- e2e/clipboard.test.js | 123 ++++++++++++++++++++++++++++++++++++++++++ e2e/lib/clipboard.js | 63 ++++++++++++++++++++++ 3 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 e2e/clipboard.test.js create mode 100644 e2e/lib/clipboard.js diff --git a/QA.md b/QA.md index 4d1a270..ec20811 100644 --- a/QA.md +++ b/QA.md @@ -10,11 +10,6 @@ The behaviors of the console are tested in [Console section](#consoles). #### Misc -- [ ] y: yank current URL and show a message -- [ ] p: open clipboard's URL in current tab -- [ ] P: open clipboard's URL in new tab -- [ ] p: search clipboard's keywords in current tab -- [ ] P: search clipboard's keywords in new tab - [ ] Toggle enabled/disabled of plugin bu Shift+Esc - [ ] Hide error and info console by Esc - [ ] Vim-Vixen icons changes on Shift+Esc diff --git a/e2e/clipboard.test.js b/e2e/clipboard.test.js new file mode 100644 index 0000000..82e45fc --- /dev/null +++ b/e2e/clipboard.test.js @@ -0,0 +1,123 @@ +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 newApp = () => { + let app = express(); + app.get('/', (req, res) => { + res.status(200).send(``); + }); + return app; +}; + +describe("navigate test", () => { + + const port = 12321; + let http; + let firefox; + let session; + let browser; + + before(async() => { + http = newApp().listen(port); + + firefox = await lanthan.firefox({ + spy: path.join(__dirname, '..'), + }); + session = firefox.session; + browser = firefox.browser; + + await browser.storage.local.set({ + settings, + }); + }); + + after(async() => { + if (firefox) { + await firefox.close(); + } + 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 session.navigateTo(`http://127.0.0.1:${port}/#should_copy_url`); + let body = await session.findElementByCSS('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 session.navigateTo(`http://127.0.0.1:${port}/`); + let body = await session.findElementByCSS('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 session.navigateTo(`http://127.0.0.1:${port}/`); + let body = await session.findElementByCSS('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 session.navigateTo(`http://127.0.0.1:${port}/`); + let body = await session.findElementByCSS('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 session.navigateTo(`http://127.0.0.1:${port}/`); + let body = await session.findElementByCSS('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/lib/clipboard.js b/e2e/lib/clipboard.js new file mode 100644 index 0000000..4061dbd --- /dev/null +++ b/e2e/lib/clipboard.js @@ -0,0 +1,63 @@ +'use strict'; + +const { spawn } = require('child_process'); + +const readLinux = () => { + let stdout = '', stderr = ''; + return new Promise((resolve, reject) => { + let xsel = spawn('xsel', ['--clipboard', '--output']); + xsel.stdout.on('data', (data) => { + stdout += data; + }); + xsel.stderr.on('data', (data) => { + stderr += data; + }); + xsel.on('close', (code) => { + if (code !== 0) { + throw new Error(`xsel returns ${code}: ${stderr}`) + } + resolve(stdout); + }); + }); +}; + +const writeLinux = (data) => { + let stdout = '', stderr = ''; + return new Promise((resolve, reject) => { + let xsel = spawn('xsel', ['--clipboard', '--input']); + xsel.stderr.on('data', (data) => { + stderr += data; + }); + xsel.on('close', (code) => { + if (code !== 0) { + throw new Error(`xsel returns ${code}: ${stderr}`) + } + resolve(); + }); + xsel.stdin.write(data); + xsel.stdin.end(); + }); +}; + +const unsupported = (os) => { + return () => { + throw new Error(`Unsupported os: ${os}`); + }; +}; + +const detect = () => { + switch (process.platform) { + case 'linux': + return { + read: readLinux, + write: writeLinux, + }; + default: + return { + read: unsupported(process.platform), + write: unsupported(process.platform), + }; + } +} + +module.exports = detect(); From 4ff58c5defcce67745743d36da3ab426a6523e02 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 15 Apr 2019 21:26:48 +0900 Subject: [PATCH 2/5] Install xsel on CircleCI --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d83bc3..3a2bae4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,7 @@ jobs: executor: name: default steps: + - run: sudo apt-get update && sudo apt-get -y install xsel - install_firefox - checkout - setup_npm From e4760a04163c8e403bfb321a1da33ff37228dc4e Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 16 Apr 2019 21:16:47 +0900 Subject: [PATCH 3/5] Add e2e tests for completions --- QA.md | 21 +--- e2e/completion_buffers.test.js | 214 +++++++++++++++++++++++++++++++++ e2e/completion_open.test.js | 132 ++++++++++++++++++++ e2e/lib/Console.js | 33 +++++ 4 files changed, 381 insertions(+), 19 deletions(-) create mode 100644 e2e/completion_buffers.test.js create mode 100644 e2e/completion_open.test.js create mode 100644 e2e/lib/Console.js diff --git a/QA.md b/QA.md index ec20811..5272597 100644 --- a/QA.md +++ b/QA.md @@ -16,6 +16,7 @@ The behaviors of the console are tested in [Console section](#consoles). - [ ] Add-on is enabled and disabled by clicking the indicator on the tool bar. - [ ] The indicator changed on selected tab changed (changes add-on enabled) - [ ] Notify to users on add-on updated at first time. +- [ ] Reopen tab on *only current window* by u ### Following links @@ -26,6 +27,7 @@ The behaviors of the console are tested in [Console section](#consoles). - [ ] Select link and open it in new tab in `