From 8281a852ab8bc89ed7fb8de8d30c67b5282c7277 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Wed, 20 Feb 2019 15:54:38 +0100 Subject: [PATCH] Change ui test resolution --- src/electron.ts | 8 ++++---- src/spec/webdriverio.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/electron.ts b/src/electron.ts index df8af8a..0bc183e 100644 --- a/src/electron.ts +++ b/src/electron.ts @@ -15,7 +15,7 @@ if (!isDev) { } const isDebugEnabled = Boolean(process.argv.find(arg => arg === 'debug')) -const isFullscreen = Boolean(process.argv.find(arg => arg === '--fullscreen')) +const runningUiTestOnCi = Boolean(process.argv.find(arg => arg === '--runningUiTestOnCi')) require('electron-debug')({ enabled: isDebugEnabled }) @@ -36,8 +36,8 @@ function createWindow() { const iconPath = path.join(__dirname, 'icon.png') // Create the browser window. mainWindow = new BrowserWindow({ - width: 1024, - height: 700, + width: runningUiTestOnCi ? 1280 : 1024, + height: runningUiTestOnCi ? 720 : 700, show: false, webPreferences: { nodeIntegration: true, @@ -48,7 +48,7 @@ function createWindow() { mainWindow.once('ready-to-show', () => { if (mainWindow) { - isFullscreen && mainWindow.setFullScreen(true) + runningUiTestOnCi && mainWindow.setFullScreen(true) mainWindow.show() } }) diff --git a/src/spec/webdriverio.ts b/src/spec/webdriverio.ts index be10791..25af539 100644 --- a/src/spec/webdriverio.ts +++ b/src/spec/webdriverio.ts @@ -21,7 +21,7 @@ import { showMenu } from './scenarios/showMenu' import { createFakeMousePointer, sleep, showText, hideText, clickOnHistory } from './util' const binary = os.platform() === 'darwin' ? 'Electron.app/Contents/MacOS/Electron' : 'electron' -const fullscreen = os.platform() === 'darwin' ? [] : ['--fullscreen'] +const runningUiTestOnCi = os.platform() === 'darwin' ? [] : ['--runningUiTestOnCi'] const options = { host: 'localhost', // Use localhost as chrome driver server @@ -30,7 +30,7 @@ const options = { browserName: 'electron', chromeOptions: { binary: `${__dirname}/../../../node_modules/electron/dist/${binary}`, - args: [`--app=${__dirname}/../../..`, '--force-device-scale-factor=1', '--no-sandbox', '--disable-dev-shm-usage', '--disable-extensions'].concat(fullscreen), + args: [`--app=${__dirname}/../../..`, '--force-device-scale-factor=1', '--no-sandbox', '--disable-dev-shm-usage', '--disable-extensions'].concat(runningUiTestOnCi), }, windowTypes: ['app', 'webview'], },