fix extraTags parser

HackerHappyHour · Dec 5, 2020 · 65b702e · 65b702e
1 parent 796dae8
commit 65b702e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/__tests__/taggingStrategy.js b/__tests__/taggingStrategy.js
@@ -0,0 +1,8 @@
+const {taggingStrategy} = require('../src/taggingStrategy')
+const {scenarios} = require('./__data__/taggingStrategy')
+
+describe.each(scenarios)('produce tags %s given %o', (expected, given) => {
+  test('it produces a csv list', () => {
+    expect(taggingStrategy(given)).toEqual(expected)
+  })
+})
diff --git a/src/taggingStrategy.js b/src/taggingStrategy.js
@@ -4,7 +4,7 @@ const {extraTagsReducer, conditionalTagsReducer, imageNameReducer, getInputList}
 exports.taggingStrategy = ({inputTags, tagName, imageName, extraTags}) => {
   try {
     let outputTags = getInputList(inputTags)
-      .reduce(conditionalTagsReducer, [])
+      .reduce(extraTagsReducer, [])
       .map(strategy => parseTag(strategy, tagName))
       .reduce(imageNameReducer(imageName), [])
 
@@ -14,8 +14,9 @@ exports.taggingStrategy = ({inputTags, tagName, imageName, extraTags}) => {
       // push the extraTag to outputTags array 
       getInputList(extraTags)
         .reduce(extraTagsReducer, [])
-        .reduce(imageNameReducer(imageName),[])
-        .forEach(tag => outputTags.push(tag))
+        .map(extraTag => imageName ? `${imageName}:${extraTag}`: `${extraTag}`)
+        .forEach(extraTag => outputTags.push(extraTag))
+
     }
 
     return outputTags.join(',')

diff --git a/src/utils.js b/src/utils.js
@@ -38,7 +38,7 @@ exports.conditionalTagsReducer = (tags,tag) => {
   return [...tags, tag]
 }
 
-exports.extraTagsReducer = (tags,tag,i) => {
+exports.extraTagsReducer = (tags,tag) => {
   let isConditionalTag = tag.search('::')
   // tag has condition specified, so only return 
   //the tag if the condition is true