@camperaid/watest 2.4.6 → 2.4.8

package/interfaces/servicer.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * Manages services requested by a testsuite.
  */
@@ -31,4 +29,4 @@ class Servicer {
   get(/* service */) {}
 }
 
-module.exports = new Servicer();
+export default new Servicer();

package/logging/filestream.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import path from 'path';
 
 /**
  * Writes to a local file.
@@ -37,6 +35,4 @@ class FileStream {
   }
 }
 
-module.exports = {
-  FileStream,
-};
+export { FileStream };

package/logging/logging.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const { ProcessArgs } = require('../core/process_args.js');
+import { ProcessArgs } from '../core/process_args.js';
 
 function log(...args) {
   console.log(...args);
@@ -15,13 +13,9 @@ function log_error(...args) {
   // before sending it via callbacks, which may make buffers to contain output
   // from multiple console.log/error calls, which makes the child process output
   // processing messy.
-  ProcessArgs.asObject().childProcess ?
-    console.log(...args) :
-    console.error(...args);
+  ProcessArgs.asObject().childProcess
+    ? console.log(...args)
+    : console.error(...args);
 }
 
-module.exports = {
-  log,
-  log_trace,
-  log_error
-};
+export { log, log_trace, log_error };

package/logging/logpipe.js

@@ -1,23 +1,21 @@
-'use strict';
+import path from 'path';
 
-const path = require('path');
-
-const settings = require('../core/settings.js');
-const { log, log_error } = require('./logging.js');
-const { log_dir, run } = settings;
+import { FileStream as DefaultFileStream } from './filestream.js';
+import { log, log_error } from './logging.js';
+import settings from '../core/settings.js';
 
 /**
  * A single instance of a logpipe writing to std and file streams.
  */
 class LogPipeInstance {
   constructor({ FileStream, suppress_logging }) {
-    this.FS = FileStream || require('./filestream.js').FileStream;
+    this.FS = FileStream || DefaultFileStream;
     this.suppress_logging = suppress_logging;
   }
 
   attach(invocation) {
     this.invocation = invocation;
-    this.log_dir = path.join(log_dir, this.invocation);
+    this.log_dir = path.join(settings.log_dir, this.invocation);
     if (this.suppress_logging) {
       return;
     }
@@ -30,7 +28,7 @@ class LogPipeInstance {
       log_error(e);
     });
 
-    return settings.logger.testRunStarted({ run, invocation });
+    return settings.logger.testRunStarted({ run: settings.run, invocation });
   }
 
   async logScreenshot(pic) {
@@ -43,7 +41,7 @@ class LogPipeInstance {
     log(`Screenshot is captured and written to ${stream.filepath}`);
 
     await settings.logger.writeLogFile({
-      run,
+      run: settings.run,
       invocation: this.invocation,
       name,
       content,
@@ -51,7 +49,10 @@ class LogPipeInstance {
   }
 
   logSourceMap() {
-    return settings.logger.writeSourceMap({ run, invocation: this.invocation });
+    return settings.logger.writeSourceMap({
+      run: settings.run,
+      invocation: this.invocation,
+    });
   }
 
   release() {
@@ -62,12 +63,12 @@ class LogPipeInstance {
         .then(() => this.fstream.readFile())
         .then(content =>
           settings.logger.writeLogFile({
-            run,
+            run: settings.run,
             invocation: this.invocation,
             name: this.fname,
             content,
             zip: true,
-          })
+          }),
         )
         .catch(e => {
           log_error(`Logging shutdown rejected: ${e}`);
@@ -82,7 +83,7 @@ class LogPipeInstance {
  */
 class LogPipe {
   static attach(invocation, options = {}) {
-    if (!log_dir) {
+    if (!settings.log_dir) {
       return Promise.resolve();
     }
 
@@ -100,13 +101,15 @@ class LogPipe {
   }
 
   static logScreenshot(...args) {
-    return log_dir
+    return settings.log_dir
       ? this.pipeOnStack.logScreenshot(...args)
       : Promise.resolve();
   }
 
   static logSourceMap(...args) {
-    return log_dir ? this.pipeOnStack.logSourceMap(...args) : Promise.resolve();
+    return settings.log_dir
+      ? this.pipeOnStack.logSourceMap(...args)
+      : Promise.resolve();
   }
 
   static logToFile(msg) {
@@ -117,7 +120,7 @@ class LogPipe {
   }
 
   static async release(...args) {
-    if (!log_dir) {
+    if (!settings.log_dir) {
       return Promise.resolve();
     }
 
@@ -184,9 +187,6 @@ class LogPipe {
   }
 }
 
-LogPipe.FileStream = require('./filestream.js').FileStream;
 LogPipe.stack = [];
 
-module.exports = {
-  LogPipe,
-};
+export { LogPipe };

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@camperaid/watest",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "Web Application Testsuite",
+  "type": "module",
   "engines": {
-    "node": ">=14.15.1"
+    "node": ">=20.16.0"
   },
   "main": "index.js",
-  "module": "index.mjs",
   "bin": {
     "watest": "./bin/watest.js"
   },
   "scripts": {
+    "prepare": "husky || true",
     "postprepare": "bash tests/install.sh",
     "lint": "eslint '**/*.js'",
     "lint:staged": "eslint --",
@@ -35,16 +36,16 @@
   },
   "homepage": "https://github.com/camperaid/watest#readme",
   "dependencies": {
-    "selenium-webdriver": "^4.0.0-beta.2"
+    "selenium-webdriver": "^4.23.0"
   },
   "devDependencies": {
-    "dotenv": "^16.0.1",
-    "eslint": "^8.22.0",
-    "eslint-plugin-node": "^11.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
-    "prettifier": "^0.4.0"
+    "dotenv": "^16.4.5",
+    "eslint": "^9.8.0",
+    "@eslint/js": "^9.8.0",
+    "eslint-plugin-n": "^17.10.1",
+    "husky": "^9.1.4",
+    "lint-staged": "^15.2.7",
+    "prettier": "^3.3.3"
   },
   "lint-staged": {
     "*.js": [

package/tests/base/t_api.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const api = require('../../index.js');
+import * as api from '../../index.js';
 const { ok } = api;
 
-module.exports.test = async () => {
+export async function test() {
   const props = [
     'AppDriver',
     'ControlDriver',
@@ -24,11 +22,10 @@ module.exports.test = async () => {
     'todo',
     'test_is',
     'test_contains',
-    'tmp_storage_dir',
     'warn',
   ];
 
   for (let prop of props) {
     ok(prop in api, `${prop} present`);
   }
-};
+}

package/tests/base/t_contains.js

@@ -1,14 +1,12 @@
-'use strict';
+import { contains, is_output } from './test.js';
 
-const { contains, is_output } = require('./test.js');
-
-module.exports.test = async () => {
+export async function test() {
   // string: success
   await is_output(
     () => contains('green cat', 'cat', `String contains`),
     [`Ok: String contains, got: 'green cat'`],
     [],
-    `success`
+    `success`,
   );
 
   // string: failure: expected string, got array
@@ -16,7 +14,7 @@ module.exports.test = async () => {
     () => contains([], 'green cat', `String contains`),
     [],
     [`Failed: String contains, expected string, got object: []`],
-    `failure`
+    `failure`,
   );
 
   // string: failure: got string, expected array
@@ -24,15 +22,17 @@ module.exports.test = async () => {
     () => contains('cat', [], `String contains`),
     [],
     [`Failed: String contains, got string, expected object: []`],
-    `failure`
+    `failure`,
   );
 
   // string: failure: doesn't contains
   await is_output(
     () => contains('cat', 'green cat', `String contains`),
     [],
-    [`Failed: String contains, got string doesn't contain expected string, got: 'cat', expected: 'green cat'`],
-    `failure`
+    [
+      `Failed: String contains, got string doesn't contain expected string, got: 'cat', expected: 'green cat'`,
+    ],
+    `failure`,
   );
 
   // array: success
@@ -40,7 +40,7 @@ module.exports.test = async () => {
     () => contains([0, 1], [1], `Array contains`),
     [`Ok: Array contains, got: [0, 1]`],
     [],
-    `success`
+    `success`,
   );
 
   // array: failure
@@ -48,6 +48,6 @@ module.exports.test = async () => {
     () => contains([0, 1], [1, 3], `Array contains`),
     [],
     [`Failed: Array contains, array has no expected item 3, got: [0, 1]`],
-    `failure`
+    `failure`,
   );
-};
+}

package/tests/base/t_core.js

@@ -1,20 +1,23 @@
-'use strict';
+import { colorify, group, fail, success, is_output } from './test.js';
 
-const { colorify, group, fail, success, is_output } = require('./test.js');
-
-module.exports.test = async () => {
+export async function test() {
   // console.log
   await is_output(() => console.log(3), [`3\n`], [], `console.log(3)`);
 
   // console.error
-  await is_output(() => console.error(3), [], [`3\n`], `console.error(3)`);
+  await is_output(
+    () => console.error(3),
+    [],
+    [`3\n`],
+    `console.error(3)`,
+  );
 
   // group(msg)
   await is_output(
     () => group('message'),
     [colorify('group', `Group:`, 'message')],
     [],
-    `group(msg)`
+    `group(msg)`,
   );
 
   // group(msg, label);
@@ -22,7 +25,7 @@ module.exports.test = async () => {
     () => group('message', 'Block'),
     [colorify('group', `Block:`, 'message')],
     [],
-    `group(msg, label)`
+    `group(msg, label)`,
   );
 
   // success()
@@ -30,4 +33,4 @@ module.exports.test = async () => {
 
   // fail()
   await is_output(() => fail('Fail'), [], [`Failed: Fail`], `fail()`);
-};
+}

package/tests/base/t_format.js

@@ -1,16 +1,15 @@
-'use strict';
-
-const {
+import {
   format_completed,
   format_failure,
   format_failures,
   format_success,
   parse,
   parse_failure,
-} = require('../../core/format.js');
-const { is } = require('../../index.js');
+} from '../../core/format.js';
+
+import { is } from '../../index.js';
 
-module.exports.test = () => {
+export function test() {
   // parse: failure
   is(
     parse(format_failure('Oops')),
@@ -19,7 +18,7 @@ module.exports.test = () => {
       label: 'Failed:',
       msg: 'Oops',
     },
-    'parse: failure'
+    'parse: failure',
   );
 
   // parse: completed
@@ -30,7 +29,7 @@ module.exports.test = () => {
       label: 'Completed',
       msg: 'Yes',
     },
-    'parse: completed'
+    'parse: completed',
   );
 
   // parse: failures
@@ -41,7 +40,7 @@ module.exports.test = () => {
       label: '>mac/webdriver/chrome/t_locmarker_click.js',
       msg: 'Failure count: 1',
     },
-    'parse: failures'
+    'parse: failures',
   );
 
   // parse: success
@@ -52,7 +51,7 @@ module.exports.test = () => {
       label: 'mac/webdriver',
       msg: 'Total: 1',
     },
-    'parse: success'
+    'parse: success',
   );
 
   // parse_failure
@@ -60,12 +59,12 @@ module.exports.test = () => {
     parse_failure(
       format_failure(
         'has 4 failure(s)',
-        '>mac/webdriver/ui-blocks/firefox/map/t_locmarker_click.js'
-      )
+        '>mac/webdriver/ui-blocks/firefox/map/t_locmarker_click.js',
+      ),
     ),
     {
       name: 'mac/webdriver/ui-blocks/firefox/map/t_locmarker_click.js',
       count: '4',
-    }
+    },
   );
-};
+}

package/tests/base/t_is.js

@@ -1,14 +1,12 @@
-'use strict';
+import { is, is_output } from './test.js';
 
-const { is, is_output } = require('./test.js');
-
-module.exports.test = async () => {
+export async function test() {
   // is() sucess
   await is_output(
     () => is(3, 3, `Equal`),
     [`Ok: Equal, got: 3`],
     [],
-    `is() sucess`
+    `is() sucess`,
   );
 
   // is() failure
@@ -16,7 +14,7 @@ module.exports.test = async () => {
     () => is(3, 4, `Not equal`),
     [],
     [`Failed: Not equal, got: 3, expected: 4`],
-    `is() failure`
+    `is() failure`,
   );
 
   // is() regexp sucess
@@ -24,7 +22,7 @@ module.exports.test = async () => {
     () => is('34', /^\d+$/, `Equal`),
     [`Ok: Equal '34' matches /^\\d+$/ regexp`],
     [],
-    `is() regexp sucess`
+    `is() regexp sucess`,
   );
 
   // is() regexp failure
@@ -32,7 +30,7 @@ module.exports.test = async () => {
     () => is('34a', /^\d+$/, `Equal`),
     [],
     [`Failed: Equal '34a' doesn't match /^\\d+$/ regexp`],
-    `is() regexp failure`
+    `is() regexp failure`,
   );
 
   // is() object sucess
@@ -40,7 +38,7 @@ module.exports.test = async () => {
     () => is({ field: 'hey' }, { field: 'hey' }, `Objects equal`),
     [`Ok: Objects equal, got: {field: 'hey'}`],
     [],
-    `is() object sucess`
+    `is() object sucess`,
   );
 
   // is() object failure
@@ -51,6 +49,6 @@ module.exports.test = async () => {
       `Failed: Objects not equal: 'field' field value mismatch;\ngot:\nhey\nexpected:\npey\nunexpected character: 'h' at 0 pos, expected: 'p' at '' line`,
       `Failed: Objects not equal`,
     ],
-    `is() object failure`
+    `is() object failure`,
   );
-};
+}

package/tests/base/t_is_object.js

@@ -1,14 +1,12 @@
-'use strict';
+import { is_output, is_object } from './test.js';
 
-const { is_output, is_object } = require('./test.js');
-
-module.exports.test = async () => {
+export async function test() {
   // sucess
   await is_output(
     () => is_object({ field: 'hey' }, { field: 'hey' }, 'TstMsg'),
     [`Ok: TstMsg, got: {field: 'hey'}\n`],
     [],
-    `sucess`
+    `sucess`,
   );
 
   // types: Set
@@ -16,7 +14,7 @@ module.exports.test = async () => {
     () => is_object(new Set(['v1', 'v2']), ['v1', 'v2'], 'TstMsg'),
     [`Ok: TstMsg, got: Set['v1', 'v2']`],
     [],
-    `types: Set`
+    `types: Set`,
   );
 
   // types: Map
@@ -24,7 +22,7 @@ module.exports.test = async () => {
     () => is_object(new Map([['key', 'val']]), [['key', 'val']], 'TstMsg'),
     [`Ok: TstMsg, got: Map{key: 'val'}`],
     [],
-    `types: Map`
+    `types: Map`,
   );
 
   // types: Date success
@@ -32,7 +30,7 @@ module.exports.test = async () => {
     () => is_object(new Date('2022-01-01'), new Date('2022-01-01'), 'TstMsg'),
     [`Ok: TstMsg, got: 2022-01-01T00:00:00.000Z`],
     [],
-    `types: Date sucess`
+    `types: Date sucess`,
   );
 
   // types: Date failure
@@ -43,7 +41,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: unexpected value: 2022-01-01T00:00:00.000Z, expected: 2023-02-02T00:00:00.000Z`,
       `Failed: TstMsg`,
     ],
-    `types: Date failure`
+    `types: Date failure`,
   );
 
   // function sucess
@@ -51,7 +49,7 @@ module.exports.test = async () => {
     () => is_object({ field: 'hey' }, () => true, 'TstMsg'),
     [`Ok: TstMsg, got: {field: 'hey'}`],
     [],
-    `function sucess`
+    `function sucess`,
   );
 
   // function failure
@@ -62,7 +60,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: unexpected value: {field: 'hey'}, expected: () => false`,
       `Failed: TstMsg`,
     ],
-    `function failure`
+    `function failure`,
   );
 
   // failure: type mismatch
@@ -73,7 +71,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: 'key' field type mismatch, got type: number, expected type: string, got value: 3, expected value: '3'`,
       `Failed: TstMsg`,
     ],
-    `failure: type mismatch`
+    `failure: type mismatch`,
   );
 
   // failure: class mismatch
@@ -84,7 +82,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: class mismatch, got: Array, expected: Map`,
       `Failed: TstMsg`,
     ],
-    `failure: class mismatch, expected of a different class`
+    `failure: class mismatch, expected of a different class`,
   );
 
   // failure: class mismatch
@@ -95,7 +93,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: class mismatch, got: Set, expected: Map`,
       `Failed: TstMsg`,
     ],
-    `failure: class mismatch, |expected| and |got| belong to different classes`
+    `failure: class mismatch, |expected| and |got| belong to different classes`,
   );
 
   // success: class mismatch but |expected| is a generic Object
@@ -109,7 +107,7 @@ module.exports.test = async () => {
     () => is_object(new A(), { name: 'name' }, 'TstMsg'),
     [`Ok: TstMsg, got: {name: 'name'}`],
     [],
-    `success: class mismatch but |expected| is a generic Object`
+    `success: class mismatch but |expected| is a generic Object`,
   );
 
   // failure: value mismatch
@@ -120,7 +118,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: class mismatch, got: Object, expected: null`,
       `Failed: TstMsg`,
     ],
-    `failure: class mismatch (null) #2`
+    `failure: class mismatch (null) #2`,
   );
 
   // failure: value mismatch
@@ -131,7 +129,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: 'field' field value mismatch;\ngot:\nhey\nexpected:\npey\nunexpected character: 'h' at 0 pos, expected: 'p' at '' line`,
       `Failed: TstMsg`,
     ],
-    `failure: value mismatch (strings)`
+    `failure: value mismatch (strings)`,
   );
 
   // failure: not enumerable property value mismatch
@@ -144,14 +142,14 @@ module.exports.test = async () => {
           }
         })(),
         { field: 'pey' },
-        'TstMsg'
+        'TstMsg',
       ),
     [],
     [
       `Failed: TstMsg: 'field' field value mismatch;\ngot:\nhey\nexpected:\npey\nunexpected character: 'h' at 0 pos, expected: 'p' at '' line`,
       `Failed: TstMsg`,
     ],
-    `failure: not enumerable property value mismatch`
+    `failure: not enumerable property value mismatch`,
   );
 
   // failure: primitive
@@ -159,7 +157,7 @@ module.exports.test = async () => {
     () => is_object(null, {}, 'TstMsg'),
     [],
     [`Failed: TstMsg, got: null, expected: [object Object]`],
-    `failure: value mismatch (null)`
+    `failure: value mismatch (null)`,
   );
 
   // failure: field was not expected
@@ -175,7 +173,7 @@ module.exports.test = async () => {
         {
           f2: {},
         },
-        'TstMsg'
+        'TstMsg',
       ),
     [],
     [
@@ -183,7 +181,7 @@ module.exports.test = async () => {
       `Failed: TstMsg: 'f2->f21' field was not expected, got: 'f21'`,
       `Failed: TstMsg`,
     ],
-    `failure: class mismatch`
+    `failure: class mismatch`,
   );
 
   // failure: nested fields, array length mismatch
@@ -200,13 +198,13 @@ module.exports.test = async () => {
             f2: [3],
           },
         },
-        'TstMsg'
+        'TstMsg',
       ),
     [],
     [
       `Failed: TstMsg: 'f1->f2' field array length mismatch, got: 0, expected: 1.\nGot: []\nExpected: [3]`,
       `Failed: TstMsg`,
     ],
-    `failure: nested fields array length mismatch`
+    `failure: nested fields array length mismatch`,
   );
-};
+}