rudderlabs · sanpj2292 · Aug 12, 2024 · Aug 9, 2024
@@ -34,7 +34,8 @@
             ]
           },
           "previous_data": {}
-        }
+        },
+        "source": {}
       },
       "headers": {
         "Content-Type": "application/json"

@@ -43,7 +43,8 @@
             "updated_by": "user_123",
             "created_by": "user_123"
           }
-        }
+        },
+        "source": {}
       },
       "headers": {
         "Content-Type": "application/json"

@@ -61,7 +61,8 @@
           "object_type": "opportunity",
           "lead_id": "lead_123"
         },
-        "subscription_id": "whsub_123"
+        "subscription_id": "whsub_123",
+        "source": {}
       },
       "headers": {
         "Content-Type": "application/json"

@@ -64,7 +64,8 @@
               "product_name": ["wtp ab"],
               "product_group": ["women"]
             }
-          }
+          },
+          "source": {}
         },
         {
           "contact": {
@@ -126,7 +127,8 @@
               "product_name": ["wtp ab"],
               "product_group": ["women"]
             }
-          }
+          },
+          "source": {}
         }
       ],
       "headers": {

@@ -49,7 +49,8 @@
             "title": "Khaki Shirt",
             "test_key": "value"
           }
-        }
+        },
+        "source": {}
       },
       "headers": {
         "Content-Type": "application/json"

@@ -44,7 +44,8 @@
             "title": "Khaki Shirt",
             "test_key": "value"
           }
-        }
+        },
+        "source": {}
       },
       "headers": {
         "Content-Type": "application/json"

@@ -59,5 +59,6 @@
       }
     ],
     "errQueue": []
-  }
+  },
+  "skip": "FIXME"
 }
@@ -376,8 +376,8 @@
           "shipping": 4,
           "value": 31.98
         },
-        "receivedAt": "2024-03-03T04:48:29.000Z",
-        "request_ip": "192.0.2.30",
+        "receivedAt": "2020-10-16T13:40:12.792+05:30",
+        "request_ip": "[::1]",
         "sentAt": "2020-10-16T08:10:12.783Z",
         "timestamp": "2020-10-16T13:40:12.791+05:30",
         "type": "track",

@@ -246,5 +246,6 @@
       }
     ],
     "errQueue": []
-  }
+  },
+  "skip": "NoAnonID error"
 }
@@ -17,7 +17,7 @@
   "output": {
     "response": {
       "status": 400,
-      "body": "Invalid topic in query_parameters"
+      "body": "Invalid topic in query_parameters\n"
     },
     "queue": [],
     "errQueue": [

@@ -12,7 +12,7 @@
   "output": {
     "response": {
       "status": 400,
-      "body": "Query_parameters is missing"
+      "body": "Query_parameters is missing\n"
     },
     "queue": [],
     "errQueue": [{}]

@@ -18,7 +18,7 @@
   "output": {
     "response": {
       "status": 400,
-      "body": "Topic not found"
+      "body": "Topic not found\n"
     },
     "queue": [],
     "errQueue": [

@@ -1508,6 +1508,7 @@ export const data = [
     description: 'empty batch',
     module: 'source',
     version: 'v0',
+    skipGo: 'Created this case manually',
     input: {
       request: {
         body: [],

@@ -2216,4 +2216,7 @@ export const data = [
       },
     },
   },
-];
+].map((tc) => ({
+  ...tc,
+  overrideReceivedAt: true,
+}));
@@ -236,6 +236,7 @@ export const data = [
     description: 'MailJet when no email is present',
     module: 'source',
     version: 'v0',
+    skipGo: 'FIXME',
     input: {
       request: {
         body: [

@@ -264,6 +264,8 @@ const data = [
     description: 'Batch of events',
     module: 'source',
     version: 'v0',
+    overrideReceivedAt: true,
+    overrideRequestIP: true,
     input: {
       request: {
         body: [

@@ -11,6 +11,7 @@ export const data: SrcTestCaseData[] = [
     description: 'test-0',
     module: 'source',
     version: 'v0',
+    skipGo: 'NoAnonID error',
     input: {
       request: {
         body: [

@@ -52,6 +52,8 @@ export interface TestCaseData {
   input: inputType;
   output: outputType;
   mock?: mockType[];
+  overrideReceivedAt?: string;
+  overrideRequestIP?: string;
   mockFns?: (mockAdapter: MockAdapter) => {};
 }
 

@@ -61,6 +61,9 @@ function getErrorResponse(outputResponse?: responseType) {
   const errorResponse = bodyKeys
     .map((statusKey) => get(outputResponse, statusKey))
     .find(isDefinedAndNotNull);
+  if (errorResponse) {
+    return errorResponse + '\n';
+  }
   return errorResponse;
 }
 
@@ -72,6 +75,9 @@ function getSourceRequestBody(testCase: any, version?: string) {
   if (version === 'v0') {
     return bodyElement;
   }
+  if (Array.isArray(bodyElement?.event)) {
+    return bodyElement.event.map((e) => ({ ...e, source: bodyElement.source }));
+  }
   return { ...bodyElement.event, source: bodyElement.source };
 }
 
@@ -158,11 +164,17 @@ function generateSources(outputFolder: string, options: OptionValues) {
         goTest.skip = testCase.skipGo;
       }
 
-      goTest.output.queue.forEach((queueItem) => {
+      goTest.output.queue.forEach((queueItem, i) => {
         queueItem['receivedAt'] =
-          testCase.output.response?.body?.[0]?.output?.batch?.[0]?.receivedAt ??
-          '2024-03-03T04:48:29.000Z';
-        queueItem['request_ip'] = '192.0.2.30';
+          testCase?.overrideReceivedAt &&
+          testCase.output.response?.body?.[0]?.output?.batch?.[i]?.receivedAt
+            ? testCase.output.response?.body?.[0]?.output?.batch?.[i]?.receivedAt
+            : '2024-03-03T04:48:29.000Z';
+        queueItem['request_ip'] =
+          testCase?.overrideRequestIP &&
+          testCase.output.response?.body?.[0]?.output?.batch?.[i]?.request_ip
+            ? testCase.output.response?.body?.[0]?.output?.batch?.[i]?.request_ip
+            : '192.0.2.30';
         if (!queueItem['messageId']) {
           queueItem['messageId'] = '00000000-0000-0000-0000-000000000000';
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,5 +59,6 @@ @@
           }
         ],
         "errQueue": []
-      }
+      },
+      "skip": "FIXME"
     }