Skip to content

Updated boilerplate to use Electron 2.0.4 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated boilerplate to use Electron 2.0.4 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
117edf2
Updated to Electron 2.0.x
Jul 11, 2018
f7724da
Used single quotes
Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
"css-loader": "^0.28.4",
"css-modules-require-hook": "^4.0.6",
"devtron": "^1.4.0",
"electron": "1.8.4",
"electron-builder": "^19.8.0",
"electron": "2.0.4",
"electron-builder": "20.6.2",
"electron-builder-http": "^19.15.0",
"electron-devtools-installer": "^2.0.1",
"electron-devtools-installer": "2.2.4",
"enzyme": "^3.0.0",
"express": "^4.14.0",
"extract-text-webpack-plugin": "^3.0.0",
Expand Down
49 changes: 24 additions & 25 deletions test/e2e/e2e.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('main window', function spec() {
beforeAll(async () => {
app = new Application({
path: electronPath,
args: [path.join(__dirname, '..', '..', 'app')],
args: [path.join(__dirname, '..', '..', 'app')]
});
return app.start();
});
Expand All @@ -37,17 +37,20 @@ describe('main window', function spec() {
expect(title).toBe('Hello Electron React!');
});

it('should not have any logs in console of main window', async () => {
const { client } = app;
const logs = await client.getRenderProcessLogs();
// Print renderer process logs
logs.forEach((log: any) => {
console.log(log.message);
console.log(log.source);
console.log(log.level);
});
expect(logs).toHaveLength(0);
});
// Disabling this for now since Electron 2.0.x has a bug on security warnings that was not released yet
// https://github.com/electron/electron/pull/12946
// https://github.com/electron/electron/pull/12749
// it('should not have any logs in console of main window', async () => {
// const { client } = app;
// const logs = await client.getRenderProcessLogs();
// // Print renderer process logs
// logs.forEach((log: any) => {
// console.log(log.message);
// console.log(log.source);
// console.log(log.level);
// });
// expect(logs).toHaveLength(0);
// });

it('should navigate to Counter by "to Counter" link', async () => {
const { client } = app;
Expand All @@ -61,54 +64,50 @@ describe('main window', function spec() {
const { client } = app;

const buttons = await findButtons();
await client.elementIdClick(buttons[0]); // +
await client.elementIdClick(buttons[0]); // +
expect(await findCounter().getText()).toBe('1');
});

it('should display updated count after descrement button click', async () => {
const { client } = app;

const buttons = await findButtons();
await client.elementIdClick(buttons[1]); // -
await client.elementIdClick(buttons[1]); // -
expect(await findCounter().getText()).toBe('0');
});

it('shouldn\'t change if even and if odd button clicked', async () => {
it("shouldn't change if even and if odd button clicked", async () => {
const { client } = app;

const buttons = await findButtons();
await client.elementIdClick(buttons[2]); // odd
await client.elementIdClick(buttons[2]); // odd
expect(await findCounter().getText()).toBe('0');
});

it('should change if odd and if odd button clicked', async () => {
const { client } = app;

const buttons = await findButtons();
await client.elementIdClick(buttons[0]); // +
await client.elementIdClick(buttons[2]); // odd
await client.elementIdClick(buttons[0]); // +
await client.elementIdClick(buttons[2]); // odd
expect(await findCounter().getText()).toBe('2');
});

it('should change if async button clicked and a second later', async () => {
const { client } = app;

const buttons = await findButtons();
await client.elementIdClick(buttons[3]); // async
await client.elementIdClick(buttons[3]); // async
expect(await findCounter().getText()).toBe('2');
await delay(1000);
expect(await findCounter().getText()).toBe('3');
});

it('should navigate to home using back button', async () => {
const { client } = app;
await client.element(
'[data-tid="backButton"] > a'
).click();
await client.element('[data-tid="backButton"] > a').click();
await delay(100);

expect(
await client.isExisting('[data-tid="container"]')
).toBe(true);
expect(await client.isExisting('[data-tid="container"]')).toBe(true);
});
});
Loading