fix error token

felixheck · Nov 28, 2017 · 22a1587 · 22a1587
1 parent ce4fb40
commit 22a1587
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/tokens.js b/src/tokens.js
@@ -80,11 +80,11 @@ assign('get', (data, colors, field) => (
 ))
 
 assign('error', (data, colors, field = 'message') => {
-  if (!data.err && data.data.err) {
+  if (!get(data, 'err') && get(data, 'data.err')) {
     data = data.data
   }
 
-  if (!data.err.source) {
+  if (!get(data, 'err.source')) {
     data.err.source = utils.getErrorSource(data.err)
   }
 

diff --git a/test/tokens.spec.js b/test/tokens.spec.js
@@ -86,10 +86,12 @@ test('return requested general attributes', (t) => {
 
 test('return requested alternative attributes', (t) => {
   const mockData = {
-    data: 'foobar'
+    data: 'foobar',
+    err: 'foobar'
   }
 
   t.is(tokens['message'](mockData), mockData.data)
+  t.is(tokens['error'](mockData), undefined)
 })
 
 test('return requested req/res attributes', (t) => {