Merge pull request #296 from splitio/tests_refactor

Tests refactor: reusing a CSV reader utility

Author: EmilianoSanchez

package-lock.json

@@ -63,7 +63,6 @@
     "@typescript-eslint/eslint-plugin": "^6.6.0",
     "@typescript-eslint/parser": "^6.6.0",
     "cross-env": "^7.0.2",
-    "csv-streamify": "^4.0.0",
     "eslint": "^8.48.0",
     "eslint-plugin-compat": "^4.2.0",
     "eslint-plugin-import": "^2.25.3",

package.json

@@ -0,0 +1,18 @@
+import fs from 'fs';
+import rl from 'readline';
+
+export function readCSV(filePath: string, delimiter = ','): Promise<string[][]> {
+  return new Promise((resolve) => {
+    const parser = rl.createInterface({
+      input: fs.createReadStream(filePath)
+    });
+
+    const data: string[][] = [];
+
+    parser
+      .on('line', line => {
+        data.push(line.split(delimiter));
+      })
+      .on('close', () => resolve(data));
+  });
+}

src/__tests__/testUtils/csv.ts

@@ -1,11 +1,10 @@
 import { matcherTypes } from '../matcherTypes';
 import { matcherFactory } from '..';
-import fs from 'fs';
-import rl from 'readline';
 import { IMatcher, IMatcherDto } from '../../types';
 import { loggerMock } from '../../../logger/__tests__/sdkLogger.mock';
+import { readCSV } from '../../../__tests__/testUtils/csv';
 
-test('MATCHER REGEX (STRING) / should match the attribute value only with the string starts with hello', function () {
+test('MATCHER REGEX (STRING) / should match the attribute value only with the string starts with hello', () => {
   // @ts-ignore
   const matcher = matcherFactory(loggerMock, {
     type: matcherTypes.MATCHES_STRING,
@@ -16,7 +15,7 @@ test('MATCHER REGEX (STRING) / should match the attribute value only with the st
   expect(matcher('hello dude!')).toBe(true);
 });
 
-test('MATCHER REGEX (STRING) / incorrectly matches unicode characters', function () {
+test('MATCHER REGEX (STRING) / incorrectly matches unicode characters', () => {
   // @ts-ignore
   const matcher = matcherFactory(loggerMock, {
     type: matcherTypes.MATCHES_STRING,
@@ -31,31 +30,20 @@ test('MATCHER REGEX (STRING) / incorrectly matches unicode characters', function
   'regex.txt'
 ].forEach(filename => {
 
-  test('MATCHER REGEX (STRING) / validate regex behavior using sample data', (done) => {
-    const parser = rl.createInterface({
-      terminal: false,
-      input: fs.createReadStream(require.resolve(`./mocks/${filename}`))
-    });
+  test('MATCHER REGEX (STRING) / validate regex behavior using sample data', async () => {
+    const lines = await readCSV(require.resolve(`./mocks/${filename}`), '#');
 
-    parser
-      .on('line', line => {
-        const parts = line.toString().split('#');
+    for (const [regex, input, test] of lines) {
+      const isTestTrue = test === 'true';
 
-        if (parts.length === 3) {
-          let [regex, input, test] = parts;
+      // @ts-ignore
+      const matcher = matcherFactory(loggerMock, {
+        type: matcherTypes.MATCHES_STRING,
+        value: regex
+      } as IMatcherDto) as IMatcher;
 
-          const isTestTrue = test === 'true';
-
-          // @ts-ignore
-          const matcher = matcherFactory(loggerMock, {
-            type: matcherTypes.MATCHES_STRING,
-            value: regex
-          } as IMatcherDto) as IMatcher;
-
-          expect(matcher(input) === isTestTrue).toBe(true);
-        }
-      })
-      .on('close', done);
+      expect(matcher(input) === isTestTrue).toBe(true);
+    }
   });
 
 });

src/evaluator/matchers/__tests__/regex.spec.ts

@@ -2,7 +2,7 @@ import { IBetweenMatcherData } from '../../dtos/types';
 import { ENGINE_MATCHER_BETWEEN } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 
-export function betweenMatcherContext(log: ILogger, ruleVO: IBetweenMatcherData) /*: Function */ {
+export function betweenMatcherContext(log: ILogger, ruleVO: IBetweenMatcherData) {
   return function betweenMatcher(runtimeAttr: number): boolean {
 
     let isBetween = runtimeAttr >= ruleVO.start && runtimeAttr <= ruleVO.end;

src/evaluator/matchers/between.ts

@@ -1,7 +1,7 @@
 import { ENGINE_MATCHER_BOOLEAN } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 
-export function booleanMatcherContext(log: ILogger, ruleAttr: boolean) /*: Function */ {
+export function booleanMatcherContext(log: ILogger, ruleAttr: boolean) {
   return function booleanMatcher(runtimeAttr: boolean): boolean {
     let booleanMatches = ruleAttr === runtimeAttr;