Merge branch 'master' into jae/8690-config-timeout

Author: opti-jnguyen

packages/optimizely-sdk/lib/core/odp/odp_event_manager.ts

@@ -153,7 +153,13 @@ export class OdpEventManager implements IOdpEventManager {
 
     this.queueSize = queueSize || defaultQueueSize;
     this.batchSize = batchSize || DEFAULT_BATCH_SIZE;
-    this.flushInterval = flushInterval || DEFAULT_FLUSH_INTERVAL_MSECS;
+    if (flushInterval === 0) {
+      // disable event batching
+      this.batchSize = 1;
+      this.flushInterval = 0;
+    } else {
+      this.flushInterval = flushInterval || DEFAULT_FLUSH_INTERVAL_MSECS;
+    }
 
     this.state = STATE.STOPPED;
   }

packages/optimizely-sdk/tests/odpManager.browser.spec.ts

@@ -463,6 +463,33 @@ describe('OdpManager', () => {
       expect(browserOdpManager.eventManager.flushInterval).toBe(4000);
     });
 
+    it('Default ODP event flush interval is used when odpOptions does not include eventFlushInterval', () => {
+      const odpOptions: OdpOptions = {};
+
+      const browserOdpManager = new BrowserOdpManager({
+        odpOptions,
+      });
+
+      // @ts-ignore
+      expect(browserOdpManager.eventManager.flushInterval).toBe(1000);
+    });
+
+    it('ODP event batch size set to one when odpOptions.eventFlushInterval set to 0', () => {
+      const odpOptions: OdpOptions = {
+        eventFlushInterval: 0,
+      };
+
+      const browserOdpManager = new BrowserOdpManager({
+        odpOptions,
+      });
+
+      // @ts-ignore
+      expect(browserOdpManager.eventManager.flushInterval).toBe(0);
+
+      // @ts-ignore
+      expect(browserOdpManager.eventManager.batchSize).toBe(1);
+    });
+
     it('Custom odpOptions.eventBatchSize overrides default Event Manager batch size', () => {
       const odpOptions: OdpOptions = {
         eventBatchSize: 2,