fix: prevent workflow graph getting weird when requires contains dupl…

…icates
screwdriver-cd · Oct 26, 2017 · c4f34a1 · c4f34a1
1 parent a5a7a4d
commit c4f34a1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/lib/getWorkflow.js b/lib/getWorkflow.js
@@ -65,16 +65,16 @@ const calculateEdges = (jobs) => {
         const dest = j;
 
         if (Array.isArray(job.requires)) {
-            const specialTriggers = job.requires.filter(name => name.charAt(0) === '~');
-            const normalTriggers = job.requires.filter(name => name.charAt(0) !== '~');
-            const isJoin = normalTriggers.length > 1;
+            const specialTriggers = new Set(job.requires.filter(name => name.charAt(0) === '~'));
+            const normalTriggers = new Set(job.requires.filter(name => name.charAt(0) !== '~'));
+            const isJoin = normalTriggers.size > 1;
 
             specialTriggers.forEach((src) => {
                 edges.push({ src: filterNodeName(src), dest });
             });
 
             normalTriggers.forEach((src) => {
-                const obj = { src: filterNodeName(src), dest };
+                const obj = { src, dest };
 
                 if (isJoin) {
                     obj.join = true;

diff --git a/test/lib/getWorkflow.test.js b/test/lib/getWorkflow.test.js
@@ -141,6 +141,27 @@ describe('getWorkflow', () => {
         });
     });
 
+    it('should dedupe requires', () => {
+        const result = getWorkflow({
+            jobs: {
+                foo: { requires: ['A', 'A', 'A'] },
+                A: {}
+            }
+        });
+
+        assert.deepEqual(result, {
+            nodes: [
+                { name: '~pr' },
+                { name: '~commit' },
+                { name: 'foo' },
+                { name: 'A' }
+            ],
+            edges: [
+                { src: 'A', dest: 'foo' }
+            ]
+        });
+    });
+
     it('should handle joins', () => {
         const result = getWorkflow({
             jobs: {