Made final tweaks to code pre 2.0.0

findmypast-oss · May 1, 2017 · 4d3c0b9 · 4d3c0b9
1 parent 8ed1f79
commit 4d3c0b9
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 30 deletions.
diff --git a/lib/request/compile-body.js b/lib/request/compile-body.js
@@ -4,13 +4,4 @@ const _ = require('lodash')
 const hyperid = require('hyperid')
 const instance = hyperid()
 
-// module.exports = (body) => {
-//   if (body.includes('<%=') && body.includes('%>')) {
-//     const compileBody = _.template(body)
-//     return compileBody({ hyperid: instance() })
-//   }
-//
-//   return body
-// }
-
-module.exports = (body) => _.template(body)({ hyperid: instance() })
+module.exports = (body) => _.template(body)({ unique_id: instance() })
diff --git a/lib/request/compile-headers.js b/lib/request/compile-headers.js
@@ -6,10 +6,4 @@ module.exports = (headers, variables) => {
   return _.mapValues(headers, compileHeader(variables))
 }
 
-// const compileHeader = (variables) => (value) => {
-//   return value.includes('<%=') && value.includes('%>')
-//     ? _.template(value)(variables)
-//     : value
-// }
-
 const compileHeader = (variables) => (value) => _.template(value)(variables)
diff --git a/lib/request/compile-url.js b/lib/request/compile-url.js
@@ -2,10 +2,4 @@
 
 const _ = require('lodash')
 
-// module.exports = (url, variables) => {
-//   return url.includes('<%=') && url.includes('%>')
-//     ? _.template(url)(variables)
-//     : url
-// }
-
 module.exports = (url, variables) => _.template(url)(variables)
diff --git a/test/contracts/consumer-valid-broken-after-hook.json b/test/contracts/consumer-valid-broken-after-hook.json
@@ -13,7 +13,7 @@
                 "Content-Type": "application/json"
               },
               "body": {
-                "email": "<%= hyperid %>@test.com"
+                "email": "<%= unique_id %>@test.com"
               }
             },
             "response": {

diff --git a/test/contracts/consumer-valid-broken-before-hook.json b/test/contracts/consumer-valid-broken-before-hook.json
@@ -13,7 +13,7 @@
                 "Content-Type": "application/json"
               },
               "body": {
-                "email": "<%= hyperid %>@test.com"
+                "email": "<%= unique_id %>@test.com"
               }
             },
             "response": {

diff --git a/test/contracts/consumer-valid-broken-before-hooks.json b/test/contracts/consumer-valid-broken-before-hooks.json
@@ -13,7 +13,7 @@
                 "Content-Type": "application/json"
               },
               "body": {
-                "email": "<%= hyperid %>@test.com"
+                "email": "<%= unique_id %>@test.com"
               }
             },
             "response": {

diff --git a/test/contracts/consumer-valid-passing-after-hook.json b/test/contracts/consumer-valid-passing-after-hook.json
@@ -13,7 +13,7 @@
                 "Content-Type": "application/json"
               },
               "body": {
-                "email": "<%= hyperid %>@test.com"
+                "email": "<%= unique_id %>@test.com"
               }
             },
             "response": {

diff --git a/test/contracts/consumer-valid-passing-before-hook.json b/test/contracts/consumer-valid-passing-before-hook.json
@@ -13,7 +13,7 @@
                 "Content-Type": "application/json"
               },
               "body": {
-                "email": "<%= hyperid %>@test.com"
+                "email": "<%= unique_id %>@test.com"
               }
             },
             "response": {

diff --git a/test/contracts/consumer-valid-passing-before-hooks.json b/test/contracts/consumer-valid-passing-before-hooks.json
@@ -13,7 +13,7 @@
                 "Content-Type": "application/json"
               },
               "body": {
-                "email": "<%= hyperid %>@test.com"
+                "email": "<%= unique_id %>@test.com"
               }
             },
             "response": {

diff --git a/test/contracts/consumer-valid-passing-unique-id.json b/test/contracts/consumer-valid-passing-unique-id.json
@@ -11,7 +11,7 @@
               "Content-Type": "application/json"
             },
             "body": {
-              "email": "<%= hyperid %>@test.com"
+              "email": "<%= unique_id %>@test.com"
             }
           },
           "response": {

diff --git a/test/helpers/provider.js b/test/helpers/provider.js
@@ -20,7 +20,7 @@ Provider.prototype.start = function (options, done) {
   })
 
   app.post('/api/user', (req, res) => {
-    if (req.body.email.startsWith('<%= hyperid %>')) {
+    if (req.body.email.startsWith('<%= unique_id %>')) {
       res.status(400).send({ message: 'Email Address In Use' })
     } else {
       res.status(201).send({ id: 1, email: req.body.email })