update logic to remove extra property

zapier · Jun 8, 2021 · 67b48f6 · 67b48f6
1 parent 5a53c4c
commit 67b48f6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
@@ -16,10 +16,7 @@ export const createAppTester: (
   options?: { customStoreKey?: string }
 ) => <T, B extends Bundle>(
   func: (z: ZObject, bundle: B) => T | Promise<T>,
-  bundle?: Partial<B>, // partial so we don't have to make a full bundle in tests
-  opts?: {
-    adHoc?: boolean;
-  }
+  bundle?: Partial<B> // partial so we don't have to make a full bundle in tests
 ) => Promise<T>; // appTester always returns a promise
 
 // internal only

diff --git a/packages/core/src/tools/create-app-tester.js b/packages/core/src/tools/create-app-tester.js
@@ -3,7 +3,7 @@
 const createLambdaHandler = require('./create-lambda-handler');
 const resolveMethodPath = require('./resolve-method-path');
 const ZapierPromise = require('./promise');
-const { get } = require('lodash');
+const { get, isFunction } = require('lodash');
 const { genId } = require('./data');
 
 // this is (annoyingly) mirrored in cli/api_base, so that test functions only
@@ -52,15 +52,22 @@ const createAppTester = (appRaw, { customStoreKey } = {}) => {
 
   const randomSeed = genId();
 
-  return (methodOrFunc, bundle, { adHoc } = {}) => {
+  return (methodOrFunc, bundle) => {
     bundle = bundle || {};
 
-    let method;
-    if (adHoc) {
-      appRaw._testRequest = (z, bundle) => methodOrFunc(z, bundle);
-      method = resolveMethodPath(appRaw, appRaw._testRequest);
-    } else {
-      method = resolveMethodPath(appRaw, methodOrFunc);
+    let method = resolveMethodPath(appRaw, methodOrFunc, false);
+    if (!method) {
+      if (isFunction(methodOrFunc)) {
+        // definitely have a function but didn't find it on the app; it's an adhoc
+        appRaw._testRequest = (z, bundle) => methodOrFunc(z, bundle);
+        method = resolveMethodPath(appRaw, appRaw._testRequest);
+      } else {
+        throw new Error(
+          `Unable to find the following on your App instance: ${JSON.stringify(
+            methodOrFunc
+          )}`
+        );
+      }
     }
 
     const storeKey = shouldPaginate(appRaw, method)

diff --git a/packages/core/src/tools/resolve-method-path.js b/packages/core/src/tools/resolve-method-path.js
@@ -13,7 +13,7 @@ const isRequestMethod = (needle) =>
     resolveMethodPath(app, app.resources.contact.get.operation.perform)
 
 */
-const resolveMethodPath = (app, needle) => {
+const resolveMethodPath = (app, needle, explodeIfMissing = true) => {
   // temporary warning for all those with old code
   if (typeof needle === 'string') {
     console.log(
@@ -39,7 +39,7 @@ const resolveMethodPath = (app, needle) => {
   const path =
     dataTools.memoizedFindMapDeep(app, needle) ||
     dataTools.memoizedFindMapDeep(app, needle, _.isEqual);
-  if (!path) {
+  if (!path && explodeIfMissing) {
     throw new Error(
       'We could not find your function/array/object anywhere on your App definition.'
     );