Fixed failing unit tests

Author: Feroz Khan

src/commands/element.ts

@@ -33,12 +33,15 @@ export async function findElOrEls(
             ? JSON.parse(selector)
             : selector; // Special case
 
-      // Use strategy/selector format for Flutter locators and Android driver
-      if (isFlutterLocator || proxyDriver instanceof AndroidUiautomator2Driver || proxyDriver instanceof XCUITestDriver) {
-         return { strategy, selector: parsedSelector, context };
-      } else {
-         // Use using/value format for all other cases
+      // If user is looking for Native IOS/Mac locator
+      if (
+         !isFlutterLocator &&
+         (proxyDriver instanceof XCUITestDriver ||
+            proxyDriver instanceof Mac2Driver)
+      ) {
          return { using: strategy, value: parsedSelector, context };
+      } else {
+         return { strategy, selector: parsedSelector, context };
       }
    }
 

test/unit/element.specs.ts

@@ -72,8 +72,8 @@ describe('Element Interaction Functions', () => {
          expect(ELEMENT_CACHE.get('elem1')).to.equal(mockDriver);
          expect(
             mockDriver.command.calledWith('/element', 'POST', {
-               using: 'strategy',
-               value: 'selector',
+               strategy: 'strategy',
+               selector: 'selector',
                context: 'context',
             }),
          ).to.be.true;
@@ -100,8 +100,8 @@ describe('Element Interaction Functions', () => {
          expect(ELEMENT_CACHE.get('elem2')).to.equal(mockDriver);
          expect(
             mockDriver.command.calledWith('/elements', 'POST', {
-               using: 'strategy',
-               value: 'selector',
+               strategy: 'strategy',
+               selector: 'selector',
                context: 'context',
             }),
          ).to.be.true;
@@ -155,8 +155,8 @@ describe('Element Interaction Functions', () => {
 
          expect(
             mockDriver.command.calledWith('/element', 'POST', {
-               strategy: 'strategy',
-               selector: 'selector',
+               using: 'strategy',
+               value: 'selector',
                context: 'context',
             }),
          ).to.be.true;
@@ -203,8 +203,8 @@ describe('Element Interaction Functions', () => {
          expect(ELEMENT_CACHE.get('elem1')).to.equal(mockDriver);
          expect(
             mockDriver.command.calledWith('/element', 'POST', {
-               using: 'strategy',
-               value: 'selector',
+               strategy: 'strategy',
+               selector: 'selector',
                context: 'context',
             }),
          ).to.be.true;