Use Object.assign

test/browser/spec/ol/layer/Group.test.js

@@ -2,7 +2,6 @@ import Collection from '../../../../../src/ol/Collection.js';
 import Layer from '../../../../../src/ol/layer/Layer.js';
 import LayerGroup from '../../../../../src/ol/layer/Group.js';
 import Source from '../../../../../src/ol/source/Source.js';
-import {assign} from '../../../../../src/ol/obj.js';
 import {getIntersection} from '../../../../../src/ol/extent.js';
 import {getUid} from '../../../../../src/ol/util.js';
 
@@ -531,9 +530,9 @@ describe('ol/layer/Group', function () {
       expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
 
       // layer state should match except for layer reference
-      const layerState = assign({}, layerStatesArray[0]);
+      const layerState = Object.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      const groupState = assign({}, group.getLayerState());
+      const groupState = Object.assign({}, group.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
@@ -580,14 +579,14 @@ describe('ol/layer/Group', function () {
       // compare layer state to group state
 
       // layer state should match except for layer reference
-      let layerState = assign({}, layerStatesArray[0]);
+      let layerState = Object.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      const groupState = assign({}, group.getLayerState());
+      const groupState = Object.assign({}, group.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
       // layer state should be transformed (and we ignore layer reference)
-      layerState = assign({}, layerStatesArray[1]);
+      layerState = Object.assign({}, layerStatesArray[1]);
       delete layerState.layer;
       expect(layerState).to.eql({
         opacity: 0.25,

test/node/ol/obj.test.js

@@ -1,45 +1,7 @@
 import expect from '../expect.js';
-import {assign, clear, isEmpty} from '../../../src/ol/obj.js';
+import {clear, isEmpty} from '../../../src/ol/obj.js';
 
 describe('ol/obj.js', () => {
-  describe('assign()', function () {
-    it('is an alias for Object.assign() where available', function () {
-      if (typeof Object.assign === 'function') {
-        expect(assign).to.be(Object.assign);
-      }
-    });
-
-    it('assigns properties from a source object to a target object', function () {
-      const source = {
-        sourceProp1: 'sourceValue1',
-        sourceProp2: 'sourceValue2',
-      };
-
-      const target = {
-        sourceProp1: 'overridden',
-        targetProp1: 'targetValue1',
-      };
-
-      const assigned = assign(target, source);
-      expect(assigned).to.be(target);
-      expect(assigned.sourceProp1).to.be('sourceValue1');
-      expect(assigned.sourceProp2).to.be('sourceValue2');
-      expect(assigned.targetProp1).to.be('targetValue1');
-    });
-
-    it('throws a TypeError with `undefined` as target', function () {
-      expect(() => assign()).to.throwException(
-        /Cannot convert undefined or null to object/
-      );
-    });
-
-    it('throws a TypeError with `null` as target', function () {
-      expect(() => assign(null)).to.throwException(
-        /Cannot convert undefined or null to object/
-      );
-    });
-  });
-
   describe('clear()', function () {
     it('removes all properties from an object', function () {
       expect(isEmpty(clear({foo: 'bar'}))).to.be(true);