Hotfix for Release v13-s12 (tests)

Author: andyjmaclean

projects/metis/cypress/e2e/dashboard.cy.ts

@@ -19,7 +19,7 @@ context('metis-ui', () => {
       setupUser();
       cy.request(Cypress.env('dataServer') + '/' + UrlManipulation.METIS_UI_CLEAR);
       setEmptyDataResult(
-        '/orchestrator/workflows/executions/?orderField=CREATED_DATE&ascending=false' +
+        '/orchestrator/workflows/executions?orderField=CREATED_DATE&ascending=false' +
           '&nextPage=0&workflowStatus=INQUEUE&workflowStatus=RUNNING'
       );
       cy.visit('/dashboard');

projects/metis/src/app/_services/workflow.service.spec.ts

@@ -320,7 +320,7 @@ describe('Workflow Service', () => {
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=0' +
           '&workflowStatus=INQUEUE&workflowStatus=RUNNING'
       )
@@ -337,15 +337,15 @@ describe('Workflow Service', () => {
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=0' +
           '&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
       )
       .send(mockFirstPageResults);
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=1' +
           '&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
       )
@@ -359,15 +359,15 @@ describe('Workflow Service', () => {
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=0' +
           '&workflowStatus=INQUEUE&workflowStatus=RUNNING'
       )
       .send(mockFirstPageResults);
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=1' +
           '&workflowStatus=INQUEUE&workflowStatus=RUNNING'
       )
@@ -386,15 +386,15 @@ describe('Workflow Service', () => {
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=0' +
           '&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
       )
       .send(mockWorkflowExecutionResults);
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=1' +
           '&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
       )
@@ -409,15 +409,15 @@ describe('Workflow Service', () => {
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=0' +
           '&workflowStatus=INQUEUE&workflowStatus=RUNNING'
       )
       .send(mockWorkflowExecutionResults);
     mockHttp
       .expect(
         'GET',
-        '/orchestrator/workflows/executions/' +
+        '/orchestrator/workflows/executions' +
           '?orderField=CREATED_DATE&ascending=false&nextPage=1' +
           '&workflowStatus=INQUEUE&workflowStatus=RUNNING'
       )

projects/metis/test-data/index.ts

@@ -489,7 +489,7 @@ new (class extends TestDataServer {
       return true;
     }
 
-    regRes = /orchestrator\/workflows\/executions\/\?\S+INQUEUE\S+RUNNING/.exec(route);
+    regRes = /orchestrator\/workflows\/executions\?\S+INQUEUE\S+RUNNING/.exec(route);
 
     if (regRes) {
       const params = url.parse(route, true).query;
@@ -499,7 +499,7 @@ new (class extends TestDataServer {
       return true;
     }
 
-    regRes = /orchestrator\/workflows\/executions\/\?/.exec(route);
+    regRes = /orchestrator\/workflows\/executions[\/\?]/.exec(route);
 
     if (regRes) {
       console.log('unhandled.....');