Merge with updated DLH

Author: Alex7Li

data-layer-helper

@@ -150,7 +150,8 @@ function configProcessors(helper, eventProcessor, eventOptions,
   function processEvent(name, options = undefined) {
     const model = this;
     if (!options) options = {};
-    options = merge(getExtraOptions(helper, processor), eventOptions, options);
+    options = merge(getExtraOptions(helper, processor.constructor),
+      eventOptions, options);
     processor.processEvent(/** @type {!StorageInterface} */(storage),
       model, name, options);
   }

src/config/configProcessors.js

@@ -30,9 +30,10 @@ function setupMeasure(dataLayer) {
   const helper = new DataLayerHelper(dataLayer, {'processNow': false});
 
   helper.registerProcessor('config',
-      (eventProcessor, eventOptions, storageProcessor, storageOptions) =>
+      (eventProcessor, eventOptions, storageProcessor, storageOptions) => {
         configProcessors(helper, eventProcessor, eventOptions,
-            storageProcessor, storageOptions));
+            storageProcessor, storageOptions);
+      });
   helper.process();
 }
 

src/config/setup.js

@@ -45,7 +45,6 @@ describe('After calling measure with `event` as the first parameter', () => {
 
 
   describe('The call forwarded after a call to measure(`event`, ...)', () => {
-    /* TODO:(wolfblue@): Fix the issue here, it stems from data layer helper
     it('inherits any parameters from set called before the constructor',
       () => {
         measure('set', 'processor', {'cat': 'meow'});
@@ -69,7 +68,6 @@ describe('After calling measure with `event` as the first parameter', () => {
             set: jasmine.any(Function),
           }, 'name', {'cat': 'meow', 'dog': 'woof'});
       });
-    */
 
     it('does not inherit if set is called unscoped', () => {
       measure('config', MockProcessor, {'dog': 'woof'}, MockStorage, {});