[intepreter][Canvas] Dedupe server functions in batched requests (ela…

…stic#32712) * [intepreter][Canvas] Dedupe server functions in batched requests * Add and correct tests
clintandrewhall · Mar 10, 2019 · 1292225 · 1292225
1 parent 41b8931
commit 1292225
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/packages/kbn-interpreter/src/public/interpreter.test.js b/packages/kbn-interpreter/src/public/interpreter.test.js
@@ -36,7 +36,16 @@ describe('kbn-interpreter/interpreter', () => {
   it('loads server-side functions', async () => {
     const kfetch = jest.fn(async () => ({}));
 
+<<<<<<< HEAD
     await initializeInterpreter(kfetch, { toJS: () => ({}) }, ({ register: () => {} }));
+=======
+    await initializeInterpreter({
+      kfetch,
+      ajaxStream,
+      typesRegistry: { toJS: () => ({}) },
+      functionsRegistry: { register: () => {} },
+    });
+>>>>>>> 41e68ebbe9... [intepreter][Canvas] Dedupe server functions in batched requests (#32712)
 
     expect(kfetch).toHaveBeenCalledTimes(1);
     expect(kfetch).toHaveBeenCalledWith({ pathname: FUNCTIONS_URL });