fix: unnecessary line removal

rudderlabs · Nov 11, 2024 · 518184f · 518184f
1 parent 91710fc
commit 518184f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 49 deletions.
diff --git a/src/v0/sources/adjust/transform.js b/src/v0/sources/adjust/transform.js
@@ -42,7 +42,6 @@ const processEvent = (inputEvent) => {
   );
   message.properties = { ...message.properties, ...customProperties };
 
-  // ... existing code ...
   if (formattedPayload.created_at) {
     const rawTimestamp = formattedPayload.created_at;
     try {
@@ -56,7 +55,6 @@ const processEvent = (inputEvent) => {
       );
     }
   }
-  // ... existing code ...
   // adjust does not has the concept of user but we need to set some random anonymousId in order to make the server accept the message
   message.anonymousId = generateUUID();
   return message;

diff --git a/test/integrations/testUtils.ts b/test/integrations/testUtils.ts
@@ -19,42 +19,25 @@ import {
   RouterTransformationResponseListSchema,
 } from '../../src/types/zodTypes';
 
-const getDataFilesFromDir = (dir: string): string[] => {
-  // Look for data.ts files recursively in the directory
-  return globSync('**/data.ts', {
-    cwd: dir,
-    absolute: true,
-  });
-};
-
-const getNetworkFilesFromDir = (dir: string): string[] => {
-  // Look for network.ts files recursively in the directory
-  return globSync('**/network.ts', {
-    cwd: dir,
-    absolute: true,
-  });
-};
-
 const generateAlphanumericId = (size = 36) =>
   [...Array(size)].map(() => ((Math.random() * size) | 0).toString(size)).join('');
-export const getTestDataFilePaths = (rootDir: string, opts: any) => {
-  const paths: string[] = [];
-  if (opts.destination) {
-    // Existing destination logic
-    const destinationPath = join(rootDir, 'destinations', opts.destination);
-    paths.push(...getDataFilesFromDir(destinationPath));
-  } else if (opts.source) {
-    // New source logic
-    const sourcePath = join(rootDir, 'sources', opts.source);
-    paths.push(...getDataFilesFromDir(sourcePath));
-  } else {
-    // Get all test files if no specific integration is specified
-    const destinationsPath = join(rootDir, 'destinations');
-    const sourcesPath = join(rootDir, 'sources');
-    paths.push(...getDataFilesFromDir(destinationsPath));
-    paths.push(...getDataFilesFromDir(sourcesPath));
+export const getTestDataFilePaths = (dirPath: string, opts: OptionValues): string[] => {
+  const globPattern = join(dirPath, '**', 'data.ts');
+  let testFilePaths = globSync(globPattern);
+  let filteredTestFilePaths: string[] = testFilePaths;
+
+  const destinationOrSource = opts.destination || opts.source;
+  if (destinationOrSource) {
+    filteredTestFilePaths = testFilePaths.filter(
+      (testFile) => destinationOrSource && testFile.includes(`${destinationOrSource}/`),
+    );
   }
-  return paths;
+  if (opts.feature) {
+    filteredTestFilePaths = filteredTestFilePaths.filter((testFile) =>
+      testFile.includes(opts.feature),
+    );
+  }
+  return filteredTestFilePaths;
 };
 
 export const getTestData = (filePath): TestCaseData[] => {
@@ -65,22 +48,17 @@ export const getMockHttpCallsData = (filePath): MockHttpCallsData[] => {
   return require(filePath).networkCallsData as MockHttpCallsData[];
 };
 
-export const getAllTestMockDataFilePaths = (
-  rootDir: string,
-  destination?: string,
-  source?: string,
-) => {
-  const paths: string[] = [];
+export const getAllTestMockDataFilePaths = (dirPath: string, destination: string): string[] => {
+  const globPattern = join(dirPath, '**', 'network.ts');
+  let testFilePaths = globSync(globPattern);
   if (destination) {
-    // Existing destination logic
-    const destinationPath = join(rootDir, 'destinations', destination);
-    paths.push(...getNetworkFilesFromDir(destinationPath));
-  } else if (source) {
-    // New source logic
-    const sourcePath = join(rootDir, 'sources', source);
-    paths.push(...getNetworkFilesFromDir(sourcePath));
+    const commonTestFilePaths = testFilePaths.filter((testFile) =>
+      testFile.includes('test/integrations/common'),
+    );
+    testFilePaths = testFilePaths.filter((testFile) => testFile.includes(destination));
+    testFilePaths = [...commonTestFilePaths, ...testFilePaths];
   }
-  return paths;
+  return testFilePaths;
 };
 
 export const addMock = (mock: MockAdapter, axiosMock: MockHttpCallsData) => {