From 194eddbda4dfd551e04e14d07dbce68627dd1b6a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 13 Oct 2021 09:29:01 +0100
Subject: [PATCH] some tidy up

---
 packages/bbui/src/Table/CellRenderer.svelte                | 3 ++-
 .../automation/SetupPanel/AutomationBlockSetup.svelte      | 6 ++++--
 packages/server/src/automations/tests/automation.spec.js   | 7 +++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte
index 95aee839e8..8ab180eb8b 100644
--- a/packages/bbui/src/Table/CellRenderer.svelte
+++ b/packages/bbui/src/Table/CellRenderer.svelte
@@ -6,6 +6,7 @@
   import AttachmentRenderer from "./AttachmentRenderer.svelte"
   import ArrayRenderer from "./ArrayRenderer.svelte"
   import InternalRenderer from "./InternalRenderer.svelte"
+
   export let row
   export let schema
   export let value
@@ -31,7 +32,7 @@
     // the schema gets overriden on every tables fetch so we can't just set
     // these to be a new type unfortunately
     if (schema.name === "_id" || schema.name === "_rev") {
-      renderer = customRenderer?.component ?? typeMap.internal ?? StringRenderer
+      renderer = typeMap.internal
     } else {
       renderer = customRenderer?.component ?? typeMap[type] ?? StringRenderer
     }
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 290c6e23ad..36c295b94e 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -33,7 +33,6 @@
   export let testData
   export let schemaProperties
   export let isTestModal = false
-
   let webhookModal
   let drawer
   let tempFilters = lookForFilters(schemaProperties) || []
@@ -58,7 +57,10 @@
         // Special case for webhook, as it requires a body, but the schema already brings back the body's contents
         if (stepId === "WEBHOOK") {
           automationStore.actions.addTestDataToAutomation({
-            body: { [key]: e.detail },
+            body: {
+              [key]: e.detail,
+              ...$automationStore.selectedAutomation.automation.testData.body,
+            },
           })
         }
         automationStore.actions.addTestDataToAutomation({
diff --git a/packages/server/src/automations/tests/automation.spec.js b/packages/server/src/automations/tests/automation.spec.js
index 9444995ca1..b338b391c7 100644
--- a/packages/server/src/automations/tests/automation.spec.js
+++ b/packages/server/src/automations/tests/automation.spec.js
@@ -1,5 +1,12 @@
 jest.mock("../../utilities/usageQuota")
 jest.mock("../thread")
+jest.mock("../../utilities/redis", () => ({
+  init: jest.fn(),
+  checkTestFlag: () => {
+    return false
+  },
+}))
+
 jest.spyOn(global.console, "error")
 
 require("../../environment")