@wdio/jasmine-framework 9.16.2 → 9.17.0

package/build/index.d.ts

@@ -1,5 +1,6 @@
 import type { EventEmitter } from 'node:events';
 import type { Services, Capabilities } from '@wdio/types';
+import type { expect as wdioExpectImport, matchers as wdioMatchersImport, getConfig as wdioGetConfig } from 'expect-webdriverio';
 import type { JasmineOpts as jasmineNodeOpts, ResultHandlerPayload, FrameworkMessage, FormattedMessage } from './types.js';
 type HooksArray = {
     [K in keyof Required<Services.HookFunctions>]: Required<Services.HookFunctions>[K][];
@@ -25,6 +26,16 @@ declare class JasmineAdapter {
     private _jrunner;
     constructor(_cid: string, _config: WebdriverIOJasmineConfig, _specs: string[], _capabilities: Capabilities.ResolvedTestrunnerCapabilities, reporter: EventEmitter);
     init(): Promise<this>;
+    /**
+     * We have to ensure that `@wdio/runner` and `@wdio/jasmine-framework` are using the same `expect` and `matchers` globals.
+     * This is why we have the `@wdio/runner` package pass on these primitives to the jasmine framework so that we can use them
+     * to setup the jasmine environment.
+     *
+     * @param wdioExpect - WebdriverIO expect
+     * @param wdioMatchers - WebdriverIO matchers
+     * @param getConfig - WebdriverIO getConfig
+     */
+    setupExpect(wdioExpect: typeof wdioExpectImport, wdioMatchers: typeof wdioMatchersImport, getConfig: typeof wdioGetConfig): Promise<void>;
     _loadFiles(): Promise<void>;
     _grep(suite: jasmine.Suite): void;
     hasTests(): boolean;

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/build/index.js

@@ -3,7 +3,6 @@ import url from "node:url";
 import Jasmine from "jasmine";
 import logger2 from "@wdio/logger";
 import { wrapGlobalTestMethod, executeHooksWithArgs } from "@wdio/utils";
-import { expect as expectImport, matchers, getConfig } from "expect-webdriverio";
 import { _setGlobal } from "@wdio/globals";
 
 // src/reporter.ts
@@ -320,10 +319,23 @@ var JasmineAdapter = class {
       globalThis._jasmineTestResult = this.result;
       executeMock.apply(this, args);
     };
+    return this;
+  }
+  /**
+   * We have to ensure that `@wdio/runner` and `@wdio/jasmine-framework` are using the same `expect` and `matchers` globals.
+   * This is why we have the `@wdio/runner` package pass on these primitives to the jasmine framework so that we can use them
+   * to setup the jasmine environment.
+   *
+   * @param wdioExpect - WebdriverIO expect
+   * @param wdioMatchers - WebdriverIO matchers
+   * @param getConfig - WebdriverIO getConfig
+   */
+  async setupExpect(wdioExpect, wdioMatchers, getConfig) {
+    const { jasmine } = this._jrunner;
+    const jasmineEnv = jasmine.getEnv();
     const expect = jasmineEnv.expectAsync;
-    const matchers2 = this.#setupMatchers(jasmine);
-    jasmineEnv.beforeAll(() => jasmineEnv.addAsyncMatchers(matchers2));
-    const wdioExpect = expectImport;
+    const matchers = this.#setupMatchers(jasmine, wdioMatchers, getConfig);
+    jasmineEnv.beforeAll(() => jasmineEnv.addAsyncMatchers(matchers));
     for (const matcher of EXPECT_ASYMMETRIC_MATCHERS) {
       expect[matcher] = wdioExpect[matcher];
     }
@@ -331,7 +343,6 @@ var JasmineAdapter = class {
     _setGlobal("expect", expect, this._config.injectGlobals);
     await this._loadFiles();
     _setGlobal("expect", expect, this._config.injectGlobals);
-    return this;
   }
   async _loadFiles() {
     try {
@@ -418,7 +429,6 @@ Spec file(s): ${this._specs.join(",")}
         }, this._lastTest);
         break;
     }
-    console.log("----F", params);
     return this.formatMessage(params);
   }
   formatMessage(params) {
@@ -472,8 +482,8 @@ Spec file(s): ${this._specs.join(",")}
       return origHandler.call(this, passed, data);
     };
   }
-  #transformMatchers(matchers2) {
-    return Object.entries(matchers2).reduce((prev, [name, fn]) => {
+  #transformMatchers(matchers) {
+    return Object.entries(matchers).reduce((prev, [name, fn]) => {
       prev[name] = (util) => ({
         compare: async (actual, expected, ...args) => fn(util).compare(actual, expected, ...args),
         negativeCompare: async (actual, expected, ...args) => {
@@ -487,7 +497,7 @@ Spec file(s): ${this._specs.join(",")}
       return prev;
     }, {});
   }
-  #setupMatchers(jasmine) {
+  #setupMatchers(jasmine, matchers, getConfig) {
     globalThis.jasmine.addMatchers = (matchers2) => globalThis.jasmine.addAsyncMatchers(this.#transformMatchers(matchers2));
     const syncMatchers = this.#transformMatchers(jasmine.matchers);
     const wdioMatchers = [...matchers.entries()].reduce((prev, [name, fn]) => {

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,UAAU,qBAAqB;IAC3B,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,MAAM,CAAA;CACxB;AASD,eAAO,MAAM,mBAAmB,WAAY,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,SAAS,OAAO;;;;;;EAKjH,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,UAAU,qBAAqB;IAC3B,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,MAAM,CAAA;CACxB;AASD,eAAO,MAAM,mBAAmB,GAAI,QAAQ,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,EAAE,OAAO,OAAO;;;;;;EAKjH,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/jasmine-framework",
-  "version": "9.16.2",
+  "version": "9.17.0",
   "description": "A WebdriverIO plugin. Adapter for Jasmine testing framework.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-jasmine-framework",
@@ -35,21 +35,22 @@
   },
   "dependencies": {
     "@types/node": "^20.1.0",
-    "@wdio/globals": "9.16.2",
+    "@wdio/globals": "9.17.0",
     "@wdio/logger": "9.16.2",
     "@wdio/types": "9.16.2",
-    "@wdio/utils": "9.16.2",
+    "@wdio/utils": "9.17.0",
     "jasmine": "^5.0.0"
   },
   "devDependencies": {
-    "@types/jasmine": "5.1.5"
+    "@types/jasmine": "5.1.8",
+    "expect-webdriverio": "^5.3.4"
   },
   "peerDependencies": {
-    "expect-webdriverio": "^5.3.2",
+    "@wdio/runner": "^9.16.2",
     "webdriverio": "^9.0.0"
   },
   "peerDependenciesMeta": {
-    "expect-webdriverio": {
+    "@wdio/runner": {
       "optional": false
     },
     "webdriverio": {
@@ -59,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff2154c00e7ba6d6e2a58e0b8e1258a20229752d"
+  "gitHead": "796df04f0f5c744d5ef4bafd3759995fa4829d6f"
 }