appium: optional FID-off push run in appium-e2e, enabled input for setup-google-services

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: fadi-george

.github/actions/setup-google-services/action.yml

@@ -12,11 +12,16 @@ inputs:
     description: 'Android package name that must have a client in the file'
     required: false
     default: 'com.onesignal.sdkdemo'
+  enabled:
+    description: "Set to 'false' to skip writing the file (e.g. for a build with Firebase Installation IDs off)"
+    required: false
+    default: 'true'
 
 runs:
   using: composite
   steps:
     - name: Write google-services.json
+      if: inputs.enabled == 'true'
       shell: bash
       env:
         GOOGLE_SERVICES_JSON: ${{ inputs.google-services-json }}

.github/workflows/appium-e2e.yml

@@ -35,15 +35,24 @@ on:
         description: 'App bundle/package ID (default: com.onesignal.example)'
         required: false
         type: string
+      fid-off-app-artifact:
+        description: 'Optional artifact with an Android build that has Firebase Installation IDs off and no google-services.json. Runs 02_push against it in a separate session.'
+        required: false
+        type: string
 
 jobs:
   e2e:
+    name: ${{ matrix.variant == 'fid-off' && 'e2e (fid off)' || 'e2e' }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: ${{ fromJSON(inputs.fid-off-app-artifact != '' && '["default","fid-off"]' || '["default"]') }}
     steps:
       - name: Download app artifact
         uses: actions/download-artifact@v8
         with:
-          name: ${{ inputs.app-artifact }}
+          name: ${{ matrix.variant == 'fid-off' && inputs.fid-off-app-artifact || inputs.app-artifact }}
 
       - name: Checkout sdk-shared (for test files)
         uses: actions/checkout@v6
@@ -86,8 +95,10 @@ jobs:
           PLATFORM: ${{ inputs.platform }}
           DEVICE: ${{ inputs.device }}
           OS_VERSION: ${{ inputs.os-version }}
-          BUILD_NAME: ${{ inputs.build-name }}
+          BUILD_NAME: ${{ inputs.build-name }}${{ matrix.variant == 'fid-off' && '-fid-off' || '' }}
           BUNDLE_ID: ${{ inputs.bundle-id }}
+          E2E_VARIANT: ${{ matrix.variant == 'fid-off' && 'fid-off' || '' }}
+          SPECS: ${{ matrix.variant == 'fid-off' && '02_push' || '' }}
           ONESIGNAL_APP_ID: ${{ vars.APPIUM_ONESIGNAL_APP_ID }}
           ONESIGNAL_API_KEY: ${{ secrets.APPIUM_ONESIGNAL_API_KEY }}
         # Retry only on BrowserStack session-creation failures (queue
@@ -132,6 +143,6 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: appium-results-${{ inputs.platform }}-${{ inputs.sdk-type }}
+          name: appium-results-${{ inputs.platform }}-${{ inputs.sdk-type }}${{ matrix.variant == 'fid-off' && '-fid-off' || '' }}
           path: _sdk-shared/appium/results/
           if-no-files-found: ignore

appium/tests/helpers/selectors.ts

@@ -22,13 +22,20 @@ export function getPlatform(): Platform {
   throw new Error(`Unexpected platformName: ${name}`);
 }
 
-export function getTestExternalId(): string {
+function getTestDataKey(): string {
   const sdk = getSdkType();
   const platform = getPlatform();
   if (sdk === platform) return sdk;
   return `${sdk}-${platform}`;
 }
 
+/** Variant runs (e.g. fid-off) get their own user so parallel runs don't share or delete it. */
+export function getTestExternalId(): string {
+  const key = getTestDataKey();
+  const variant = process.env.E2E_VARIANT;
+  return variant ? `${key}-${variant}` : key;
+}
+
 export const TEST_DATA: Record<
   string,
   { sms: string; email: string; customEvent: string; alias: string }
@@ -127,7 +134,7 @@ export const TEST_DATA: Record<
 };
 
 export function getTestData() {
-  const id = getTestExternalId();
+  const id = getTestDataKey();
   const data = TEST_DATA[id];
   if (!data) throw new Error(`No test data for ${id}`);
   return data;

appium/wdio.shared.conf.ts

@@ -1,3 +1,5 @@
+import path from 'node:path';
+
 import { SuiteStats, TestStats } from '@wdio/reporter';
 import SpecReporter from '@wdio/spec-reporter';
 import { globSync } from 'glob';
@@ -100,6 +102,20 @@ const bstackOptions = {
   idleTimeout: 300,
 };
 
+// SPECS: comma-separated spec names (e.g. "02_push") to run instead of the full suite.
+function selectSpecs(all: string[]): string[] {
+  const names = (process.env.SPECS ?? '')
+    .split(',')
+    .map((name) => name.trim())
+    .filter(Boolean);
+  if (names.length === 0) return all;
+  const selected = all.filter((file) => names.includes(path.basename(file, '.spec.ts')));
+  if (selected.length !== names.length) {
+    throw new Error(`SPECS has unknown entries: ${process.env.SPECS}`);
+  }
+  return selected;
+}
+
 export const sharedConfig: WebdriverIO.Config = {
   ...(isLocal ? localConnection : browserstackConnection),
   maxInstances: 1,
@@ -110,7 +126,11 @@ export const sharedConfig: WebdriverIO.Config = {
   autoXvfb: false,
 
   // Pre-expand the glob so WDIO groups all specs into one runner and reuses a single Appium session (a raw glob or `--spec` flag spawns one runner per file, costing ~10-30s of iOS session setup each).
-  specs: [globSync('tests/specs/**/*.spec.ts', { cwd: SHARED_CONF_DIR, absolute: true }).sort()],
+  specs: [
+    selectSpecs(
+      globSync('tests/specs/**/*.spec.ts', { cwd: SHARED_CONF_DIR, absolute: true }).sort(),
+    ),
+  ],
 
   capabilities: [],
 
@@ -139,8 +159,9 @@ export const sharedConfig: WebdriverIO.Config = {
     const sdkType = process.env.SDK_TYPE;
     const platform = process.env.PLATFORM;
     if (!sdkType || !platform) return;
-    const externalId = sdkType === platform ? sdkType : `${sdkType}-${platform}`;
-    await deleteUser(externalId);
+    const key = sdkType === platform ? sdkType : `${sdkType}-${platform}`;
+    const variant = process.env.E2E_VARIANT;
+    await deleteUser(variant ? `${key}-${variant}` : key);
   },
 };