expect-webdriverio 4.11.0 → 4.11.2

package/lib/snapshot.js

@@ -9,11 +9,25 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SnapshotService_instances, _SnapshotService_currentFilePath, _SnapshotService_currentTestName, _SnapshotService_options, _SnapshotService_snapshotResults, _SnapshotService_snapshotEnvironment, _SnapshotService_snapshotClient, _SnapshotService_isEqual;
+var _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, _SnapshotService_instances, _SnapshotService_currentFilePath, _SnapshotService_currentTestName, _SnapshotService_options, _SnapshotService_snapshotResults, _SnapshotService_snapshotClient, _SnapshotService_isEqual;
 import { expect } from '@wdio/globals';
 import { SnapshotClient } from '@vitest/snapshot';
 import { NodeSnapshotEnvironment } from '@vitest/snapshot/environment';
 let service;
+class WebdriverIOSnapshotEnvironment extends NodeSnapshotEnvironment {
+    constructor(resolveSnapshotPath) {
+        super({});
+        _WebdriverIOSnapshotEnvironment_resolveSnapshotPath.set(this, void 0);
+        __classPrivateFieldSet(this, _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, resolveSnapshotPath, "f");
+    }
+    async resolvePath(filepath) {
+        if (__classPrivateFieldGet(this, _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, "f")) {
+            return __classPrivateFieldGet(this, _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, "f").call(this, filepath, '.snap');
+        }
+        return super.resolvePath(filepath);
+    }
+}
+_WebdriverIOSnapshotEnvironment_resolveSnapshotPath = new WeakMap();
 export class SnapshotService {
     constructor(options) {
         _SnapshotService_instances.add(this);
@@ -21,16 +35,17 @@ export class SnapshotService {
         _SnapshotService_currentTestName.set(this, void 0);
         _SnapshotService_options.set(this, void 0);
         _SnapshotService_snapshotResults.set(this, []);
-        _SnapshotService_snapshotEnvironment.set(this, void 0);
         _SnapshotService_snapshotClient.set(this, new SnapshotClient({
             isEqual: __classPrivateFieldGet(this, _SnapshotService_instances, "m", _SnapshotService_isEqual).bind(this),
         }));
-        __classPrivateFieldSet(this, _SnapshotService_snapshotEnvironment, new NodeSnapshotEnvironment({
-            snapshotsDirName: options?.snapshotsDirName
-        }), "f");
+        const updateSnapshot = (Boolean(process.env.CI) && !options?.updateState)
+            ? 'none'
+            : options?.updateState
+                ? options.updateState
+                : 'new';
         __classPrivateFieldSet(this, _SnapshotService_options, {
-            updateSnapshot: options?.updateState || 'new',
-            snapshotEnvironment: __classPrivateFieldGet(this, _SnapshotService_snapshotEnvironment, "f"),
+            updateSnapshot,
+            snapshotEnvironment: new WebdriverIOSnapshotEnvironment(options?.resolveSnapshotPath)
         }, "f");
     }
     get currentFilePath() {
@@ -45,10 +60,10 @@ export class SnapshotService {
     get results() {
         return __classPrivateFieldGet(this, _SnapshotService_snapshotResults, "f");
     }
-    beforeTest(test) {
+    async beforeTest(test) {
         __classPrivateFieldSet(this, _SnapshotService_currentFilePath, test.file, "f");
         __classPrivateFieldSet(this, _SnapshotService_currentTestName, `${test.parent} > ${test.title}`, "f");
-        __classPrivateFieldGet(this, _SnapshotService_snapshotClient, "f").startCurrentRun(test.file, test.fullTitle, __classPrivateFieldGet(this, _SnapshotService_options, "f"));
+        await __classPrivateFieldGet(this, _SnapshotService_snapshotClient, "f").startCurrentRun(test.file, test.fullTitle, __classPrivateFieldGet(this, _SnapshotService_options, "f"));
     }
     async after() {
         const result = await __classPrivateFieldGet(this, _SnapshotService_snapshotClient, "f").finishCurrentRun();
@@ -64,7 +79,7 @@ export class SnapshotService {
         return service;
     }
 }
-_SnapshotService_currentFilePath = new WeakMap(), _SnapshotService_currentTestName = new WeakMap(), _SnapshotService_options = new WeakMap(), _SnapshotService_snapshotResults = new WeakMap(), _SnapshotService_snapshotEnvironment = new WeakMap(), _SnapshotService_snapshotClient = new WeakMap(), _SnapshotService_instances = new WeakSet(), _SnapshotService_isEqual = function _SnapshotService_isEqual(received, expected) {
+_SnapshotService_currentFilePath = new WeakMap(), _SnapshotService_currentTestName = new WeakMap(), _SnapshotService_options = new WeakMap(), _SnapshotService_snapshotResults = new WeakMap(), _SnapshotService_snapshotClient = new WeakMap(), _SnapshotService_instances = new WeakSet(), _SnapshotService_isEqual = function _SnapshotService_isEqual(received, expected) {
     try {
         expect(received).toBe(expected);
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "4.11.0",
+  "version": "4.11.2",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",

package/types/expect-webdriverio.d.ts

@@ -3,9 +3,10 @@ declare namespace ExpectWebdriverIO {
     function setOptions(options: DefaultOptions): void
     function getConfig(): any
 
+    type ResolveSnapshotPathFunction = (path: string, extension: string) => string
     interface SnapshotServiceArgs {
-        updateState?: import('@vitest/snapshot').SnapshotUpdateState
-        snapshotsDirName?: string
+        updateState?: SnapshotUpdateState
+        resolveSnapshotPath?: ResolveSnapshotPathFunction
     }
 
     class SnapshotService {