Merge pull request #51 from nhsuk/bug/trim-location

✂️ trim leading and trailing space on location

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Do not use name of place in map link
 - Display address when there is no postcode
 - Add formatted opening times for pharmacies
+- Trim leading and trailing spaces on postcode
 
 0.5.0 / 2018-04-11
 ==================

app/lib/utils/utils.js

@@ -34,9 +34,14 @@ function getResultsInternalUrl(query, location) {
   return `${constants.siteRoot}/results?location=${location}&type=${getAlternativeTypeFor(query.type)}&origin=${query.origin}`;
 }
 
+function trim(string) {
+  return string && string.trim();
+}
+
 module.exports = {
   areEqual,
   getResultsInternalUrl,
   isProfessionalChoice,
   joinTruthyValues,
+  trim,
 };

app/middleware/locals.js

@@ -1,4 +1,5 @@
 const queryMapper = require('../lib/utils/queryMapper');
+const trim = require('../lib/utils/utils').trim;
 
 module.exports = config =>
   (req, res, next) => {
@@ -13,7 +14,7 @@ module.exports = config =>
     res.locals.choices = req.query.choices;
     res.locals.type = queryMapper.mapServiceType(req.query);
     res.locals.origin = queryMapper.mapServiceChoice(req.query);
-    res.locals.location = req.query.location;
+    res.locals.location = trim(req.query.location);
     res.locals.locationHeading = queryMapper.getLocationHeading(req.query);
     res.locals.correctLocationParams = res.locals.locationHeading;
     const resultsInfo = queryMapper.getResultsInfo(req.query, res.locals.location);

test/unit/lib/utils/utils.js

@@ -110,4 +110,15 @@ describe('utils', () => {
       expect(output).to.equal('a, 1, true');
     });
   });
+
+  describe('trim', () => {
+    it('should remove leading and trailing whitespace', () => {
+      const result = utils.trim('  test  ');
+      expect(result).to.equal('test');
+    });
+    it('should gracefully handled undefined values', () => {
+      const result = utils.trim(undefined);
+      expect(result).to.equal(undefined);
+    });
+  });
 });