Replace Object.assign with the spread operator in object inspector tests.

Author: nchevobbe

packages/devtools-reps/src/object-inspector/tests/__mocks__/object-client.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function ObjectClient(grip, overrides) {
-  return Object.assign({
+  return {
     grip,
     enumEntries: function () {
       return Promise.resolve({
@@ -38,8 +38,9 @@ function ObjectClient(grip, overrides) {
           return Promise.resolve(res);
         }
       };
-    }
-  }, overrides);
+    },
+    ...overrides,
+  };
 }
 
 module.exports = ObjectClient;

packages/devtools-reps/src/object-inspector/tests/component/basic.js

@@ -18,10 +18,11 @@ const ObjectClient = require("../__mocks__/object-client");
 const gripRepStubs = require(`${repsPath}/stubs/grip`);
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 0,
-    createObjectClient: grip => ObjectClient(grip)
-  }, overrides);
+    createObjectClient: grip => ObjectClient(grip),
+    ...overrides,
+  };
 }
 
 describe("ObjectInspector - renders", () => {
@@ -164,12 +165,12 @@ describe("ObjectInspector - renders", () => {
           "root",
           {
             ownProperties: Object.keys(stub.preview.ownProperties)
-              .reduce((res, key) =>
-                Object.assign({
-                  [key]: {
-                    value: stub
-                  },
-                }, res), {})
+              .reduce((res, key) => ({
+                [key]: {
+                  value: stub
+                },
+                ...res,
+              }), {})
           }
         ]])
     })));

packages/devtools-reps/src/object-inspector/tests/component/classnames.js

@@ -9,15 +9,16 @@ const ObjectInspector = createFactory(require("../../index"));
 const ObjectClient = require("../__mocks__/object-client");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 0,
     roots: [{
       path: "root",
       name: "root",
       contents: {value: 42}
     }],
-    createObjectClient: grip => ObjectClient(grip)
-  }, overrides);
+    createObjectClient: grip => ObjectClient(grip),
+    ...overrides,
+  };
 }
 
 function mountObjectInspector(props) {

packages/devtools-reps/src/object-inspector/tests/component/entries.js

@@ -16,10 +16,11 @@ const ObjectClient = require("../__mocks__/object-client");
 const { SAFE_PATH_PREFIX } = require("../../utils/node");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 0,
-    createObjectClient: grip => ObjectClient(grip)
-  }, overrides);
+    createObjectClient: grip => ObjectClient(grip),
+    ...overrides
+  };
 }
 
 function getEnumEntriesMock() {

packages/devtools-reps/src/object-inspector/tests/component/events.js

@@ -13,10 +13,11 @@ const gripRepStubs = require("../../../reps/stubs/grip");
 const ObjectClient = require("../__mocks__/object-client");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 0,
-    createObjectClient: grip => ObjectClient(grip)
-  }, overrides);
+    createObjectClient: grip => ObjectClient(grip),
+    ...overrides,
+  };
 }
 
 describe("ObjectInspector - properties", () => {

packages/devtools-reps/src/object-inspector/tests/component/expand.js

@@ -21,7 +21,7 @@ const {
 } = require("../../utils/node");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 0,
     roots: [{
       path: "root-1",
@@ -36,7 +36,8 @@ function generateDefaults(overrides) {
     }],
     createObjectClient: grip => ObjectClient(grip),
     mode: MODE.LONG,
-  }, overrides);
+    ...overrides,
+  };
 }
 
 describe("ObjectInspector - state", () => {

packages/devtools-reps/src/object-inspector/tests/component/function.js

@@ -12,10 +12,11 @@ const functionStubs = require("../../../reps/stubs/function");
 const ObjectClient = require("../__mocks__/object-client");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 1,
-    createObjectClient: grip => ObjectClient(grip)
-  }, overrides);
+    createObjectClient: grip => ObjectClient(grip),
+    ...overrides,
+  };
 }
 
 describe("ObjectInspector - functions", () => {

packages/devtools-reps/src/object-inspector/tests/component/getter-setter.js

@@ -13,11 +13,12 @@ const accessorStubs = require("../../../reps/stubs/accessor");
 const ObjectClient = require("../__mocks__/object-client");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 1,
     createObjectClient: grip => ObjectClient(grip),
     mode: MODE.LONG,
-  }, overrides);
+    ...overrides,
+  };
 }
 
 describe("ObjectInspector - getters & setters", () => {

packages/devtools-reps/src/object-inspector/tests/component/properties.js

@@ -17,10 +17,11 @@ const {
 } = require("../test-utils");
 
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     autoExpandDepth: 0,
     createObjectClient: grip => ObjectClient(grip),
-  }, overrides);
+    ...overrides,
+  };
 }
 
 function getEnumPropertiesMock() {

packages/devtools-reps/src/object-inspector/tests/component/proxy.js

@@ -14,7 +14,7 @@ const { formatObjectInspector } = require("../test-utils");
 
 const ObjectClient = require("../__mocks__/object-client");
 function generateDefaults(overrides) {
-  return Object.assign({
+  return {
     roots: [{
       path: "root",
       contents: {value: stub}
@@ -26,8 +26,9 @@ function generateDefaults(overrides) {
     // enumProperties for the root's properties.
     loadedProperties: new Map([
       ["root", {prototype: {}}]
-    ])
-  }, overrides);
+    ]),
+    ...overrides,
+  };
 }
 
 function getEnumPropertiesMock() {