ftmocks-utils 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftmocks-utils",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Util functions for FtMocks",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -1,10 +1,19 @@
-import fs from 'fs';
-import path from 'path';
+// import fs from 'fs';
+const fs = require('fs')
+// import path from 'path';
+const path = require('path')
 
-export const nameToFolder = name => {
+const nameToFolder = name => {
   return name.replaceAll(' ', '_');
 };
 
+const getMockDir = config => {
+  if(!path.isAbsolute(config.MOCK_DIR)) {
+    return path.resolve( process.cwd(), config.MOCK_DIR);
+  }
+  return config.MOCK_DIR;
+}
+
 const areJsonEqual = (jsonObj1, jsonObj2) => {
   // Check if both are objects and not null
   if (typeof jsonObj1 === 'object' && jsonObj1 !== null &&
@@ -34,7 +43,7 @@ const areJsonEqual = (jsonObj1, jsonObj2) => {
 }
 
 const getDefaultMockDataFromConfig = (testConfig) => {
-  const defaultPath = path.join(testConfig.MOCK_DIR, 'default.json');
+  const defaultPath = path.join(getMockDir(testConfig), 'default.json');
 
 try {
   const defaultData = fs.readFileSync(defaultPath, 'utf8');
@@ -42,7 +51,7 @@ try {
   
   // Read and attach mock data for each entry in parsedData
   parsedData.forEach(entry => {
-    const mockFilePath = path.join(testConfig.MOCK_DIR, 'defaultMocks', `mock_${entry.id}.json`);;
+    const mockFilePath = path.join(getMockDir(testConfig), 'defaultMocks', `mock_${entry.id}.json`);;
     try {
       const mockData = fs.readFileSync(mockFilePath, 'utf8');
       entry.fileContent = JSON.parse(mockData);
@@ -64,18 +73,18 @@ const loadMockDataFromConfig = (testConfig, _testName) => {
     let testName = _testName;
     if(!testName) {
       // Read the test ID from mockServer.config.json
-      const configPath = path.join(testConfig.MOCK_DIR, 'mockServer.config.json');
+      const configPath = path.join(getMockDir(testConfig), 'mockServer.config.json');
       const configData = fs.readFileSync(configPath, 'utf8');
       const config = JSON.parse(configData);
       testName = config.testName;
     }
     // Read the tests from testConfig
-    const mocksPath = path.join(testConfig.MOCK_DIR, `test_${nameToFolder(testName)}`, '_mock_list.json');
+    const mocksPath = path.join(getMockDir(testConfig), `test_${nameToFolder(testName)}`, '_mock_list.json');
     const mocksData = fs.readFileSync(mocksPath, 'utf8');
     const mocks = JSON.parse(mocksData);
 
     mocks.forEach(mock => {
-      const fileContent = JSON.parse(fs.readFileSync(path.join(testConfig.MOCK_DIR, `test_${nameToFolder(testName)}`, `mock_${mock.id}.json`), 'utf8'));
+      const fileContent = JSON.parse(fs.readFileSync(path.join(getMockDir(testConfig), `test_${nameToFolder(testName)}`, `mock_${mock.id}.json`), 'utf8'));
       mock.fileContent = fileContent;
     });
 
@@ -138,14 +147,20 @@ function compareMockToRequest(mock, req) {
 }
 
 function compareMockToFetchRequest(mock, fetchReq) {
-  const mockURL = processURL(mock.fileContent.url, mock.fileContent.ignoreParams);
-  const reqURL = processURL(fetchReq.url, mock.fileContent.ignoreParams);
-  const postData = mock.fileContent.request?.postData?.text ? JSON.parse(mock.fileContent.request?.postData?.text) : mock.fileContent.request?.postData;
-  return isSameRequest({url: mockURL, method: mock.fileContent.method, postData}, {
-    method: fetchReq.options.method || 'GET',
-    postData: fetchReq.options.body?.length ? JSON.parse(fetchReq.options.body) : fetchReq.options.body,
-    url: reqURL,
-  });
+  try{
+    const mockURL = processURL(mock.fileContent.url, mock.fileContent.ignoreParams);
+    const reqURL = processURL(fetchReq.url, mock.fileContent.ignoreParams);
+    const postData = mock.fileContent.request?.postData?.text ? JSON.parse(mock.fileContent.request?.postData?.text) : mock.fileContent.request?.postData;
+    return isSameRequest({url: mockURL, method: mock.fileContent.method, postData}, {
+      method: fetchReq.options.method || 'GET',
+      postData: fetchReq.options.body?.length ? JSON.parse(fetchReq.options.body) : fetchReq.options.body,
+      url: reqURL,
+    });
+  } catch(e) {
+    console.debug('error at compareMockToFetchRequest', mock, fetchReq);
+    console.debug(e);
+  }
+  return false;
 }
 
 function getMatchingMockData({testMockData, defaultMockData, url, options, testConfig, testName}) {
@@ -160,7 +175,7 @@ function getMatchingMockData({testMockData, defaultMockData, url, options, testC
   let foundMock = matchedMocks.find(mock => !mock.fileContent.served) ? matchedMocks.find(mock => !mock.fileContent.served) : matchedMocks[matchedMocks.length - 1];
   // updating stats to mock file
   if(foundMock) {
-    const mockFilePath = path.join(testConfig.MOCK_DIR, `test_${nameToFolder(testName)}`, `mock_${foundMock.id}.json`);
+    const mockFilePath = path.join(getMockDir(testConfig), `test_${nameToFolder(testName)}`, `mock_${foundMock.id}.json`);
     foundMock.fileContent.served = true;
     fs.writeFileSync(mockFilePath, JSON.stringify(foundMock.fileContent, null, 2));
   }
@@ -177,7 +192,7 @@ function getMatchingMockData({testMockData, defaultMockData, url, options, testC
 async function resetAllMockStats({testMockData, testConfig, testName}) {
   for(let i=0; i<testMockData.length; i++) {
     const tmd = testMockData[i];
-    const mockFilePath = path.join(testConfig.MOCK_DIR, `test_${nameToFolder(testName)}`, `mock_${tmd.id}.json`);
+    const mockFilePath = path.join(getMockDir(testConfig), `test_${nameToFolder(testName)}`, `mock_${tmd.id}.json`);
     tmd.fileContent.served = false;
     await fs.writeFileSync(mockFilePath, JSON.stringify(tmd.fileContent, null, 2));
   }
@@ -187,7 +202,9 @@ async function initiateJestFetch (jest, ftmocksConifg, testName) {
   const testMockData = testName ? loadMockDataFromConfig(ftmocksConifg, testName) : [];
   resetAllMockStats({testMockData, testConfig: ftmocksConifg, testName});
   const defaultMockData = getDefaultMockDataFromConfig(ftmocksConifg);
+  console.debug('calling initiateJestFetch fetch');
   global.fetch = jest.fn((url, options = {}) => {
+    console.debug('got fetch request', url, options);
     let mockData = getMatchingMockData({testMockData, defaultMockData, url, options, testConfig: ftmocksConifg, testName});
     if (mockData) {
       console.debug('mocked', url, options);
@@ -209,6 +226,7 @@ async function initiateJestFetch (jest, ftmocksConifg, testName) {
     });
   });
 
+  console.debug('calling XMLHttpRequest fetch');
   global.XMLHttpRequest = jest.fn(function () {
     const xhrMock = {
       open: jest.fn(),
@@ -281,6 +299,46 @@ async function initiateJestFetch (jest, ftmocksConifg, testName) {
   return;
 };
 
+function initiateConsoleLogs(jest, ftmocksConifg, testName) {
+  const logsFile = path.join(getMockDir(ftmocksConifg), `test_${nameToFolder(testName)}`, '_logs.json');
+  let logs = [];
+  if(!fs.existsSync(logsFile)) {
+    fs.appendFileSync(logsFile, '[]', 'utf8');
+  } else {
+    fs.writeFileSync(logsFile, '[]', 'utf8');
+  }
+
+  const writeToFile = (type, params) => {
+    const logMessage = params.join(' ') + '\n'; // Combine params into a string with spaces
+    logs.push({
+      type,
+      message: logMessage,
+      time: Date.now()
+    });
+    fs.writeFileSync(logsFile, JSON.stringify(logs, null, 2), 'utf8'); // Append the log message to the file
+  } 
+    
+  global.console = {
+    ...console,
+    // uncomment to ignore a specific log level
+    log: jest.fn((...params) => {
+      writeToFile('log', params);
+    }),
+    debug: jest.fn((...params) => {
+      writeToFile('debug', params);
+    }),
+    info: jest.fn((...params) => {
+      writeToFile('info', params);
+    }),
+    warn: jest.fn((...params) => {
+      writeToFile('warn', params);
+    }),
+    error: jest.fn((...params) => {
+      writeToFile('error', params);
+    }),
+  };
+}
+
 
 function countFilesInDirectory(directoryPath) {
   return new Promise((resolve, reject) => {
@@ -301,8 +359,8 @@ function countFilesInDirectory(directoryPath) {
 }
 
 const saveSnap = async (html, ftmocksConifg, testName) => {
-  const snapFolder = path.join(ftmocksConifg.MOCK_DIR, `test_${nameToFolder(testName)}`, '_snaps');
-  const snapTemplate = path.join(ftmocksConifg.MOCK_DIR, 'snap_template.html');
+  const snapFolder = path.join(getMockDir(ftmocksConifg), `test_${nameToFolder(testName)}`, '_snaps');
+  const snapTemplate = path.join(getMockDir(ftmocksConifg), 'snap_template.html');
   
   if (!fs.existsSync(snapFolder)) {
     fs.mkdirSync(snapFolder);
@@ -318,10 +376,18 @@ const saveSnap = async (html, ftmocksConifg, testName) => {
 };
 
 const deleteAllSnaps = async (ftmocksConifg, testName) => {
-  const snapFolder = path.join(ftmocksConifg.MOCK_DIR, `test_${nameToFolder(testName)}`, '_snaps');
+  const snapFolder = path.join(getMockDir(ftmocksConifg), `test_${nameToFolder(testName)}`, '_snaps');
   fs.rmSync(snapFolder, { recursive: true, force: true });
 };
 
+const deleteAllLogs = async (ftmocksConifg, testName) => {
+  const mockDir = path.join(getMockDir(ftmocksConifg), `test_${nameToFolder(testName)}`);
+  const logFilePath = path.join(mockDir, `_logs.json`);
+  fs.rmSync(logFilePath, { recursive: true, force: true });
+};
+
+
+
 // Export functions as a module
 module.exports = {
     compareMockToRequest,
@@ -335,5 +401,7 @@ module.exports = {
     resetAllMockStats,
     initiateJestFetch,
     saveSnap,
-    deleteAllSnaps
+    deleteAllSnaps,
+    deleteAllLogs,
+    initiateConsoleLogs
 };

package/src/recorder.js

@@ -1,3 +1,9 @@
+window.FTMOCKS_CONFIG = {
+    record_mocks_url: 'http://localhost:5000/api/v1/recordMockdata',
+    record_events_url: 'http://localhost:5000/api/v1/recordedEvents'
+};
+
+
 (function () {
     // Intercept Fetch API
     const originalFetch = window.fetch;
@@ -6,7 +12,7 @@
     const addTrack = track => {
         track.id = recordedTracks.length ? recordedTracks[recordedTracks.length - 1].id + 1 : 1;
         track.time = new Date();
-        track.bodyHtml = document.documentElement.outerHTML.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');;
+        // track.bodyHtml = document.documentElement.outerHTML.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');;
         
         fetch(window.FTMOCKS_CONFIG.record_events_url, {
                     method: 'POST',