#145 fixed script executor selection after HTTP error

bugy · Sep 18, 2020 · 4cbf43d · 4cbf43d
1 parent 7e029c7
commit 4cbf43d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/web-src/src/main-app/store/scriptExecutionManager.js b/web-src/src/main-app/store/scriptExecutionManager.js
@@ -193,8 +193,10 @@ export default {
 
         selectExecutor({commit, state, dispatch}, executor) {
             const currentExecutor = state.currentExecutor;
-            if ((!isNull(currentExecutor))) {
-                if (executor && (executor.state.id === currentExecutor.state.id)) {
+            if (!isNull(currentExecutor)) {
+                // Don't remove finished executor automatically, if it was cleaned up
+                // unless id is null, meaning it was an error
+                if (executor && !isNull(executor.state.id) && (executor.state.id === currentExecutor.state.id)) {
                     return;
                 }
 

diff --git a/web-src/tests/unit/main-app/store/scriptExecutionManager_test.js b/web-src/tests/unit/main-app/store/scriptExecutionManager_test.js
@@ -57,8 +57,8 @@ function mockActiveExecutions(executions) {
     }
 }
 
-function mockStartResponse(id) {
-    axiosMock.onPost('executions/start').reply(200, id);
+function mockStartResponse(id, status = 200) {
+    axiosMock.onPost('executions/start').reply(status, id);
 }
 
 describe('Test scriptExecutionManager', function () {
@@ -148,6 +148,27 @@ describe('Test scriptExecutionManager', function () {
 
             assertSelectedExecutor(12);
         });
+
+        it('Test startExecution twice, when first is error', async function () {
+            store.state.scripts.selectedScript = 'abc';
+
+            mockStartResponse(null, 500);
+
+            await store.dispatch('executions/startExecution');
+            await flushPromises();
+
+            const currentExecutor = store.state.executions.currentExecutor;
+            expect(currentExecutor).not.toBeNil();
+            expect(currentExecutor.state.id).toBeNil();
+            expect(currentExecutor.state.scriptName).toEqual('abc');
+
+            mockStartResponse(123);
+
+            await store.dispatch('executions/startExecution');
+            await flushPromises();
+
+            assertSelectedExecutor(123);
+        });
     });
 
     describe('Test selectExecutor', function () {