Merge pull request #26 from xgbuils/fix-25

fix no-duplicated-tags: one report by duplicated tag
xgbuils · May 6, 2019 · 50fcc9e · 50fcc9e
2 parents 4ee6b3c + a17139e
commit 50fcc9e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 26 deletions.
diff --git a/src/rules/no-duplicate-tags.js b/src/rules/no-duplicate-tags.js
@@ -1,33 +1,27 @@
 const rule = 'no-duplicate-tags';
-const {compose, intoArray} = require('../utils/generic');
-const {filter, map} = require('../utils/transducers');
 const {flatMapNodeTags} = require('../utils/gherkin');
 
-const collectTagsInfo = (tags, {name, location}) => {
-  const info = tags[name];
-  if (info) {
-    info.count++;
+const appendErrors = (track, tag) => {
+  if (track.names.has(tag.name)) {
+    track.errors.push(createError(tag));
   } else {
-    tags[name] = {
-      count: 1,
-      location,
-      name,
-    };
+    track.names.add(tag.name);
   }
-  return tags;
+  return track;
 };
 
+const createError = (tag) => ({
+  type: 'rule',
+  message: `Duplicate tags are not allowed: ${tag.name}`,
+  rule: rule,
+  location: tag.location,
+});
+
 const verifyTags = ({tags, location}) => {
-  const tagsInfo = tags.reduce(collectTagsInfo, {});
-  return intoArray(compose(
-    filter(({count}) => count > 1),
-    map((tag) => ({
-      type: 'rule',
-      message: `Duplicate tags are not allowed: ${tag.name}`,
-      rule: rule,
-      location: tag.location,
-    }))
-  ))(tagsInfo);
+  return tags.reduce(appendErrors, {
+    names: new Set(),
+    errors: [],
+  }).errors;
 };
 
 module.exports = {

diff --git a/test/rules/no-duplicate-tags/no-duplicate-tags.js b/test/rules/no-duplicate-tags/no-duplicate-tags.js
@@ -19,31 +19,47 @@ describe('No Duplicate Tags Rule', () => {
       rule: ruleName,
       location: {
         line: 1,
-        column: 1,
+        column: 13,
       },
     },
     {
       messageElements: {tags: '@scenariotag'},
       rule: ruleName,
       location: {
         line: 7,
-        column: 1,
+        column: 14,
+      },
+    },
+    {
+      messageElements: {tags: '@scenariotag'},
+      rule: ruleName,
+      location: {
+        line: 7,
+        column: 27,
       },
     },
     {
       messageElements: {tags: '@scenariotag'},
       rule: ruleName,
       location: {
         line: 11,
-        column: 1,
+        column: 14,
+      },
+    },
+    {
+      messageElements: {tags: '@exampletag'},
+      rule: ruleName,
+      location: {
+        line: 14,
+        column: 15,
       },
     },
     {
       messageElements: {tags: '@exampletag'},
       rule: ruleName,
       location: {
         line: 14,
-        column: 3,
+        column: 27,
       },
     }]);
   });