Skip to content

Commit 13ed673

Browse files
committed
fix state
1 parent db766f5 commit 13ed673

File tree

2 files changed

+40
-18
lines changed

2 files changed

+40
-18
lines changed

end-to-end-test/shared/specUtils_Async.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,13 @@ async function pasteToElement(elementSelector, text) {
494494

495495
async function checkOncoprintElement(selector, viewports) {
496496
//browser.moveToObject('body', 0, 0);
497+
498+
if (
499+
await $('.oncoprint__controls .open #viewDropdownButton').isExisting()
500+
) {
501+
await clickElement('.dropdown.open #viewDropdownButton');
502+
}
503+
497504
await browser.execute(() => {
498505
frontendOnc.clearMouseOverEffects(); // clear mouse hover effects for uniform screenshot
499506
});

end-to-end-test/shared/wdio/wdio.conf.js

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ const defaultTimeoutInterval = 180000;
1616

1717
const resultsDir = process.env.JUNIT_REPORT_PATH || './shared/results/';
1818

19-
const chromedriverCustomPath = process.env.CHROMEDRIVER_CUSTOM_PATH;
20-
21-
const retries = 0;
19+
const retries = process.env.RETRIES || 2;
2220

2321
let screenshotRoot = process.env.SCREENSHOT_DIRECTORY;
2422

@@ -28,7 +26,6 @@ screenshotRoot = screenshotRoot.replace(/\/$/, '');
2826
const chromeArgs = [
2927
'--disable-composited-antialiasing',
3028
'--allow-insecure-localhost',
31-
'--window-size=1600,1000',
3229
].concat(
3330
(function() {
3431
return process.env.HEADLESS_CHROME === 'true'
@@ -108,7 +105,7 @@ function saveErrorImage(
108105
) {
109106
if (error) {
110107
if (!fs.existsSync(errorDir)) {
111-
fs.mkdirSync(errorDir, 0o744);
108+
fs.mkdirSync(errorDir, 0744);
112109
}
113110
const title = test.title.trim().replace(/\s/g, '_');
114111
const img = `${errorDir}${title}.png`;
@@ -148,9 +145,6 @@ SPEC_FILE_PATTERN = SPEC_FILE_PATTERN.includes('/')
148145
? SPEC_FILE_PATTERN
149146
: `${TEST_TYPE}/specs/**/${SPEC_FILE_PATTERN}`;
150147

151-
console.log(`ENV SPEC_FILE_PATTERN: ` + process.env.SPEC_FILE_PATTERN);
152-
console.log(`active spec file pattern: ` + SPEC_FILE_PATTERN);
153-
154148
exports.config = {
155149
//
156150
// ====================
@@ -268,27 +262,48 @@ exports.config = {
268262
// your test setup with almost no effort. Unlike plugins, they don't add new
269263
// commands. Instead, they hook themselves up into the test process.
270264
services: [
271-
[
272-
'chromedriver',
273-
{
274-
logLevel: 'info',
275-
outputDir: './driver-logs',
276-
chromedriverCustomPath,
277-
},
278-
],
279265
[
280266
'novus-visual-regression',
281267
{
282268
compare: LocalCompare,
283269
viewportChangePause: 300,
284270
viewports: [{ width: 1600, height: 1000 }],
285271
orientations: ['landscape', 'portrait'],
286-
after: () => {},
287272
},
288273
],
289274
],
290275

291-
//port: 53473,
276+
//port: 53171,
277+
// FROM OLD webdriver config
278+
// capabilities: [
279+
// {
280+
// //browserName: 'chrome',
281+
// chromeOptions: {
282+
// args: [
283+
// '--disable-composited-antialiasing',
284+
// '--allow-insecure-localhost',
285+
// ],
286+
// },
287+
//
288+
// os: 'OS X',
289+
// os_version: 'High Sierra',
290+
// browser: 'Chrome',
291+
// browser_version: '74.0 beta',
292+
// resolution: '1600x1200',
293+
// },
294+
// ],
295+
//
296+
// IECapabilties: [
297+
// {
298+
// os: 'Windows',
299+
// os_version: '10',
300+
// browser: 'IE',
301+
// browser_version: '11.0',
302+
// 'browserstack.selenium_version': '3.5.2',
303+
// resolution: '1600x1200',
304+
// 'browserstack.local': true,
305+
// },
306+
// ],
292307

293308
// Framework you want to run your specs with.
294309
// The following are supported: Mocha, Jasmine, and Cucumber

0 commit comments

Comments
 (0)