Merge pull request #125 from zapier/fix-cursor-tests

(fix) cursor reading didn't work in tests

src/http-middlewares/before/add-digest-auth-header.js

@@ -1,11 +1,10 @@
 'use strict';
 
-const crypto = require('crypto');
 const urllib = require('url');
-
 const fetch = require('node-fetch');
 
 const { NotImplementedError } = require('../../errors');
+const { md5 } = require('../../tools/hashing');
 
 // This function splits a comma-separated string described by RFC 2068 Section 2.
 // Ported from https://github.com/python/cpython/blob/f081fd83/Lib/urllib/request.py#L1399-L1440
@@ -80,12 +79,6 @@ const parseDictHeader = s => {
   return res;
 };
 
-const md5 = s =>
-  crypto
-    .createHash('md5')
-    .update(s)
-    .digest('hex');
-
 const buildDigestHeader = (username, password, url, method, creds) => {
   if (creds.algorithm && creds.algorithm.toUpperCase() !== 'MD5') {
     throw new NotImplementedError(

src/tools/create-app-tester.js

@@ -40,6 +40,8 @@ const createAppTester = appRaw => {
   const handler = createLambdaHandler(appRaw);
   const createHandlerPromise = promisifyHandler(handler);
 
+  const randomSeed = genId();
+
   return (methodOrFunc, bundle) => {
     bundle = bundle || {};
 
@@ -49,7 +51,10 @@ const createAppTester = appRaw => {
       command: 'execute',
       method,
       bundle,
-      storeKey: shouldPaginate(appRaw, method) ? `testKey-${genId()}` : null
+      storeKey: shouldPaginate(appRaw, method)
+        ? // this key will be consistent across runs but unique to each test so we don't lose cursors
+          `testKey-${method}-${randomSeed}`
+        : null
     };
 
     if (process.env.LOG_TO_STDOUT) {

src/tools/data.js

@@ -174,15 +174,15 @@ const simpleTruncate = (string, length, suffix) => {
 const genId = () => parseInt(Math.random() * 100000000);
 
 module.exports = {
-  isPlainObj,
-  findMapDeep,
-  memoizedFindMapDeep,
   deepCopy,
-  jsonCopy,
   deepFreeze,
-  recurseReplace,
-  recurseExtract,
+  findMapDeep,
   flattenPaths,
-  simpleTruncate,
-  genId
+  genId,
+  isPlainObj,
+  jsonCopy,
+  memoizedFindMapDeep,
+  recurseExtract,
+  recurseReplace,
+  simpleTruncate
 };

src/tools/hashing.js

@@ -22,7 +22,14 @@ const snipify = s => {
   return `:censored:${length}:${result.substr(0, 10)}:`;
 };
 
+const md5 = s =>
+  crypto
+    .createHash('md5')
+    .update(s)
+    .digest('hex');
+
 module.exports = {
   hashify,
+  md5,
   snipify
 };