expect-webdriverio 6.0.4 → 6.0.5

package/lib/matchers/asymmetrics/oneOf.js

@@ -1,6 +1,9 @@
 import { compareTextWithArray } from '../../utils.js';
 import { WdioAsymmetricMatchers } from './asymmetricsUtils.js';
+const ONE_OF_TAG = 'expect-webdriverio.oneOf';
+const ONE_OF_SYMBOL = Symbol.for(ONE_OF_TAG);
 export class OneOfMatcher extends WdioAsymmetricMatchers {
+    [ONE_OF_SYMBOL] = true;
     options = {};
     constructor(...sample) {
         super(sample);
@@ -49,3 +52,6 @@ export class OneOfMatcher extends WdioAsymmetricMatchers {
 export function oneOf(...sample) {
     return new OneOfMatcher(...sample);
 }
+export function isOneOfMatcher(oneOfMatcher) {
+    return oneOfMatcher instanceof OneOfMatcher || oneOfMatcher?.[ONE_OF_SYMBOL] === true;
+}

package/lib/matchers/element/toHaveAttribute.js

@@ -3,7 +3,7 @@ import { executeCommandWithStrategy } from '../../util/executeCommand.js';
 import { compareText, enhanceError, isAsymmetricMatcher, waitUntil, wrapExpectedWithArray } from '../../utils.js';
 import { expect as wdioExpect } from '../../index.js';
 import { buildWdioAsymmetricMatchersWithOptions } from '../asymmetrics/asymmetricsUtils.js';
-import { OneOfMatcher } from '../asymmetrics/oneOf.js';
+import { isOneOfMatcher } from '../asymmetrics/oneOf.js';
 async function conditionAttributeValueMatchWithExpected(el, attribute, expectedValue, options) {
     const attributeValue = await el.getAttribute(attribute);
     if (typeof attributeValue !== 'string' || expectedValue === undefined || expectedValue === null) {
@@ -12,7 +12,7 @@ async function conditionAttributeValueMatchWithExpected(el, attribute, expectedV
         }
         return { success: attributeValue === expectedValue, actual: attributeValue };
     }
-    else if (expectedValue instanceof OneOfMatcher) {
+    else if (isOneOfMatcher(expectedValue)) {
         return { success: expectedValue.asymmetricMatch(attributeValue), actual: attributeValue };
     }
     return compareText(attributeValue, expectedValue, options);

package/lib/matchers/element/toHaveElementProperty.js

@@ -3,7 +3,7 @@ import { executeCommandWithStrategy } from '../../util/executeCommand.js';
 import { expect as wdioExpect } from '../../index.js';
 import { compareText, enhanceError, isAsymmetricMatcher, waitUntil, wrapExpectedWithArray } from '../../utils.js';
 import { buildWdioAsymmetricMatchersWithOptions } from '../asymmetrics/asymmetricsUtils.js';
-import { OneOfMatcher } from '../asymmetrics/oneOf.js';
+import { isOneOfMatcher } from '../asymmetrics/oneOf.js';
 async function condition(el, property, expectedValue, options = DEFAULT_OPTIONS) {
     const { asString = false } = options;
     const propertyValue = await el.getProperty(property);
@@ -13,7 +13,7 @@ async function condition(el, property, expectedValue, options = DEFAULT_OPTIONS)
         }
         return { success: propertyValue === expectedValue, actual: propertyValue };
     }
-    else if (expectedValue instanceof OneOfMatcher) {
+    else if (isOneOfMatcher(expectedValue)) {
         return { success: expectedValue.asymmetricMatch(propertyValue), actual: propertyValue };
     }
     return compareText(propertyValue.toString(), expectedValue, options);

package/lib/matchers/modifiers/some.js

@@ -11,5 +11,5 @@ export function some(elements) {
     return new SomeElementsWrapper(elements);
 }
 export function isSomeWrapper(value) {
-    return value instanceof SomeElementsWrapper;
+    return value instanceof SomeElementsWrapper || value?.[SOME_SYMBOL] === true;
 }

package/lib/utils.js

@@ -5,7 +5,7 @@ import { executeCommandWithStrategy } from './util/executeCommand.js';
 import { enhanceError, enhanceErrorBe } from './util/formatMessage.js';
 import { waitUntil } from './util/waitUntil.js';
 import { DEFAULT_FEATURE_FLAGS } from './constants.js';
-import { OneOfMatcher } from './matchers/asymmetrics/oneOf.js';
+import { isOneOfMatcher, OneOfMatcher } from './matchers/asymmetrics/oneOf.js';
 export function isJasmineStringAsymmetricMatcher(expected) {
     return isAsymmetricMatcher(expected) && !('toAsymmetricMatcher' in expected) && 'jasmineToString' in expected && typeof expected.jasmineToString === 'function';
 }
@@ -88,7 +88,7 @@ export const compareTextOrArray = (actualText, expectedTexts, options) => {
         return { actual: actualText, success: false };
     }
     if (Array.isArray(expectedTexts)) {
-        if (expectedTexts.some((expected) => expected instanceof OneOfMatcher)) {
+        if (expectedTexts.some((expected) => isOneOfMatcher(expected))) {
             throw new Error('OneOf is not supported in array under legacy behavior. Please enable `useToHaveTextStrictMultiElementsCompareStrategy` feature flag to use the new strict index based matching strategy with `expect.oneOf()`.');
         }
         else {
@@ -96,7 +96,7 @@ export const compareTextOrArray = (actualText, expectedTexts, options) => {
             expectedTexts = new OneOfMatcher(...expectedTexts).withOptions(options);
         }
     }
-    if (expectedTexts instanceof OneOfMatcher) {
+    if (isOneOfMatcher(expectedTexts)) {
         return { success: expectedTexts.asymmetricMatch(actualText), actual: actualText };
     }
     const compareResults = compareText(actualText, expectedTexts, options);

package/package.json

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