[Github] issues: Accommodate multi-word labels (#1135)

Fix #1134
badges · Oct 9, 2017 · c579ed7 · c579ed7
1 parent 271bb4b
commit c579ed7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/server.js b/server.js
@@ -3418,7 +3418,7 @@ cache(function(data, match, sendBadge, request) {
   query.q = 'repo:' + user + '/' + repo +
     (isPR? ' is:pr': ' is:issue') +
     (isClosed? ' is:closed': ' is:open') +
-    (hasLabel? ' label:' + ghLabel: '');
+    (hasLabel? ` label:"${ghLabel}"` : '');
 
   var classText = isClosed? 'closed': 'open';
   var leftClassText = isRaw? classText + ' ': '';

diff --git a/service-tests/github.js b/service-tests/github.js
@@ -76,17 +76,25 @@ t.create('GitHub open issues raw')
   .get('/issues-raw/badges/shields.json')
   .expectJSONTypes(Joi.object().keys({ name: 'open issues', value: isMetric }));
 
-t.create('GitHub open issues by label')
-  .get('/issues/badges/shields/vendor-badge.json')
+t.create('GitHub open issues by label is > zero')
+  .get('/issues/badges/shields/service-badge.json')
   .expectJSONTypes(Joi.object().keys({
-    name: Joi.equal('vendor-badge issues'),
-    value: Joi.string().regex(/^[0-9]+[kMGTPEZY]? open$/)
+    name: Joi.equal('service-badge issues'),
+    value: Joi.string().regex(/^[1-9][0-9]*[kMGTPEZY]? open$/)
+  }));
+
+t.create('GitHub open issues by label is > zero')
+  .get('/issues/Cockatrice/Cockatrice/Easy%20Change.json')
+  .inspectJSON()
+  .expectJSONTypes(Joi.object().keys({
+    name: Joi.equal('Easy Change issues'),
+    value: Joi.string().regex(/^[1-9][0-9]*[kMGTPEZY]? open$/)
   }));
 
 t.create('GitHub open issues by label (raw)')
-  .get('/issues-raw/badges/shields/vendor-badge.json')
+  .get('/issues-raw/badges/shields/service-badge.json')
   .expectJSONTypes(Joi.object().keys({
-    name: Joi.equal('open vendor-badge issues'),
+    name: Joi.equal('open service-badge issues'),
     value: isMetric
   }));