fix(1968): remove ~ for downstream external job (#31)

screwdriver-cd · Feb 27, 2020 · 9eb76a2 · 9eb76a2
1 parent 171dde0
commit 9eb76a2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/lib/getWorkflow.js b/lib/getWorkflow.js
@@ -19,7 +19,7 @@ const filterNodeName = name =>
  */
 const buildExternalNodes = async (children, nodes, triggerFactory) => {
     await Promise.all(children.map(async (dest) => {
-        nodes.add(dest);
+        nodes.add(dest.replace('~sd@', 'sd@'));
 
         const newChildren = await triggerFactory.getDestFromSrc(dest);
 
@@ -89,7 +89,7 @@ const calculateNodes = async (jobs, triggerFactory, pipelineId) => {
  */
 const buildExternalEdges = async (root, children, edges, triggerFactory) => {
     await Promise.all(children.map(async (dest) => {
-        edges.push({ src: root, dest });
+        edges.push({ src: root, dest: dest.replace('~sd@', 'sd@') });
 
         const newChildren = await triggerFactory.getDestFromSrc(dest);
 

diff --git a/test/data/external-join.json → test/data/expected-external-join.json b/test/data/external-join.json → test/data/expected-external-join.json
@@ -12,9 +12,9 @@
         { "src": "~pr", "dest": "main" },
         { "src": "~commit", "dest": "main" },
         { "src": "main", "dest": "foo" },
-        { "src": "foo", "dest": "sd@111:baz" },
-        { "src": "foo", "dest": "sd@1234:foo" },
+        { "src": "sd@111:baz", "dest": "bar", "join": true },
         { "src": "sd@1234:foo", "dest": "bar", "join": true },
-        { "src": "sd@111:baz", "dest": "bar", "join": true }
+        { "src": "foo", "dest": "sd@111:baz" },
+        { "src": "foo", "dest": "sd@1234:foo" }
     ]
-}
+}
diff --git a/test/lib/getNextJobs.test.js b/test/lib/getNextJobs.test.js
@@ -5,7 +5,7 @@ const getNextJobs = require('../../lib/getNextJobs');
 const WORKFLOW = require('../data/expected-output');
 const EXTERNAL_WORKFLOW = require('../data/expected-external');
 const EXTERNAL_COMPLEX_WORKFLOW = require('../data/expected-external-complex');
-const EXTERNAL_JOIN_WORKFLOW = require('../data/external-join');
+const EXTERNAL_JOIN_WORKFLOW = require('../data/expected-external-join');
 
 describe('getNextJobs', () => {
     it('should throw if trigger not provided', () => {

diff --git a/test/lib/getWorkflow.test.js b/test/lib/getWorkflow.test.js
@@ -10,6 +10,7 @@ const EXPECTED_OUTPUT = require('../data/expected-output');
 const NO_EDGES = Object.assign({}, EXPECTED_OUTPUT);
 const EXPECTED_EXTERNAL = require('../data/expected-external');
 const EXPECTED_EXTERNAL_COMPLEX = require('../data/expected-external-complex');
+const EXPECTED_EXTERNAL_JOIN = require('../data/expected-external-join');
 
 NO_EDGES.edges = [];
 
@@ -170,6 +171,22 @@ describe('getWorkflow', () => {
         });
     });
 
+    it('should remove ~ for downstream external trigger', async () => {
+        triggerFactoryMock.getDestFromSrc.withArgs('sd@123:foo').resolves([
+            'sd@111:baz',
+            'sd@1234:foo'
+        ]);
+        const result = await getWorkflow({
+            jobs: {
+                main: { requires: ['~pr', '~commit'] },
+                foo: { requires: ['main'] },
+                bar: { requires: ['sd@111:baz', 'sd@1234:foo'] }
+            }
+        }, triggerFactoryMock, 123);
+
+        assert.deepEqual(result, EXPECTED_EXTERNAL_JOIN);
+    });
+
     it('should handle external upstream & downstream join', async () => {
         /* A - B                                                   - C
              \ sd@111:external-level1 ->  sd@222:external-level2    /