diff --git a/.gitignore b/.gitignore index f2b92e28200a80b905f50dc6e0aab9cb6c33bf0d..0eabe01a4cdb4be2ed390910d60b4ec74a1acc7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store Thumbs.db *.log -*.autogenerated /node_modules /package-lock.json diff --git a/package.json b/package.json index 633016da31e8d547d1ab9d566b1cf11bc99387d1..b485099a902c9bb7f15c4bb60a6ca0e84104ad2f 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "coverage-renderer": "electron-mocha --require source-map-support/register --reporter scripts/istanbul-reporter app/renderer.specs.js", "coverage": "npm-run-all coverage-main coverage-renderer", "pree2e": "gulp build-e2e-tests --env=test", - "e2e": "mocha app/e2e.js.autogenerated --require source-map-support/register" + "e2e": "mocha --require source-map-support/register app/e2e.js" }, "dependencies": { "@paulcbetts/system-idle-time": "^1.0.4", diff --git a/src/e2e/app.e2e.js b/src/e2e/app.e2e.js index dd7abc8d15784d563a34371f19870a0a9cd8877d..e926629a2b18bcd9bdef3fd3a057bad5e92a5b76 100644 --- a/src/e2e/app.e2e.js +++ b/src/e2e/app.e2e.js @@ -8,7 +8,7 @@ describe('application', function() { after(stopApp); it('shows the main window', async function() { + expect(await app.browserWindow.getTitle()).to.be.equals(appManifest.productName); expect(await app.browserWindow.isVisible()).to.be.true; - expect(await app.browserWindow.getTitle()).to.be.equal(appManifest.productName); }); }); diff --git a/src/e2e/utils.js b/src/e2e/utils.js index 60b40d410faa1d76cb84ec3f4473bdd5a5d416f2..2dccedfe9e1d2ccc6655899e442a4283a8d74254 100644 --- a/src/e2e/utils.js +++ b/src/e2e/utils.js @@ -1,4 +1,3 @@ -import path from 'path'; import electron from 'electron'; import { Application } from 'spectron'; @@ -16,7 +15,7 @@ export async function startApp() { app = new Application({ path: electron, cwd: process.cwd(), - args: [path.join(__dirname, '..')], + args: [process.cwd()], quitTimeout: 5000, startTimeout: 5000, waitTimeout: 5000, @@ -24,6 +23,7 @@ export async function startApp() { await app.start(); await app.client.waitUntilWindowLoaded(); + await app.client.windowByIndex(1); logFetchInterval = setInterval(fetchLogs, 100); } diff --git a/tasks/build-tests.js b/tasks/build-tests.js index fc87d51be8df342c0bcd1a64c8eea56714a586b0..52366477fe6d6f5dd64d7d42d3bfa6a485fa15bc 100644 --- a/tasks/build-tests.js +++ b/tasks/build-tests.js @@ -13,5 +13,5 @@ gulp.task('build-coverage-tests', ['build-app'], async() => { }); gulp.task('build-e2e-tests', ['build-app'], async() => { - await bundle.many('src', '*.e2e.js', 'app/e2e.js.autogenerated'); + await bundle.many('src', '*.e2e.js', 'app/e2e.js'); });