respond to PR feedback

cypress-io · Mar 17, 2020 · af408c7 · af408c7
1 parent e34663c
commit af408c7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/packages/desktop-gui/src/lib/ipc-bus.js b/packages/desktop-gui/src/lib/ipc-bus.js
@@ -10,6 +10,16 @@ const addMsg = (id, event, fn) => {
   }
 }
 
+const nullifyUnserializableValues = (obj) => {
+  // nullify values that cannot be cloned
+  // https://github.com/cypress-io/cypress/issues/6750
+  return _.cloneDeepWith(obj, (val) => {
+    if (_.isFunction(val) || _.isElement(val)) {
+      return null
+    }
+  })
+}
+
 const removeMsgsByEvent = (event) => {
   msgs = _.omitBy(msgs, (msg) => {
     return msg.event === event
@@ -96,15 +106,7 @@ const ipcBus = (...args) => {
     }
   }
 
-  // remove nodes that cannot be cloned
-  // https://github.com/cypress-io/cypress/issues/6750
-  args = args.map((arg) => {
-    return _.cloneDeepWith(arg, (val) => {
-      if (_.isFunction(val) || _.isElement(val)) {
-        return null
-      }
-    })
-  })
+  args = nullifyUnserializableValues(args)
 
   // pass in request, id, and remaining args
   ipc.send(...['request', id].concat(args))

diff --git a/packages/server/lib/gui/events.coffee b/packages/server/lib/gui/events.coffee
@@ -21,8 +21,8 @@ chromePolicyCheck = require("../util/chrome_policy_check")
 browsers    = require("../browsers")
 konfig      = require("../konfig")
 
-removeUnserializableValues = (obj) =>
-  ## remove values that cannot be cloned
+nullifyUnserializableValues = (obj) =>
+  ## nullify values that cannot be cloned
   ## https://github.com/cypress-io/cypress/issues/6750
   _.cloneDeepWith obj, (val) =>
     if _.isFunction(val)
@@ -33,7 +33,7 @@ handleEvent = (options, bus, event, id, type, arg) ->
 
   sendResponse = (originalData = {}) ->
     try
-      data = removeUnserializableValues(originalData)
+      data = nullifyUnserializableValues(originalData)
 
       debug("sending ipc data %o", { type, data, originalData })
       event.sender.send("response", data)
@@ -327,7 +327,7 @@ handleEvent = (options, bus, event, id, type, arg) ->
       throw new Error("No ipc event registered for: '#{type}'")
 
 module.exports = {
-  removeUnserializableValues
+  nullifyUnserializableValues
 
   handleEvent
 

diff --git a/packages/server/test/unit/gui/events_spec.coffee b/packages/server/test/unit/gui/events_spec.coffee
@@ -158,7 +158,7 @@ describe "lib/gui/events", ->
       it "calls Windows#open with args and resolves with return of Windows.open", ->
         @handleEvent("window:open", {type: "INDEX"})
         .then (assert) =>
-          assert.sendCalledWith(events.removeUnserializableValues(@win))
+          assert.sendCalledWith(events.nullifyUnserializableValues(@win))
 
       it "catches errors", ->
         err = new Error("foo")