Merge pull request TryGhost#4781 from ErisDS/has-tag-fix

Fix has helper tag matching
elitelinux · Jan 11, 2015 · be462d8 · be462d8
2 parents 64d2907 + 3f34162
commit be462d8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/core/server/helpers/has.js b/core/server/helpers/has.js
@@ -25,7 +25,7 @@ has = function (options) {
             return p || (_.findIndex(tags, function (item) {
                 // Escape regex special characters
                 item = item.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g, '\\$&');
-                item = new RegExp(item, 'i');
+                item = new RegExp('^' + item + '$', 'i');
                 return item.test(c);
             }) !== -1);
         }, false);

diff --git a/core/test/unit/server_helpers/has_spec.js b/core/test/unit/server_helpers/has_spec.js
@@ -44,6 +44,32 @@ describe('{{#has}} helper', function () {
         inverse.called.should.be.false;
     });
 
+    it('should match exact tags, not superstrings', function () {
+        var fn = sinon.spy(),
+            inverse = sinon.spy();
+
+        helpers.has.call(
+            {tags: [{name: 'magical'}]},
+            {hash: {tag: 'magic'}, fn: fn, inverse: inverse}
+        );
+
+        fn.called.should.be.false;
+        inverse.called.should.be.true;
+    });
+
+    it('should match exact tags, not substrings', function () {
+        var fn = sinon.spy(),
+            inverse = sinon.spy();
+
+        helpers.has.call(
+            {tags: [{name: 'magic'}]},
+            {hash: {tag: 'magical'}, fn: fn, inverse: inverse}
+        );
+
+        fn.called.should.be.false;
+        inverse.called.should.be.true;
+    });
+
     it('should handle tag list that validates false', function () {
         var fn = sinon.spy(),
             inverse = sinon.spy();