merge main

Author: LeonOstrez

package.json

@@ -1,17 +1,17 @@
 {
   "name": "pythagora",
-  "version": "0.0.52",
+  "version": "0.0.55",
   "author": {
     "name": "Zvonimir Sabljic",
-    "email": "hi@pythagora.io"
+    "email": "hi@pythagora.ai"
   },
   "license": "ISC",
   "description": "Generate integration tests by recording server activity without writing a single line of code.",
   "repository": {
     "type": "git",
     "url": "https://github.com/Pythagora-io/pythagora"
   },
-  "homepage": "https://pythagora.io/",
+  "homepage": "https://pythagora.ai/",
   "main": "src/Pythagora.js",
   "scripts": {
     "publish-pythagora": "src/bin/publish.bash",
@@ -38,11 +38,11 @@
   "contributors": [
     {
       "name": "Zvonimir Sabljic",
-      "email": "hi@pythagora.io"
+      "email": "hi@pythagora.ai"
     },
     {
       "name": "Leon Ostrez",
-      "email": "hi@pythagora.io"
+      "email": "hi@pythagora.ai"
     }
   ],
   "keywords": [

src/Pythagora.js

@@ -40,7 +40,7 @@ class Pythagora {
         this.idSeq = 0;
         this.requests = {};
         this.testingRequests = {};
-        this.loggingEnabled = this.mode === 'capture';
+        this.loggingEnabled = this.mode === MODES.capture;
         //todo move all global vars to tempVars
         this.tempVars = {};
 

src/helpers/redis.js

@@ -1,3 +1,4 @@
+const MODES = require('../const/modes.json');
 let net = require('net');
 
 const CHUNK_SIZE = 1024;
@@ -15,7 +16,7 @@ module.exports = class RedisInterceptor {
             this.listenSocket = net.createServer(connection => {
                 connection.on('data', data => {
 
-                    if (this.mode === 'capture') {
+                    if (this.mode === MODES.capture) {
                         this.forwardData(connection, data, true);
                     } else if (this.mode === 'test') {
 

src/utils/argumentsCheck.js

@@ -1,14 +1,16 @@
-const AVAILABLE_MODES = Object.keys(require('../const/modes.json'));
+const MODES = require('../const/modes.json');
 const args = require('./getArgs.js');
 const { logAndExit } = require('./cmdPrint.js');
 
+const AVAILABLE_MODES = Object.keys(MODES);
+
 if (!args.mode) {
     if (args.rerun_all_failed || args.test_id) {
         console.log('Mode not provided. Setting to "test".');
         args.mode = 'test';
     } else {
-        console.log('Mode not provided. Defaulting to "capture".');
-        args.mode = 'capture';
+        console.log(`Mode not provided. Defaulting to "${MODES.capture}".`);
+        args.mode = MODES.capture;
     }
 } else if (!AVAILABLE_MODES.includes(args.mode)) {
     logAndExit(`Mode "${args.mode}" not recognized. Available modes are: ${AVAILABLE_MODES.join(', ')}`);
@@ -18,8 +20,8 @@ if (args.rerun_all_failed && args.mode !== 'test') logAndExit(`Flag --rerun_all_
 if (args.test_id && !(args.mode === 'test' || args.mode === 'jest')) logAndExit(`Flag --test-id allowed only in "--mode test"`);
 if (args.rerun_all_failed && args.test_id) logAndExit(`Not allowed to set flags --rerun_all_failed and --test-id at same time.`);
 
-if (args.pick && args.mode !== 'capture') logAndExit(`Flag --pick allowed only in "--mode capture"`);
-if (args.ignore && args.mode !== 'capture') logAndExit(`Flag --ignore allowed only in "--mode capture"`);
+if (args.pick && args.mode !== MODES.capture) logAndExit(`Flag --pick allowed only in "--mode ${MODES.capture}"`);
+if (args.ignore && args.mode !== MODES.capture) logAndExit(`Flag --ignore allowed only in "--mode ${MODES.capture}"`);
 
 console.log(`Running "${process.env.PYTHAGORA_CONFIG}" using Pythagora in "${args.mode.toUpperCase()}" mode.`);