fix: update android app determination (#604)

Author: wswebcreation

.changeset/late-hounds-rush.md

@@ -0,0 +1,5 @@
+---
+"@wdio/visual-service": patch
+---
+
+fix android app determination

packages/visual-service/src/utils.ts

@@ -270,13 +270,22 @@ export function determineNativeContext(
 
     // If not check if it's a mobile
     if (driver.isMobile) {
-        return !!(driver.requestedCapabilities as WebdriverIO.Capabilities)?.browserName === false
-            && (
-                (driver.requestedCapabilities as AppiumCapabilities)?.['appium:app'] !== undefined
-                || (driver.requestedCapabilities as { 'appium:bundleId'?: string })?.['appium:bundleId'] !== undefined
-                || (driver.requestedCapabilities as { 'appium:appPackage'?: string })?.['appium:appPackage'] !== undefined
-            )
-            && (driver.requestedCapabilities as AppiumCapabilities)?.['appium:autoWebview'] !== true
+        const isAppiumAppCapPresent = (capabilities: AppiumCapabilities) => {
+            const appiumKeys = [
+                'appium:app',
+                'appium:bundleId',
+                'appium:appPackage',
+                'appium:appActivity',
+                'appium:appWaitActivity',
+                'appium:appWaitPackage',
+            ]
+            return appiumKeys.some(key => capabilities[key as keyof AppiumCapabilities] !== undefined)
+        }
+        const capabilities = driver.requestedCapabilities as WebdriverIO.Capabilities & AppiumCapabilities
+        const isBrowserNameFalse = !!capabilities.browserName === false
+        const isAutoWebviewFalse = capabilities['appium:autoWebview'] !== true
+
+        return isBrowserNameFalse && isAppiumAppCapPresent(capabilities) && isAutoWebviewFalse
     }
 
     // If not, it's webcontext

packages/visual-service/tests/utils.test.ts

@@ -434,19 +434,42 @@ describe('utils', () => {
             expect(await determineNativeContext(driver)).toBeFalsy()
         })
 
+        // For iOS
+        it('should return true for when appium:bundleId is provided and autoWebview is true', async() => {
+            (driver.capabilities as WebdriverIO.Capabilities).browserName = '';
+            (driver.requestedCapabilities as AppiumCapabilities)['appium:bundleId'] = 'string';
+            (driver.requestedCapabilities as AppiumCapabilities)['appium:autoWebview'] = true
+
+            expect(await determineNativeContext(driver)).toBeFalsy()
+        })
+
+        // For Android
         it('should return true for when appium:appPackage is provided', async() => {
             (driver.capabilities as WebdriverIO.Capabilities).browserName = '';
             (driver.requestedCapabilities as AppiumCapabilities)['appium:appPackage'] = 'string'
 
             expect(await determineNativeContext(driver)).toBeTruthy()
         })
 
-        it('should return true for when appium:bundleId is provided and autoWebview is true', async() => {
+        it('should return true for when appium:appActivity is provided', async() => {
             (driver.capabilities as WebdriverIO.Capabilities).browserName = '';
-            (driver.requestedCapabilities as AppiumCapabilities)['appium:bundleId'] = 'string';
-            (driver.requestedCapabilities as AppiumCapabilities)['appium:autoWebview'] = true
+            (driver.requestedCapabilities as AppiumCapabilities)['appium:appActivity'] = 'appActivity'
 
-            expect(await determineNativeContext(driver)).toBeFalsy()
+            expect(await determineNativeContext(driver)).toBeTruthy()
+        })
+
+        it('should return true for when appium:appWaitActivity is provided', async() => {
+            (driver.capabilities as WebdriverIO.Capabilities).browserName = '';
+            (driver.requestedCapabilities as AppiumCapabilities)['appium:appWaitActivity'] = 'appWaitActivity'
+
+            expect(await determineNativeContext(driver)).toBeTruthy()
+        })
+
+        it('should return true for when appium:appWaitPackage is provided', async() => {
+            (driver.capabilities as WebdriverIO.Capabilities).browserName = '';
+            (driver.requestedCapabilities as AppiumCapabilities)['appium:appWaitPackage'] = 'appWaitPackage'
+
+            expect(await determineNativeContext(driver)).toBeTruthy()
         })
     })
 })