Merge pull request #603 from DataDog/louiszawadzki/rum-2345/fix-asser…

…tions Fix internal testing assertions for android
DataDog · Feb 2, 2024 · 475c1f6 · 475c1f6
2 parents 16a7145 + 45b99e9
commit 475c1f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/packages/internal-testing-tools/package.json b/packages/internal-testing-tools/package.json
@@ -48,7 +48,8 @@
     },
     "devDependencies": {
         "@testing-library/react-native": "7.0.2",
-        "react-native-builder-bob": "0.17.1"
+        "react-native-builder-bob": "0.17.1",
+        "rum-events-format": "DataDog/rum-events-format#workspace=rum-events-format"
     },
     "jest": {
         "preset": "react-native",
@@ -90,8 +91,5 @@
         "android": {
             "javaPackageName": "com.datadog.reactnative.internaltesting"
         }
-    },
-    "dependencies": {
-        "rum-events-format": "DataDog/rum-events-format#workspace=rum-events-format"
     }
 }
diff --git a/packages/internal-testing-tools/src/InternalTesting.ts b/packages/internal-testing-tools/src/InternalTesting.ts
@@ -103,7 +103,7 @@ export class InternalTestingWrapper {
             );
         }
 
-        return JSON.parse(events);
+        return JSON.parse(events).map((event: string) => JSON.parse(event));
     };
 }
 

diff --git a/packages/internal-testing-tools/src/assertions/rum/__tests__/__utils__/longTasks.mock.ts b/packages/internal-testing-tools/src/assertions/rum/__tests__/__utils__/longTasks.mock.ts
@@ -13,9 +13,7 @@ export const mockRumLongTask = ({
             duration: duration || 0
         },
         context: {
-            long_task: {
-                target: thread
-            }
+            'long_task.target': thread
         },
         date: 0,
         application: {

diff --git a/packages/internal-testing-tools/src/assertions/rum/longTasks.ts b/packages/internal-testing-tools/src/assertions/rum/longTasks.ts
@@ -23,7 +23,7 @@ export const buildRumLongTaskAssertions = (events: RumLongTaskEvent[]) => {
                             // Disabling ts as trying to safely access attributes won't crash the app
                             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                             // @ts-ignore
-                            longTask.context?.['long_task']?.['target'] !==
+                            longTask.context?.['long_task.target'] !==
                             'javascript'
                         ) {
                             return false;
@@ -35,7 +35,7 @@ export const buildRumLongTaskAssertions = (events: RumLongTaskEvent[]) => {
                             // Disabling ts as trying to safely access attributes won't crash the app
                             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                             // @ts-ignore
-                            longTask.context?.['long_task']?.['target'] ===
+                            longTask.context?.['long_task.target'] ===
                             'javascript'
                         ) {
                             return false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ export class InternalTestingWrapper { @@
                 );
             }
-            return JSON.parse(events);
+            return JSON.parse(events).map((event: string) => JSON.parse(event));
         };
     }
@@ Expand Down @@