Bug 1449848 - Bugfix for JSON substitutions (+ prettify)

src/api.js

@@ -546,11 +546,15 @@ var remoteAuthentication = function(options, entry) {
             '',
             'You have the scopes:',
             '',
+            '```',
             '{{scopes}}',
+            '```',
             '',
             'This request requires you to satisfy this scope expression:',
             '',
+            '```',
             '{{required}}',
+            '```',
           ].join('\n');
           err.details = {
             scopes: result.scopes,

src/errors.js

@@ -61,7 +61,7 @@ let BuildReportErrorMethod = (method, errorCodes, monitor, cleanPayload) => {
       message = message.replace(/{{([a-zA-Z0-9_-]+)}}/g, (text, key) => {
         let value = details.hasOwnProperty(key) ? details[key] : text;
         if (typeof value !== 'string') {
-          return JSON.stringify(value, null, 2);
+          value = JSON.stringify(value, null, 2);
         }
         // escape the substituted value, so that the markdown rendering cannot be abused
         value = escapeMarkdown(value);

test/errors_test.js

@@ -65,15 +65,15 @@ suite('api/errors', function() {
       let response = JSON.parse(res.response.text);
       response.message = response.message.replace(response.requestInfo.time, '<nowish>');
       response.requestInfo.time = '<nowish>';
-      assert(_.isEqual(response, {
+      assert.deepEqual(response, {
         code: 'TooManyFoos',
         message: [
           'You can only have 3 foos.  These foos already exist:',
-          '[',
+          '\\[',
           '  1,',
           '  2,',
           '  3',
-          ']',
+          '\\]',
           '----',
           'method:     toomanyfoos',
           'errorCode:  TooManyFoos',
@@ -86,7 +86,7 @@ suite('api/errors', function() {
           payload: {foos: [4, 5]},
           time: '<nowish>',
         },
-      }));
+      });
     });
   });