Convert session details property to a stringified value

ApplauseOSS · Jul 30, 2024 · 6b731ee · 6b731ee
1 parent 25b95c7
commit 6b731ee
Show file tree

Hide file tree

Showing 12 changed files with 124 additions and 120 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
diff --git a/dist/index.cjs.map b/dist/index.cjs.map
diff --git a/dist/index.d.ts b/dist/index.d.ts
diff --git a/dist/index.min.js b/dist/index.min.js
diff --git a/dist/index.min.js.map b/dist/index.min.js.map
diff --git a/dist/index.mjs b/dist/index.mjs
diff --git a/dist/index.mjs.map b/dist/index.mjs.map
diff --git a/src/auto-api/reporter.ts b/src/auto-api/reporter.ts
@@ -8,6 +8,7 @@ import {
 import { TestRunHeartbeatService } from './heartbeat.ts';
 import { join as pathJoin } from 'path';
 import { AutoApiConfig } from './auto-api-config.ts';
+import { parseTestCaseName } from '../shared/test-case.ts';
 
 export class ApplauseReporter {
   private autoApi: AutoApi;
@@ -173,46 +174,3 @@ export class RunReporter {
     }
   }
 }
-export const TEST_RAIL_CASE_ID_PREFIX: string = 'TestRail-';
-export const APPLAUSE_CASE_ID_PREFIX: string = 'Applause-';
-
-export function parseTestCaseName(testCaseName: string): ParsedTestCaseName {
-  // Split the name on spaces. We will reassemble after parsing out the other ids
-  const tokens = testCaseName.split(' ');
-  let testRailTestCaseId: string | undefined;
-  let applauseTestCaseId: string | undefined;
-  tokens.forEach(token => {
-    if (token?.startsWith(TEST_RAIL_CASE_ID_PREFIX)) {
-      if (testRailTestCaseId !== undefined) {
-        console.warn('Multiple TestRail case ids detected in testCase name');
-      }
-      testRailTestCaseId = token.substring(TEST_RAIL_CASE_ID_PREFIX.length);
-    } else if (token?.startsWith(APPLAUSE_CASE_ID_PREFIX)) {
-      if (applauseTestCaseId !== undefined) {
-        console.warn('Multiple Applause case ids detected in testCase name');
-      }
-      applauseTestCaseId = token.substring(APPLAUSE_CASE_ID_PREFIX.length);
-    }
-  });
-  return {
-    applauseTestCaseId,
-    testRailTestCaseId,
-    testCaseName: tokens
-      .filter(
-        token =>
-          token !== `${TEST_RAIL_CASE_ID_PREFIX}${testRailTestCaseId || ''}`
-      )
-      .filter(
-        token =>
-          token !== `${APPLAUSE_CASE_ID_PREFIX}${applauseTestCaseId || ''}`
-      )
-      .join(' ')
-      .trim(),
-  };
-}
-
-interface ParsedTestCaseName {
-  testCaseName: string;
-  testRailTestCaseId?: string;
-  applauseTestCaseId?: string;
-}
diff --git a/src/index.ts b/src/index.ts
@@ -1,3 +1,4 @@
 export * from './auto-api/index.ts';
 export * from './public-api/index.ts';
 export * from './config/config.ts';
+export * from './shared/index.ts';
diff --git a/src/public-api/dto.ts b/src/public-api/dto.ts
@@ -2,7 +2,7 @@ export interface TestRunAutoResultDto {
   testCycleId: number;
   status: TestRunAutoResultStatus;
   failureReason?: string;
-  sessionDetailsJson?: object;
+  sessionDetailsJson?: SessionDetails;
   startTime?: Date;
   endTime?: Date;
 }
@@ -14,3 +14,14 @@ export enum TestRunAutoResultStatus {
   CANCELED = 'CANCELED',
   ERROR = 'ERROR',
 }
+
+export interface SessionDetails {
+  value: {
+    deviceName?: string;
+    orientation?: string;
+    platformName?: string;
+    platformVersion?: string;
+    browserName?: string;
+    browserVersion?: string;
+  };
+}
diff --git a/src/shared/index.ts b/src/shared/index.ts
@@ -0,0 +1 @@
+export * from './test-case.ts';
diff --git a/src/shared/test-case.ts b/src/shared/test-case.ts
@@ -0,0 +1,34 @@
+export const TEST_RAIL_CASE_ID_PREFIX: string = 'TestRail-';
+export const APPLAUSE_CASE_ID_PREFIX: string = 'Applause-';
+
+export function parseTestCaseName(testCaseName: string): ParsedTestCaseName {
+  const matches = testCaseName.match(/(TestRail-\d+|Applause-\d+)/g);
+  const testRailCaseIds =
+    matches
+      ?.filter(match => match.startsWith(TEST_RAIL_CASE_ID_PREFIX))
+      .map(match => match.substring(TEST_RAIL_CASE_ID_PREFIX.length)) || [];
+  const applauseCaseIds =
+    matches
+      ?.filter(match => match.startsWith(APPLAUSE_CASE_ID_PREFIX))
+      .map(match => match.substring(APPLAUSE_CASE_ID_PREFIX.length)) || [];
+
+  if (testRailCaseIds.length > 1) {
+    console.warn('Multiple TestRail case ids detected in testCase name');
+  }
+  if (applauseCaseIds.length > 1) {
+    console.warn('Multiple Applause case ids detected in testCase name');
+  }
+  return {
+    applauseTestCaseId: applauseCaseIds[0],
+    testRailTestCaseId: testRailCaseIds[0],
+    testCaseName: testCaseName
+      .replace(/(TestRail-\d+|Applause-\d+)/g, '')
+      .trim(),
+  };
+}
+
+export interface ParsedTestCaseName {
+  testCaseName: string;
+  testRailTestCaseId?: string;
+  applauseTestCaseId?: string;
+}