+
diff --git a/workspaces/electron-app/main/components/app.ts b/workspaces/electron-app/main/components/app.ts
index 240ccb4..1feaff9 100644
--- a/workspaces/electron-app/main/components/app.ts
+++ b/workspaces/electron-app/main/components/app.ts
@@ -1,6 +1,8 @@
import { app, BrowserWindow, shell } from 'electron';
import { Window } from './window';
+declare const global: Global;
+
export class App {
private static _wrapper: Window;
@@ -9,10 +11,6 @@ export class App {
app.on('activate', App.start);
app.on('ready', App.start);
- // Fix warning by applying electron new default value for this property
- // Further details : https://github.com/electron/electron/issues/18397
- app.allowRendererProcessReuse = true;
-
// Limit navigation and open external links in default browser
app.on('web-contents-created', App.openExternalLinksInDefaultBrowser);
}
@@ -30,7 +28,11 @@ export class App {
private static quit() {
// On MacOS it is common for applications to stay open until the user explicitly quits
- if (process.platform !== 'darwin') {
+ // But WebDriverIO Test Runner does handle that behaviour yet
+ if (
+ process.platform !== 'darwin' ||
+ global.appConfig.configId === 'e2e-test'
+ ) {
app.quit();
}
}
diff --git a/workspaces/electron-app/main/components/window.ts b/workspaces/electron-app/main/components/window.ts
index 595e402..c8ca4c9 100644
--- a/workspaces/electron-app/main/components/window.ts
+++ b/workspaces/electron-app/main/components/window.ts
@@ -3,6 +3,7 @@ import * as path from 'path';
import { AbstractService } from '../services/abstract-service';
import { MultiplesService } from '../services/multiples-service';
import { Logger } from '../utils/logger';
+import * as remoteMain from '@electron/remote/main';
declare const global: Global;
declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
@@ -25,21 +26,21 @@ export class Window {
webPreferences: {
// Default behavior in Electron since 5, that
// limits the powers granted to remote content
- // except in e2e test when those powers are required by Spectron
+ // except in e2e test when those powers are required
nodeIntegration: global.appConfig.isNodeIntegration,
// Isolate window context to protect against prototype pollution
- // except in e2e test when that access is required by Spectron
+ // except in e2e test when that access is required
contextIsolation: global.appConfig.isContextIsolation,
- // Ensure that JS values can't unsafely cross between worlds
- // when using contextIsolation
- worldSafeExecuteJavaScript: global.appConfig.isContextIsolation,
- // Disable the remote module to enhance security
- // except in e2e test when that access is required by Spectron
- enableRemoteModule: global.appConfig.isEnableRemoteModule,
// Use a preload script to enhance security
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
},
});
+
+ // Disable the remote module to enhance security
+ // except in e2e test when that access is required
+ if (global.appConfig.isEnableRemoteModule) {
+ remoteMain.enable(this._electronWindow.webContents);
+ }
}
private loadIcon(): Electron.NativeImage | undefined {
diff --git a/workspaces/electron-e2e/app.e2e-spec.ts b/workspaces/electron-e2e/app.e2e-spec.ts
new file mode 100644
index 0000000..ff2e6e3
--- /dev/null
+++ b/workspaces/electron-e2e/app.e2e-spec.ts
@@ -0,0 +1,45 @@
+/*import MainPage from './pageobjects/main.page';
+
+describe('My Login application', () => {
+ it('should login with valid credentials', async () => {
+ await MainPage.open();
+ /*await LoginPage.open();
+
+ await LoginPage.login('tomsmith', 'SuperSecretPassword!');
+ await expect(SecurePage.flashAlert).toBeExisting();
+ await expect(SecurePage.flashAlert).toHaveTextContaining(
+ 'You logged into a secure area!');* /
+ });
+});* /
+
+describe('application loading', () => {
+ describe('App', () => {
+ it('should launch the application', async () => {
+
+ console.log('==>', await browser.getTitle());
+ // expect(title).toEqual('Test');
+ });
+
+ // it('should pass args through to the launched application', async () => {
+ // // custom args are set in the wdio.conf.js file as they need to be set before WDIO starts
+ // const argv = await app.mainProcess.argv();
+ // expect(argv).toContain('--foo');
+ // expect(argv).toContain('--bar=baz');
+ // });
+ });
+}); */
+
+describe('A simple test to check if app window is opened, visible and with expected title', () => {
+ describe('App should', () => {
+ it('show an initial window', async () => {
+ // Checking there is one visible window
+ // expect(await browser.).toEqual(true);
+ // Please note that getWindowHandles() will return 2 if `dev tools` is opened.
+ expect((await browser.getWindowHandles()).length).toEqual(1);
+ });
+
+ it('have expected title', async () => {
+ expect(await browser.getTitle()).toEqual('ElectronAngularQuickStart');
+ });
+ });
+});
diff --git a/workspaces/electron-e2e/jasmine.js b/workspaces/electron-e2e/jasmine.js
deleted file mode 100644
index e80f45b..0000000
--- a/workspaces/electron-e2e/jasmine.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const Jasmine = require('jasmine');
-const { SpecReporter } = require('jasmine-spec-reporter');
-
-const jasmine = new Jasmine();
-jasmine.loadConfig({
- showColors: true,
- spec_dir: 'workspaces/electron-e2e',
- spec_files: ['./**/*-spec.ts'],
- helpers: ['./**/*-helper.ts'],
- random: false,
- seed: undefined,
- stopSpecOnExpectationFailure: false,
-});
-jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-
-require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json'),
-});
-jasmine.env.clearReporters();
-jasmine.addReporter(
- new SpecReporter({ spec: { displayStacktrace: 'pretty' } })
-);
-jasmine.execute();
diff --git a/workspaces/electron-e2e/multiples.e2e-spec.ts b/workspaces/electron-e2e/multiples.e2e-spec.ts
new file mode 100644
index 0000000..62e8ea2
--- /dev/null
+++ b/workspaces/electron-e2e/multiples.e2e-spec.ts
@@ -0,0 +1,20 @@
+import MultiplesPage from './pageobjects/multiples.page';
+
+describe('A simple test to check if a given input matches with computed multiples', () => {
+ describe('Multiples component should', () => {
+ it('show up on startup', async () => {
+ await expect(MultiplesPage.root).toBeDisplayed();
+ });
+
+ const number = Math.floor(Math.random() * 100) % 10;
+ it(`display expected results on input (${number})`, async () => {
+ await MultiplesPage.enterInput(number);
+ const results = await MultiplesPage.results;
+ for (let i = 0; i < results.length; i++) {
+ const ntimes = 1 + i;
+ const expected = `${number} * ${ntimes} = ${number * ntimes}`;
+ expect(await results[i].getText()).toEqual(expected);
+ }
+ });
+ });
+});
diff --git a/workspaces/electron-e2e/pageobjects/multiples.page.ts b/workspaces/electron-e2e/pageobjects/multiples.page.ts
new file mode 100644
index 0000000..87ac4ee
--- /dev/null
+++ b/workspaces/electron-e2e/pageobjects/multiples.page.ts
@@ -0,0 +1,32 @@
+import AbstractPage from './page';
+
+class MultiplesPage extends AbstractPage {
+ /**
+ * Selectors using getter methods
+ */
+ public get root() {
+ return $('#multiples');
+ }
+
+ public get input() {
+ return $('#input');
+ }
+
+ public get results() {
+ return $$('.results');
+ }
+
+ public get buttonSubmit() {
+ return $('button[type="submit"]');
+ }
+
+ /**
+ * Wrapper method to interact with the page
+ */
+ public async enterInput(number: number) {
+ await this.input.setValue(number);
+ await this.buttonSubmit.click();
+ }
+}
+
+export default new MultiplesPage();
diff --git a/workspaces/electron-e2e/pageobjects/page.ts b/workspaces/electron-e2e/pageobjects/page.ts
new file mode 100644
index 0000000..911f54b
--- /dev/null
+++ b/workspaces/electron-e2e/pageobjects/page.ts
@@ -0,0 +1,7 @@
+/**
+ * Abstract page object containing all methods, selectors and functionality
+ * that is shared across all page objects
+ */
+export default abstract class AbstractPage {
+ // Not implemented yet
+}
diff --git a/workspaces/electron-e2e/src/_hooks.ts b/workspaces/electron-e2e/src/_hooks.ts
deleted file mode 100644
index 49acad3..0000000
--- a/workspaces/electron-e2e/src/_hooks.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as path from 'path';
-import { Application } from 'spectron';
-
-export async function startApp(): Promise {
- // Path to local electron binary
- let electronPath = path.join(
- __dirname,
- '../../../node_modules/.bin/electron'
- );
- if (process.platform === 'win32') {
- electronPath += '.cmd';
- }
-
- // Init local packaged app
- const app = new Application({
- path: electronPath,
- args: ['.webpack/main/index.js'],
- });
-
- // Init local app and wait until window loaded
- await app.start();
- await app.client.waitUntilWindowLoaded();
- return app;
-}
-
-export async function stopApp(app: Application): Promise {
- if (app && app.isRunning()) {
- // Wait 1 second and then stop local app
- await new Promise((resolve) => setTimeout(resolve, 1000));
- await app.stop();
- }
-}
diff --git a/workspaces/electron-e2e/src/app.e2e-spec.ts b/workspaces/electron-e2e/src/app.e2e-spec.ts
deleted file mode 100644
index 2c37499..0000000
--- a/workspaces/electron-e2e/src/app.e2e-spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Application } from 'spectron';
-import { startApp, stopApp } from './_hooks';
-
-describe('A simple test to verify a visible window is opened with a title', () => {
- let app: Application;
-
- beforeAll(async () => {
- app = await startApp();
- });
-
- afterAll(async () => {
- await stopApp(app);
- });
-
- it('shows an initial window', async () => {
- // Checking there is one visible window
- expect(await app.browserWindow.isVisible()).toEqual(true);
- // Please note that getWindowCount() will return 2 if `dev tools` are opened.
- expect(await app.client.getWindowCount()).toEqual(1);
- });
-
- it('should have expected title', async () => {
- expect(await app.client.getTitle()).toEqual('ElectronAngularQuickStart');
- });
-});
diff --git a/workspaces/electron-e2e/tsconfig.json b/workspaces/electron-e2e/tsconfig.json
index a8003fe..f18e5cb 100644
--- a/workspaces/electron-e2e/tsconfig.json
+++ b/workspaces/electron-e2e/tsconfig.json
@@ -3,8 +3,13 @@
"compilerOptions": {
"outDir": "./.dist",
"module": "commonjs",
- "target": "es5",
+ "target": "es2020",
"noEmit": true,
- "types": ["jasmine", "jasminewd2", "node"]
+ "types": [
+ "node",
+ "webdriverio/async",
+ "@wdio/jasmine-framework",
+ "expect-webdriverio"
+ ]
}
}
diff --git a/workspaces/electron-e2e/wdio.conf.ts b/workspaces/electron-e2e/wdio.conf.ts
new file mode 100644
index 0000000..b4f768e
--- /dev/null
+++ b/workspaces/electron-e2e/wdio.conf.ts
@@ -0,0 +1,360 @@
+import type { Options } from '@wdio/types';
+import path from 'path';
+
+// Path to local electron binary
+let electronPath = path.join(__dirname, '../../node_modules/.bin/electron');
+if (process.platform === 'win32') {
+ electronPath += '.cmd';
+}
+
+// Starting hook
+const waitUntilWindowLoaded = async () => {
+ const timeout = 10000;
+ await browser.waitUntil(async () => (await browser.isLoading()) === false, {
+ timeout: timeout,
+ timeoutMsg: `Expected app to be loaded in less than ${timeout}ms`,
+ });
+};
+
+// Closing hook
+const closeApplication = async () => {
+ if (browser) {
+ // Wait 1 second and close window
+ await new Promise((resolve) => setTimeout(resolve, 1000));
+ await browser.closeWindow();
+ }
+};
+
+export const config: Options.Testrunner = {
+ //
+ // ====================
+ // Runner Configuration
+ // ====================
+ //
+ //
+ // =====================
+ // ts-node Configurations
+ // =====================
+ //
+ // You can write tests using TypeScript to get autocompletion and type safety.
+ // You will need typescript and ts-node installed as devDependencies.
+ // WebdriverIO will automatically detect if these dependencies are installed
+ // and will compile your config and tests for you.
+ // If you need to configure how ts-node runs please use the
+ // environment variables for ts-node or use wdio config's autoCompileOpts section.
+ //
+
+ autoCompileOpts: {
+ autoCompile: true,
+ // see https://github.com/TypeStrong/ts-node#cli-and-programmatic-options
+ // for all available options
+ tsNodeOpts: {
+ transpileOnly: true,
+ project: 'workspaces/electron-e2e/tsconfig.json',
+ },
+ // tsconfig-paths is only used if "tsConfigPathsOpts" are provided, if you
+ // do please make sure "tsconfig-paths" is installed as dependency
+ // tsConfigPathsOpts: {
+ // baseUrl: './'
+ // }
+ },
+ //
+ // ==================
+ // Specify Test Files
+ // ==================
+ // Define which test specs should run. The pattern is relative to the directory
+ // from which `wdio` was called.
+ //
+ // The specs are defined as an array of spec files (optionally using wildcards
+ // that will be expanded). The test for each spec file will be run in a separate
+ // worker process. In order to have a group of spec files run in the same worker
+ // process simply enclose them in an array within the specs array.
+ //
+ // If you are calling `wdio` from an NPM script (see https://docs.npmjs.com/cli/run-script),
+ // then the current working directory is where your `package.json` resides, so `wdio`
+ // will be called from there.
+ //
+ specs: ['./workspaces/electron-e2e/**/*.e2e-spec.ts'],
+ // Patterns to exclude.
+ exclude: [
+ // 'path/to/excluded/files'
+ ],
+ //
+ // ============
+ // Capabilities
+ // ============
+ // Define your capabilities here. WebdriverIO can run multiple capabilities at the same
+ // time. Depending on the number of capabilities, WebdriverIO launches several test
+ // sessions. Within your capabilities you can overwrite the spec and exclude options in
+ // order to group specific specs to a specific capability.
+ //
+ // First, you can define how many instances should be started at the same time. Let's
+ // say you have 3 different capabilities (Chrome, Firefox, and Safari) and you have
+ // set maxInstances to 1; wdio will spawn 3 processes. Therefore, if you have 10 spec
+ // files and you set maxInstances to 10, all spec files will get tested at the same time
+ // and 30 processes will get spawned. The property handles how many capabilities
+ // from the same test should run tests.
+ //
+ maxInstances: 10,
+ //
+ // If you have trouble getting all important capabilities together, check out the
+ // Sauce Labs platform configurator - a great tool to configure your capabilities:
+ // https://saucelabs.com/platform/platform-configurator
+ //
+ capabilities: [
+ {
+ // maxInstances can get overwritten per capability. So if you have an in-house Selenium
+ // grid with only 5 firefox instances available you can make sure that not more than
+ // 5 instances get started at a time.
+ maxInstances: 5,
+ //
+ browserName: 'chrome',
+ acceptInsecureCerts: true,
+ 'goog:chromeOptions': {
+ binary: electronPath,
+ args: ['app=' + '.webpack/main/index.js'],
+ },
+ // If outputDir is provided WebdriverIO can capture driver session logs
+ // it is possible to configure which logTypes to include/exclude.
+ // excludeDriverLogs: ['*'], // pass '*' to exclude all driver session logs
+ // excludeDriverLogs: ['bugreport', 'server'],
+ },
+ ],
+ //
+ // ===================
+ // Test Configurations
+ // ===================
+ // Define all options that are relevant for the WebdriverIO instance here
+ //
+ // Level of logging verbosity: trace | debug | info | warn | error | silent
+ logLevel: 'info',
+ //
+ // Set specific log levels per logger
+ // loggers:
+ // - webdriver, webdriverio
+ // - @wdio/browserstack-service, @wdio/devtools-service, @wdio/sauce-service
+ // - @wdio/mocha-framework, @wdio/jasmine-framework
+ // - @wdio/local-runner
+ // - @wdio/sumologic-reporter
+ // - @wdio/cli, @wdio/config, @wdio/utils
+ // Level of logging verbosity: trace | debug | info | warn | error | silent
+ // logLevels: {
+ // webdriver: 'info',
+ // '@wdio/appium-service': 'info'
+ // },
+ //
+ // If you only want to run your tests until a specific amount of tests have failed use
+ // bail (default is 0 - don't bail, run all tests).
+ bail: 0,
+ //
+ // Set a base URL in order to shorten url command calls. If your `url` parameter starts
+ // with `/`, the base url gets prepended, not including the path portion of your baseUrl.
+ // If your `url` parameter starts without a scheme or `/` (like `some/path`), the base url
+ // gets prepended directly.
+ baseUrl: 'http://localhost',
+ //
+ // Default timeout for all waitFor* commands.
+ waitforTimeout: 10000,
+ //
+ // Default timeout in milliseconds for request
+ // if browser driver or grid doesn't send response
+ connectionRetryTimeout: 120000,
+ //
+ // Default request retries count
+ connectionRetryCount: 3,
+ //
+ // Test runner services
+ // Services take over a specific job you don't want to take care of. They enhance
+ // your test setup with almost no effort. Unlike plugins, they don't add new
+ // commands. Instead, they hook themselves up into the test process.
+ services: ['chromedriver'],
+
+ // Framework you want to run your specs with.
+ // The following are supported: Mocha, Jasmine, and Cucumber
+ // see also: https://webdriver.io/docs/frameworks
+ //
+ // Make sure you have the wdio adapter package for the specific framework installed
+ // before running any tests.
+ framework: 'jasmine',
+ //
+ // The number of times to retry the entire specfile when it fails as a whole
+ // specFileRetries: 1,
+ //
+ // Delay in seconds between the spec file retry attempts
+ // specFileRetriesDelay: 0,
+ //
+ // Whether or not retried specfiles should be retried immediately or deferred to the end of the queue
+ // specFileRetriesDeferred: false,
+ //
+ // Test reporter for stdout.
+ // The only one supported by default is 'dot'
+ // see also: https://webdriver.io/docs/dot-reporter
+ reporters: ['spec', ['allure', { outputDir: 'allure-results' }]],
+
+ //
+ // Options to be passed to Jasmine.
+ jasmineOpts: {
+ // Jasmine default timeout
+ defaultTimeoutInterval: 60000,
+ //
+ // The Jasmine framework allows interception of each assertion in order to log the state of the application
+ // or website depending on the result. For example, it is pretty handy to take a screenshot every time
+ // an assertion fails.
+ expectationResultHandler: function (_passed: boolean, _assertion) {
+ // do something
+ },
+ },
+
+ //
+ // =====
+ // Hooks
+ // =====
+ // WebdriverIO provides several hooks you can use to interfere with the test process in order to enhance
+ // it and to build services around it. You can either apply a single function or an array of
+ // methods to it. If one of them returns with a promise, WebdriverIO will wait until that promise got
+ // resolved to continue.
+ /**
+ * Gets executed once before all workers get launched.
+ * @param {Object} config wdio configuration object
+ * @param {Array.