Merge pull request #3663 from kbase/sep-2024-updates-js

Fix WebdriverIO configs
kbase · Sep 24, 2024 · 1f28a09 · 1f28a09
2 parents 9fef1d0 + d4530b4
commit 1f28a09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/test/integration/specs/narrative_basic_test.js b/test/integration/specs/narrative_basic_test.js
@@ -1,12 +1,12 @@
 'use strict';
-const { login, makeURL } = require('../wdioUtils');
+const { login } = require('../wdioUtils');
 const env = process.env.ENV || 'ci';
 const testData = require('./narrative_basic_data.json');
 const testCases = testData.envs[env];
 
 describe('Narrative tree page with login', () => {
     beforeEach(async () => {
-        await browser.setTimeout({ implicit: 30000 });
+        await browser.setTimeout({ pageLoad: 30000 });
         await browser.reloadSession();
         await login();
     });
@@ -16,7 +16,7 @@ describe('Narrative tree page with login', () => {
     });
 
     it('opens a narrative', async () => {
-        await browser.url(makeURL(`narrative/${testCases.CASE_1.narrativeId}`));
+        await browser.url(`/narrative/${testCases.CASE_1.narrativeId}`);
         const loadingBlocker = await $('#kb-loading-blocker');
         const loadingText = await loadingBlocker.getText();
         await expect(loadingText).toContain('Connecting to KBase services...');

diff --git a/test/integration/wdio.conf.js b/test/integration/wdio.conf.js
@@ -4,8 +4,6 @@
 const testConfig = require('../testConfig');
 const fs = require('fs');
 
-const CHROME_BINARY = require('puppeteer').executablePath();
-
 /**
  * Given a preset key, return set set of common configuration keys for a given service, os, and browser
  * This is useful because testing services support a limited number of browser dimensions, which differs
@@ -176,7 +174,6 @@ const serviceConfigs = {
         logPath: 'selenium-standalone-logs',
         // drivers
     },
-    chromedriver: {},
     browserstack: {
         browserstackLocal: true,
         opts: {},
@@ -196,21 +193,19 @@ function makeCapabilities(config) {
         case 'chromedriver':
             return (() => {
                 const args = [
-                    '--disable-gpu',
-                    '--no-sandbox',
+                    'headless',
+                    'disable-gpu',
                     `window-size=${config.WIDTH},${config.HEIGHT}`,
                 ];
-                if (config.HEADLESS === 't') {
-                    args.push('--headless');
-                }
                 return {
                     browserName: 'chrome',
+                    browserVersion: '128',
                     acceptInsecureCerts: true,
                     maxInstances: 1,
                     'goog:chromeOptions': {
                         args,
-                        binary: CHROME_BINARY,
                     },
+                    'wdio:enforceWebDriverClassic': true
                 };
             })();
         case 'selenium-standalone':
@@ -322,7 +317,7 @@ const wdioConfig = {
     // and 30 processes will get spawned. The property handles how many capabilities
     // from the same test should run tests.
     //
-    maxInstances: 10,
+    maxInstances: 1,
     //
     // If you have trouble getting all important capabilities together, check out the
     // Sauce Labs platform configurator - a great tool to configure your capabilities:
@@ -392,7 +387,6 @@ const wdioConfig = {
     // 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: [[testParams.SERVICE, serviceConfigs[testParams.SERVICE]]],
 
     // Framework you want to run your specs with.
     // The following are supported: Mocha, Jasmine, and Cucumber
@@ -428,6 +422,7 @@ const wdioConfig = {
     // see also: https://webdriver.io/docs/dot-reporter.html
     reporters: ['spec'],
 
+
     //
     // Options to be passed to Mocha.
     // See the full list at http://mochajs.org/