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

Rewrite e2e tests with await/async

Browse Source
jh-changes
Shin'ya Ueoka 7 years ago
parent c91f8e4dcc
commit f1be4fa0a8
1 changed files with 130 additions and 229 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 325
      e2e/contents/tab.test.js

325
e2e/contents/tab.test.js
Unescape View File

@ -6,260 +6,161 @@ import { CLIENT_URL } from '../web-server/url';
describe("tab test", () => { describe("tab test", () => {
let targetWindow; let targetWindow;
beforeEach(() => { beforeEach(async () => {
return windows.create(CLIENT_URL).then((win) => { targetWindow = await windows.create(CLIENT_URL);
targetWindow = win;
});
}); });
afterEach(() => { afterEach(async () => {
return windows.remove(targetWindow.id); await windows.remove(targetWindow.id);
}); });
it('deletes tab by d', () => { it('deletes tab by d', async () => {
let before; let tab = await tabs.create(targetWindow.id, CLIENT_URL);
let targetTab; let before = await windows.get(targetWindow.id);
return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => { await keys.press(tab.id, 'd');
targetTab = tab;
return windows.get(targetWindow.id); let actual = await windows.get(targetWindow.id);
}).then((win) => {
before = win;
return keys.press(targetTab.id, 'd');
}).then(() => {
return windows.get(targetWindow.id);
}).then((actual) => {
expect(actual.tabs).to.have.lengthOf(before.tabs.length - 1); expect(actual.tabs).to.have.lengthOf(before.tabs.length - 1);
}); });
});
it('duplicates tab by zd', () => { it('duplicates tab by zd', async () => {
let before; let tab = await tabs.create(targetWindow.id, CLIENT_URL);
let targetTab; let before = await windows.get(targetWindow.id)
return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => { await keys.press(tab.id, 'z');
targetTab = tab; await keys.press(tab.id, 'd');
return windows.get(targetWindow.id)
}).then((win) => {; let actual = await windows.get(targetWindow.id);
before = win;
return keys.press(targetTab.id, 'z');
}).then(() => {
return keys.press(targetTab.id, 'd');
}).then(() => {
return windows.get(targetWindow.id);
}).then((actual) => {
expect(actual.tabs).to.have.lengthOf(before.tabs.length + 1); expect(actual.tabs).to.have.lengthOf(before.tabs.length + 1);
}); });
})
it('makes pinned by zp', async () => {
it('makes pinned by zp', () => { let tab = await tabs.create(targetWindow.id, CLIENT_URL);
let before; let before = await windows.get(targetWindow.id);
let targetTab; await keys.press(tab.id, 'z');
return tabs.create(targetWindow.id, CLIENT_URL).then((tab) => { await keys.press(tab.id, 'p');
targetTab = tab;
return windows.get(targetWindow.id) let actual = await windows.get(targetWindow.id);
}).then((win) => {;
before = win;
return keys.press(targetTab.id, 'z');
}).then(() => {
return keys.press(targetTab.id, 'p');
}).then(() => {
return windows.get(targetWindow.id);
}).then((actual) => {
expect(actual.tabs[0].pinned).to.be.true; expect(actual.tabs[0].pinned).to.be.true;
}); });
})
it('selects previous tab by K', async () => {
it('selects previous tab by K', () => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#2');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => { let tab = await tabs.selectAt(targetWindow.id, 2);
return tabs.create(targetWindow.id, CLIENT_URL + '#2') await keys.press(tab.id, 'K', { shiftKey: true });
}).then(() => {
return tabs.create(targetWindow.id, CLIENT_URL + '#3'); let win = await windows.get(targetWindow.id);
}).then(() => {
return tabs.selectAt(targetWindow.id, 2);
}).then((tab) => {
return keys.press(tab.id, 'K', { shiftKey: true });
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[1].active).to.be.true; expect(win.tabs[1].active).to.be.true;
}); });
});
it('selects previous tab by K rotatory', () => { it('selects previous tab by K rotatory', async () => {
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#2');
}).then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#3');
return tabs.create(targetWindow.id, CLIENT_URL + '#2') let tab = await tabs.selectAt(targetWindow.id, 0);
}).then(() => { await keys.press(tab.id, 'K', { shiftKey: true });
return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => { let win = await windows.get(targetWindow.id);
return tabs.selectAt(targetWindow.id, 0);
}).then((tab) => {
return keys.press(tab.id, 'K', { shiftKey: true });
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[3].active).to.be.true; expect(win.tabs[3].active).to.be.true;
}); });
});
it('selects next tab by J', () => { it('selects next tab by J', async () => {
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#2');
}).then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#3');
return tabs.create(targetWindow.id, CLIENT_URL + '#2') let tab = await tabs.selectAt(targetWindow.id, 2);
}).then(() => { await keys.press(tab.id, 'J', { shiftKey: true });
return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => { let win = await windows.get(targetWindow.id);
return tabs.selectAt(targetWindow.id, 2);
}).then((tab) => {
return keys.press(tab.id, 'J', { shiftKey: true });
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[3].active).to.be.true; expect(win.tabs[3].active).to.be.true;
}); });
});
it('selects previous tab by J rotatory', () => { it('selects previous tab by J rotatory', async () => {
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#2');
}).then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#3');
return tabs.create(targetWindow.id, CLIENT_URL + '#2') let tab = await tabs.selectAt(targetWindow.id, 3);
}).then(() => { await keys.press(tab.id, 'J', { shiftKey: true });
return tabs.create(targetWindow.id, CLIENT_URL + '#3');
}).then(() => { let win = await windows.get(targetWindow.id);
return tabs.selectAt(targetWindow.id, 3);
}).then((tab) => {
return keys.press(tab.id, 'J', { shiftKey: true });
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[0].active).to.be.true; expect(win.tabs[0].active).to.be.true;
}); });
});
it('selects first tab by g0', () => { it('selects first tab by g0', async () => {
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#2');
}).then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#3');
return tabs.create(targetWindow.id, CLIENT_URL + '#2') let tab = await tabs.selectAt(targetWindow.id, 2);
}).then(() => { await keys.press(tab.id, 'g').then(() => tab);
return tabs.create(targetWindow.id, CLIENT_URL + '#3'); await keys.press(tab.id, '0');
}).then(() => {
return tabs.selectAt(targetWindow.id, 2); let win = await windows.get(targetWindow.id);
}).then((tab) => {
return keys.press(tab.id, 'g').then(() => tab);
}).then((tab) => {
return keys.press(tab.id, '0');
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[0].active).to.be.true; expect(win.tabs[0].active).to.be.true;
}); });
});
it('selects last tab by g$', () => { it('selects last tab by g$', async () => {
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#2');
}).then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#3');
return tabs.create(targetWindow.id, CLIENT_URL + '#2') let tab = await tabs.selectAt(targetWindow.id, 2);
}).then(() => { await keys.press(tab.id, 'g');
return tabs.create(targetWindow.id, CLIENT_URL + '#3'); await keys.press(tab.id, '$');
}).then(() => {
return tabs.selectAt(targetWindow.id, 2); let win = await windows.get(targetWindow.id);
}).then((tab) => {
return keys.press(tab.id, 'g').then(() => tab);
}).then((tab) => {
return keys.press(tab.id, '$');
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[3].active).to.be.true; expect(win.tabs[3].active).to.be.true;
}); });
});
it('selects last selected tab by <C-6>', () => { it('selects last selected tab by <C-6>', async () => {
return Promise.resolve().then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1') await tabs.create(targetWindow.id, CLIENT_URL + '#2');
}).then(() => { await tabs.create(targetWindow.id, CLIENT_URL + '#3');
return tabs.create(targetWindow.id, CLIENT_URL + '#2') await tabs.selectAt(targetWindow.id, 1);
}).then(() => { let tab = await tabs.selectAt(targetWindow.id, 3);
return tabs.create(targetWindow.id, CLIENT_URL + '#3'); await keys.press(tab.id, '6', { ctrlKey: true });
}).then(() => {
return tabs.selectAt(targetWindow.id, 1); let win = await windows.get(targetWindow.id);
}).then(() => {
return tabs.selectAt(targetWindow.id, 3);
}).then((tab) => {
return keys.press(tab.id, '6', { ctrlKey: true });
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs[1].active).to.be.true; expect(win.tabs[1].active).to.be.true;
}); });
});
it('deletes tab by d', () => { it('deletes tab by d', async () => {
return Promise.resolve().then(() => { let tab = await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1'); await keys.press(tab.id, 'd');
}).then((tab) => {
return keys.press(tab.id, 'd'); let win = await windows.get(targetWindow.id);
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs).to.have.lengthOf(1); expect(win.tabs).to.have.lengthOf(1);
}); });
});
it('reopen tab by u', () => { it('reopen tab by u', async () => {
return Promise.resolve().then(() => { let tab = await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1'); await keys.press(tab.id, 'd');
}).then((tab) => {
return keys.press(tab.id, 'd'); let win = await windows.get(targetWindow.id);
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs).to.have.lengthOf(1); expect(win.tabs).to.have.lengthOf(1);
return keys.press(win.tabs[0].id, 'u');
}).then(() => { await keys.press(win.tabs[0].id, 'u');
return new Promise((resolve) => setTimeout(resolve, 100)); await new Promise((resolve) => setTimeout(resolve, 100));
}).then(() => {
return windows.get(targetWindow.id); win = await windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs).to.have.lengthOf(2); expect(win.tabs).to.have.lengthOf(2);
}); });
});
it('does not delete pinned tab by d', () => { it('does not delete pinned tab by d', async () => {
return Promise.resolve().then(() => { let tab = await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return tabs.create(targetWindow.id, CLIENT_URL + '#1'); tab = await tabs.update(tab.id, { pinned: true });
}).then((tab) => { await keys.press(tab.id, 'd');
return tabs.update(tab.id, { pinned: true });
}).then((tab) => { let win = await windows.get(targetWindow.id);
return keys.press(tab.id, 'd');
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs).to.have.lengthOf(2); expect(win.tabs).to.have.lengthOf(2);
}); });
});
it('deletes pinned tab by !d', () => { it('deletes pinned tab by !d', async () => {
let target; let tab = await tabs.create(targetWindow.id, CLIENT_URL + '#1');
return Promise.resolve().then(() => { tab = await tabs.update(tab.id, { pinned: true });
return tabs.create(targetWindow.id, CLIENT_URL + '#1'); await keys.press(tab.id, '!');
}).then((tab) => { await keys.press(tab.id, 'd');
return tabs.update(tab.id, { pinned: true });
}).then((tab) => { let win = await windows.get(targetWindow.id);
target = tab;
return keys.press(target.id, '!');
}).then(() => {
return keys.press(target.id, 'd');
}).then(() => {
return windows.get(targetWindow.id);
}).then((win) => {
expect(win.tabs).to.have.lengthOf(1); expect(win.tabs).to.have.lengthOf(1);
}); });
}); });
});