jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use eventually instead of sleep

Browse source
This commit is contained in:
Shin'ya Ueoka 2019-04-06 19:10:32 +09:00
parent 1ae9b108fd
commit 88a87504d1
2 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
e2e-lanthan/eventually.js Normal file
View file

@ -0,0 +1,25 @@
const assert = require('assert');
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;

32
e2e-lanthan/tab.test.js
View file

@ -2,6 +2,7 @@ const express = require('express');
const lanthan = require('lanthan');
const path = require('path');
const assert = require('power-assert');
const eventually = require('./eventually');
const Key = lanthan.Key;
@ -58,8 +59,6 @@ describe("tab test", () => {
let body = await session.findElementByCSS('body');
await body.sendKeys('d');
await new Promise(resolve => setTimeout(resolve, 100));
let current = await browser.tabs.query({ windowId: win.id });
assert(current.length === tabs.length - 1);
});
@ -69,8 +68,6 @@ describe("tab test", () => {
let body = await session.findElementByCSS('body');
await body.sendKeys(Key.Shift, 'd');
await new Promise(resolve => setTimeout(resolve, 100));
let current = await browser.tabs.query({ windowId: win.id });
assert(current.length === 2);
});
@ -80,12 +77,12 @@ describe("tab test", () => {
let body = await session.findElementByCSS('body');
await body.sendKeys('z', 'd');
await new Promise(resolve => setTimeout(resolve, 1000));
let current = await browser.tabs.query({ windowId: win.id });
current.sort((t1, t2) => t1.index - t2.index);
assert(current.length === tabs.length + 1);
assert(current[0].url === current[1].url);
await eventually(async() => {
let current = await browser.tabs.query({ windowId: win.id });
current.sort((t1, t2) => t1.index - t2.index);
assert(current.length === tabs.length + 1);
assert(current[0].url === current[1].url);
});
});
it('makes pinned by zp', async () => {
@ -169,12 +166,7 @@ describe("tab test", () => {
let body = await session.findElementByCSS('body');
await body.sendKeys('u');
await new Promise(resolve => setTimeout(resolve, 2000));
let current = await browser.tabs.query({ windowId: win.id });
if (current.length !== tabs.length) {
await new Promise(resolve => setTimeout(resolve, 50000));
}
assert(current.length === tabs.length);
});
@ -201,10 +193,10 @@ describe("tab test", () => {
let body = await session.findElementByCSS('body');
await body.sendKeys('g', 'f');
await new Promise(resolve => setTimeout(resolve, 1000));
let current = await browser.tabs.query({ windowId: win.id });
assert(current.length === tabs.length + 1);
assert(current[current.length - 1].url === `view-source:${url}#0`);
await eventually(async() => {
let current = await browser.tabs.query({ windowId: win.id });
assert(current.length === tabs.length + 1);
assert(current[current.length - 1].url === `view-source:${url}#0`);
});
});
});