test: enhance tracking tests for web and native environments

Author: Robert27

src/client.spec.ts

@@ -119,4 +119,79 @@ describe("AptabaseClient", () => {
     expect(sessionId3).toBeDefined();
     expect(sessionId3).not.toBe(sessionId1);
   });
+
+  describe("Web tracking", () => {
+    const webEnv: EnvironmentInfo = {
+      ...env,
+      osName: "web",
+      osVersion: "web",
+    };
+
+    it("should not track events when web tracking is disabled", async () => {
+      const client = new AptabaseClient("A-DEV-000", webEnv);
+      client.trackEvent("test_event");
+      await client.flush();
+      expect(fetchMock.requests().length).toEqual(0);
+    });
+
+    it("should track events when web tracking is enabled", async () => {
+      const client = new AptabaseClient("A-DEV-000", webEnv, {
+        enableWeb: true,
+      });
+      client.trackEvent("test_event");
+      await client.flush();
+      expect(fetchMock.requests().length).toEqual(1);
+      const body = await fetchMock.requests().at(0)?.json();
+      expect(body.eventName).toEqual("test_event");
+      expect(body.systemProps.osName).toBeUndefined();
+      expect(body.systemProps.osVersion).toBeUndefined();
+    });
+
+    it("should use correct endpoint for web events", async () => {
+      const client = new AptabaseClient("A-DEV-000", webEnv, {
+        enableWeb: true,
+      });
+      client.trackEvent("test_event");
+      await client.flush();
+      const request = fetchMock.requests().at(0);
+      expect(request?.url).toContain("/api/v0/event");
+    });
+
+    it("should use correct endpoint for native events", async () => {
+      const client = new AptabaseClient("A-DEV-000", env);
+      client.trackEvent("test_event");
+      await client.flush();
+      const request = fetchMock.requests().at(0);
+      expect(request?.url).toContain("/api/v0/events");
+    });
+  });
+
+  describe("Native tracking", () => {
+    it("should track events on iOS", async () => {
+      const client = new AptabaseClient("A-DEV-000", env);
+      client.trackEvent("test_event");
+      await client.flush();
+      expect(fetchMock.requests().length).toEqual(1);
+      const body = await fetchMock.requests().at(0)?.json();
+      expect(body[0].eventName).toEqual("test_event");
+      expect(body[0].systemProps.osName).toEqual("iOS");
+      expect(body[0].systemProps.osVersion).toEqual("14.3");
+    });
+
+    it("should track events on Android", async () => {
+      const androidEnv: EnvironmentInfo = {
+        ...env,
+        osName: "Android",
+        osVersion: "13",
+      };
+      const client = new AptabaseClient("A-DEV-000", androidEnv);
+      client.trackEvent("test_event");
+      await client.flush();
+      expect(fetchMock.requests().length).toEqual(1);
+      const body = await fetchMock.requests().at(0)?.json();
+      expect(body[0].eventName).toEqual("test_event");
+      expect(body[0].systemProps.osName).toEqual("Android");
+      expect(body[0].systemProps.osVersion).toEqual("13");
+    });
+  });
 });

src/client.ts

@@ -1,4 +1,3 @@
-import { Platform } from "react-native";
 import type { AptabaseOptions } from "./types";
 import type { EnvironmentInfo } from "./env";
 import { NativeEventDispatcher, WebEventDispatcher } from "./dispatcher";
@@ -24,7 +23,7 @@ export class AptabaseClient {
       this._env.appVersion = options.appVersion;
     }
 
-    const isWeb = Platform.OS === "web";
+    const isWeb = this._env.osName === "web";
     const isWebTrackingEnabled = isWeb && options?.enableWeb === true;
 
     console.log("isWebTrackingEnabled", isWebTrackingEnabled);
@@ -47,15 +46,17 @@ export class AptabaseClient {
   ) {
     if (!this._dispatcher) return;
 
+    const isWeb = this._env.osName === "web";
+
     this._dispatcher.enqueue({
       timestamp: new Date().toISOString(),
       sessionId: this.evalSessionId(),
       eventName: eventName,
       systemProps: {
         isDebug: this._env.isDebug,
         locale: this._env.locale,
-        osName: this._env.osName,
-        osVersion: this._env.osVersion,
+        osName: isWeb ? undefined : this._env.osName,
+        osVersion: isWeb ? undefined : this._env.osVersion,
         appVersion: this._env.appVersion,
         appBuildNumber: this._env.appBuildNumber,
         sdkVersion: this._env.sdkVersion,

src/env.ts

@@ -40,7 +40,8 @@ export function getEnvironmentInfo(): EnvironmentInfo {
           return ["iPadOS", Platform.Version];
         }
         return ["iOS", Platform.Version];
-      // Web needs to be empty as the server computes these values using the user agent
+      case "web":
+        return ["web", ""];
       default:
         return ["", ""];
     }