@camperaid/watest 2.5.1 → 2.5.3

package/tests/series/servicer/{t_servicer.js → t-servicer.js}

@@ -1,40 +1,5 @@
 import { is_test_output, success } from '../../base/test.js';
-import { log } from '../../../logging/logging.js';
-import { MockSeries } from '../mock_series.js';
-
-// Mock servicer that logs to console for output validation
-class MockServicer {
-  constructor(type) {
-    this.type = type;
-  }
-
-  async start(service) {
-    log(`MockServicer:${this.type} starting ${service}`);
-    return { started: service, type: this.type };
-  }
-
-  async stop(service) {
-    log(`MockServicer:${this.type} stopping ${service}`);
-    return { stopped: service, type: this.type };
-  }
-
-  async shutdown() {
-    log(`MockServicer:${this.type} shutdown`);
-    return { shutdown: true, type: this.type };
-  }
-
-  async ontest() {
-    // Optional: log test notifications
-    return null;
-  }
-}
-
-// Extended MockSeries that uses our logging servicer
-class MockSeriesWithServicer extends MockSeries {
-  createServicer(type) {
-    return new MockServicer(type || 'default');
-  }
-}
+import { MockSeriesWithServicer } from './mock-servicer.js';
 
 export async function test() {
   const ts = {
@@ -60,6 +25,7 @@ export async function test() {
       'Settings: chrome webdrivers',
       '\x1B[38;5;99mStarted\x1B[0m mac/',
       '!Running: mac/init, path: tests/meta.js',
+      'MockServicer:docker init',
       'MockServicer:docker starting mysql',
       'MockServicer:docker starting redis',
       '>mac/init completed in',
@@ -67,16 +33,17 @@ export async function test() {
       '\x1B[32mOk:\x1B[0m Servicer test example works',
       '>mac/t_example.js completed in',
       '!Running: mac/uninit, path: tests/meta.js',
+      'MockServicer:docker deinit',
       'MockServicer:docker stopping redis',
       'MockServicer:docker stopping mysql',
-      'MockServicer:docker shutdown',
       '>mac/uninit completed in',
       '\x1B[102mSuccess!\x1B[0m Total: 1',
       '\x1B[38;5;243mCompleted\x1B[0m mac/',
       'Logs are written to',
       'Elapsed:',
       'Logs are written to',
-      'Testsuite: shutdown'
+      'MockServicer:docker shutdown',
+      'Testsuite: shutdown',
     ],
     [],
     'servicer lifecycle',

package/tests/series/test.js

@@ -32,7 +32,7 @@ class MockLogPipe {
 export * from '../../core/util.js';
 export * from '../../core/base.js';
 export * from '../../core/format.js';
-export * from './mock_series.js';
+export * from './mock-series.js';
 
 export { Series };
 

package/tests/test.js

@@ -0,0 +1,2 @@
+export * from '../core/base.js';
+export * from '../core/core.js';

package/tests/webdriver/test.js

@@ -1,7 +1,7 @@
 import { is_output } from '../../core/base.js';
 import { testflow, fail } from '../../core/core.js';
 import { scope } from '../../webdriver/session.js';
-import { TestExecutionError } from '../../webdriver/driver_base.js';
+import { TestExecutionError } from '../../webdriver/driver-base.js';
 
 const reducedTimeout = 0.001;
 
@@ -30,8 +30,8 @@ const eat_failure = func => async () => {
 
 export * from '../../core/core.js';
 export * from '../../core/base.js';
-export * from '../../webdriver/app_driver.js';
-export * from '../../webdriver/control_driver.js';
+export * from '../../webdriver/app-driver.js';
+export * from '../../webdriver/control-driver.js';
 
 export function do_self_tests(snippet, test) {
   return scope(snippet, async session => {

package/webdriver/{control_driver.js → control-driver.js}

@@ -1,5 +1,5 @@
 import { assert } from '../core/core.js';
-import { AppDriver } from './app_driver.js';
+import { AppDriver } from './app-driver.js';
 
 /**
  * Control driver base.

package/webdriver/{driver_base.js → driver-base.js}

@@ -1,4 +1,4 @@
-import settings from '../core/settings.js';
+import { settings } from '../core/settings.js';
 import { is } from '../core/base.js';
 import {
   assert,
@@ -37,6 +37,13 @@ function getChromeOptions() {
       deviceName: 'iPhone 7',
     });
   }
+  // Accept self-signed certificates (for k3s testing)
+  chromeOptions.addArguments('ignore-certificate-errors');
+
+  // Required for running in Docker/VPS environments
+  chromeOptions.addArguments('no-sandbox');
+  chromeOptions.addArguments('disable-dev-shm-usage');
+
   return chromeOptions;
 }
 

package/webdriver/driver.js

@@ -3,7 +3,7 @@ import { test_is, test_contains, is, contains, ok } from '../core/base.js';
 import { assert, fail } from '../core/core.js';
 import { is_mac, stringify, toDataURL } from '../core/util.js';
 import { log } from '../logging/logging.js';
-import { getTimeout, DriverBase } from './driver_base.js';
+import { getTimeout, DriverBase } from './driver-base.js';
 
 /**
  * A chainable web driver providing a number of handy methods to navigate

package/webdriver/session.js

@@ -145,38 +145,65 @@ async function start_session(arg1, arg2) {
 
 /**
  * Opens a new browser window and runs the given tests within it.
- * @param arg1 - url_or_snippet or tests
- * @param arg2 - tests if |arg1| is url_or_snippet or options or libs
- @ @param arg3 - libs if |arg2| is not libs
+ * @param args - [url?], tests, [options?], [libs?]
+ *   url: string or function returning string
+ *   tests: async function receiving session
+ *   options: object (e.g., {auto_session: false})
+ *   libs: array of library paths to load
  */
-const scope = (arg1, arg2, arg3) => async () => {
-  let url_or_snippet = (typeof arg1 == 'string' && arg1) || null;
-  let tests = (typeof arg1 == 'function' && arg1) || arg2;
-  let options = (typeof arg1 == 'function' && arg2) || null;
-  let libs = arg3 || (arg2 instanceof Array && arg2);
-  assert(tests, 'No tests to run provided');
-
-  // Do the test.
-  try {
-    // Start session if requested.
-    let session = null;
-    if (!options || options.auto_session !== false) {
-      session = await start_session(url_or_snippet, libs);
-    }
-    await tests(session);
-  } catch (e) {
-    log_error(e);
-    fail(e.message);
-  } finally {
-    log(`Quit ${active_sessions.length} wd session(s)`);
-
-    while (active_sessions.length > 1) {
-      await active_sessions[1].close();
+const scope =
+  (...args) =>
+  async () => {
+    let libs, options, tests, url_or_snippet_getter;
+
+    // Extract args from end: libs (array) then options (object) then tests (function) then url
+    for (let i = args.length - 1; i >= 0; i--) {
+      const arg = args[i];
+      if (!libs && Array.isArray(arg)) {
+        libs = arg;
+      } else if (
+        !options &&
+        arg &&
+        typeof arg === 'object' &&
+        typeof arg !== 'function'
+      ) {
+        options = arg;
+      } else if (!tests && typeof arg === 'function') {
+        tests = arg;
+      } else if (typeof arg === 'string' || typeof arg === 'function') {
+        url_or_snippet_getter = arg;
+      }
     }
-    if (active_sessions.length == 1) {
-      await active_sessions[0].quit();
+
+    const url_or_snippet = url_or_snippet_getter
+      ? typeof url_or_snippet_getter === 'function'
+        ? url_or_snippet_getter()
+        : url_or_snippet_getter
+      : null;
+
+    assert(tests, 'No tests to run provided');
+
+    // Do the test.
+    try {
+      // Start session if requested.
+      let session = null;
+      if (!options || options.auto_session !== false) {
+        session = await start_session(url_or_snippet, libs);
+      }
+      await tests(session);
+    } catch (e) {
+      log_error(e);
+      fail(e.message);
+    } finally {
+      log(`Quit ${active_sessions.length} wd session(s)`);
+
+      while (active_sessions.length > 1) {
+        await active_sessions[1].close();
+      }
+      if (active_sessions.length == 1) {
+        await active_sessions[0].quit();
+      }
     }
-  }
-};
+  };
 
 export { start_session, scope };