add specs and fixes

Author: potapovDim

lib/commandExecutorBuilder.js

@@ -36,7 +36,7 @@ function buildCommandExecutor(failedByAssert, runOpts) {
 
     if(currentExecutionVariable) {
       if(cmd.includes(currentExecutionVariable)) {
-        cmd = cmd.replace(new RegExp(`${currentExecutionVariable}=\\d`, 'ig'), `${currentExecutionVariable}=${index}`)
+        cmd = cmd.replace(new RegExp(`${currentExecutionVariable}=\\d+`, 'ig'), `${currentExecutionVariable}=${index}`)
       } else {
         cmd = `${currentExecutionVariable}=${index} ${cmd}`
       }

lib/index.js

@@ -2,6 +2,7 @@ const {buildCommandExecutor} = require('./commandExecutorBuilder')
 const {sleep, getFormedRunCommand, getSpecFilesPath, getPollTime} = require('./helpers')
 
 function reRunnerBuilder(runOptions) {
+
   const failedByAssert = []
   let currentSessionCount = 0
 
@@ -51,12 +52,9 @@ function reRunnerBuilder(runOptions) {
 
         return resolver.then((resolvedCommandsArray) => {
 
-          // console.log(resolvedCommandsArray, 'Commands array', index)
-
           return runCommandsArray(resolvedCommandsArray, [], index)
 
             .then((failedCommandsArray) => {
-              console.log(failedCommandsArray, 'failed commands')
               return failedCommandsArray
             })
         })
@@ -68,10 +66,10 @@ function reRunnerBuilder(runOptions) {
     * @returns {void}
     */
 
-    async function runCommand(commands, failedCommands) {
+    async function runCommand(commands, failedCommands, runIndex) {
       if(maxSessionCount > currentSessionCount && commands.length) {
         currentSessionCount += 1
-        const result = await executeCommandAsync(commands.splice(0, 1)[0]).catch(console.error)
+        const result = await executeCommandAsync(commands.splice(0, 1)[0], runIndex).catch(console.error)
         if(result) {
           failedCommands.push(result)
         }
@@ -83,7 +81,7 @@ function reRunnerBuilder(runOptions) {
       const asserter = setInterval(() => runCommand(commands, failedCommands, executionCount), intervalPoll);
 
       do {
-        if(commands.length) {await runCommand(commands, failedCommands)}
+        if(commands.length) {await runCommand(commands, failedCommands, executionCount)}
         if(currentSessionCount) {await sleep(2000)}
       } while(commands.length || currentSessionCount)
 

unit_specs/commandExecutorBuilder.spec.js

@@ -4,7 +4,7 @@ const {buildCommandExecutor} = require('../lib/commandExecutorBuilder')
 
 describe('buildCommandExecutor', () => {
 
-  it.only('addSpecificOptionsBeforeRun', async () => {
+  it('addSpecificOptionsBeforeRun', async () => {
     {
       const cmd = 'node -e "console.log(\'test\')"'
       const failedByAssert = []

unit_specs/index.spec.js

@@ -2,7 +2,7 @@ const {expect} = require('chai')
 const {buildExeRun} = require('../lib')
 
 describe('kernel', () => {
-  it('buildExeRun', async () => {
+  it('buildExeRun basic execution', async () => {
     // all negative
     {
       const cmd = `node -e "console.log('test'); process.exit(1)"`
@@ -20,4 +20,30 @@ describe('kernel', () => {
       expect(failedCmds.length).to.eq(0)
     }
   })
+  it('buildExeRun currentExecutionVariable', async () => {
+    // all negative
+    {
+      const cmd = `node -e "console.log('test'); process.exit(1)"`
+      const cmds = [cmd]
+      const reRunner = buildExeRun({currentExecutionVariable: 'CURRENT_EXECUTION_COUNT'})
+      const failedCmds = await reRunner(cmds)
+      expect(failedCmds.length).to.eq(1)
+      expect(failedCmds.every((failedCmd) => failedCmd.includes('CURRENT_EXECUTION_COUNT=0'))).to.eq(true)
+    }
+    // + stackAnalize
+    {
+      const cmd = `node -e "console.log('test'); process.exit(1)"`
+      const stackAnalize = () => true
+      const specRerunCount = 15
+      const cmds = [cmd]
+      const reRunner = buildExeRun({
+        stackAnalize,
+        specRerunCount,
+        currentExecutionVariable: 'CURRENT_EXECUTION_COUNT'
+      })
+      const failedCmds = await reRunner(cmds)
+      expect(failedCmds.length).to.eq(1)
+      expect(failedCmds.every((failedCmd) => failedCmd.includes(`CURRENT_EXECUTION_COUNT=${specRerunCount - 1}`))).to.eq(true)
+    }
+  })
 })