move registries into env, reorganize some code

web/static/tests/helpers/test_data.ts

@@ -1,39 +1,20 @@
-import { readFile } from "fs";
 import { BaseMenuItem, getMenuInfo } from "../../src/ts/loaders";
-import { actionRegistry, viewRegistry } from "../../src/ts/registries";
 import { ActionDescription } from "../../src/ts/store/action_manager_mixin";
 import { MenuInfo } from "../../src/ts/store/store";
-import { Registry } from "../../src/ts/core/registry";
 
 export interface TestData {
   menuInfo: MenuInfo;
   actions: ActionDescription[];
-  actionRegistry: typeof actionRegistry;
-  viewRegistry: typeof viewRegistry;
-  templates: string;
 }
 
-let templates: string;
-
-export async function makeTestData(): Promise<TestData> {
-  if (!templates) {
-    templates = await loadTemplates();
-  }
-  const _actionRegistry: typeof actionRegistry = new Registry();
-  (<any>_actionRegistry).map = Object.assign({}, (<any>actionRegistry).map);
-  const _viewRegistry: typeof actionRegistry = new Registry();
-  (<any>_viewRegistry).map = Object.assign({}, (<any>actionRegistry).map);
-
+export function makeTestData(): TestData {
   return {
     menuInfo: makeMenuInfo(),
-    actions: makeActionData(),
-    actionRegistry: _actionRegistry,
-    viewRegistry: _viewRegistry,
-    templates
+    actions: makeActionData()
   };
 }
 
-export function makeMenuInfo(): MenuInfo {
+function makeMenuInfo(): MenuInfo {
   const items: BaseMenuItem[] = [
     {
       id: 96,
@@ -215,10 +196,28 @@ function makeActionData(): ActionDescription[] {
   ];
 }
 
-function loadTemplates(): Promise<string> {
-  return new Promise((resolve, reject) => {
-    readFile("web/static/src/xml/templates.xml", "utf-8", (err, result) => {
-      resolve(result);
-    });
-  });
-}
+// function loadTemplates(): Promise<string> {
+//   return new Promise((resolve, reject) => {
+//     readFile("web/static/src/xml/templates.xml", "utf-8", (err, result) => {
+//       resolve(result);
+//     });
+//   });
+// }
+
+// export async function makeTestData(): Promise<TestData> {
+//   if (!templates) {
+//     templates = await loadTemplates();
+//   }
+//   const _actionRegistry: typeof actionRegistry = new Registry();
+//   (<any>_actionRegistry).map = Object.assign({}, (<any>actionRegistry).map);
+//   const _viewRegistry: typeof actionRegistry = new Registry();
+//   (<any>_viewRegistry).map = Object.assign({}, (<any>actionRegistry).map);
+
+//   return {
+//     menuInfo: makeMenuInfo(),
+//     actions: makeActionData(),
+//     actionRegistry: _actionRegistry,
+//     viewRegistry: _viewRegistry,
+//     templates
+//   };
+// }

web/static/tests/helpers/test_env.ts

@@ -1,13 +1,17 @@
+import { readFileSync } from "fs";
 import { WEnv } from "../../src/ts/core/component";
 import { QWeb } from "../../src/ts/core/qweb_vdom";
 import { Registry } from "../../src/ts/core/registry";
 import { idGenerator } from "../../src/ts/core/utils";
-import { Env, makeEnv } from "../../src/ts/env";
-import { IRouter } from "../../src/ts/services/router";
-import { MenuInfo, Store } from "../../src/ts/store/store";
+import { Env, InitData, linkStoreToEnv, makeEnv } from "../../src/ts/env";
+import {
+  actionRegistry as AR,
+  viewRegistry as VR
+} from "../../src/ts/registries";
+import { Store } from "../../src/ts/store/store";
 import { MockRouter } from "./mock_router";
 import { MockServer } from "./mock_server";
-import { TestData } from "./test_data";
+import { makeTestData, TestData } from "./test_data";
 
 //------------------------------------------------------------------------------
 // Types
@@ -17,11 +21,16 @@ export interface TestEnv extends Env {
   store: Store;
 }
 
-export interface TestInfo extends Partial<TestData> {
+export interface TestInfo extends Partial<InitData>, Partial<TestData> {
   mockRPC?(this: MockServer, route: string, params: any): Promise<any>;
-  router?: IRouter;
 }
 
+//------------------------------------------------------------------------------
+// Code
+//------------------------------------------------------------------------------
+
+const TEMPLATES = readFileSync("web/static/src/xml/templates.xml", "utf-8");
+
 export function makeTestWEnv(): WEnv {
   return {
     qweb: new QWeb(),
@@ -29,44 +38,50 @@ export function makeTestWEnv(): WEnv {
   };
 }
 
-//------------------------------------------------------------------------------
-// Code
-//------------------------------------------------------------------------------
-
 export function makeTestEnv(info: TestInfo = {}): TestEnv {
-  const templates = info.templates || "";
-  const menuInfo: MenuInfo = info.menuInfo || {
-    menus: {},
-    actionMap: {},
-    roots: []
-  };
-  const actionRegistry = info.actionRegistry || new Registry();
-  const viewRegistry = info.viewRegistry || new Registry();
-  const actions = info.actions || [];
+  const templates = info.templates || TEMPLATES;
+  const testData: TestData = makeTestData();
+  if (info.menuInfo) {
+    testData.menuInfo = info.menuInfo;
+  }
+  if (info.actions) {
+    testData.actions = info.actions;
+  }
 
-  const data: TestData = {
-    menuInfo,
-    actions,
+  const actionRegistry = info.actionRegistry || cloneRegistry(AR);
+  const viewRegistry = info.viewRegistry || cloneRegistry(VR);
+
+  let rpc = info.services && info.services.rpc;
+  if (!rpc) {
+    const mockServer = new MockServer(testData);
+    rpc = function(route: string, params: any): Promise<any> {
+      if (info.mockRPC) {
+        return info.mockRPC.call(mockServer, route, params);
+      }
+      return mockServer.rpc(route, params);
+    };
+  }
+
+  const router = (info.services && info.services.router) || new MockRouter();
+  const initData: InitData = {
+    services: {
+      rpc,
+      router
+    },
     actionRegistry,
     viewRegistry,
     templates
   };
 
-  const mockServer = new MockServer(data);
-
-  function rpc(route: string, params: any): Promise<any> {
-    if (info.mockRPC) {
-      return info.mockRPC.call(mockServer, route, params);
-    }
-    return mockServer.rpc(route, params);
-  }
-  const services = {
-    rpc,
-    router: info.router || new MockRouter()
-  };
-
-  const store = new Store(services, menuInfo, actionRegistry, viewRegistry);
-  const env = makeEnv(store, templates);
+  const env = makeEnv(initData);
+  const store = new Store(env, testData.menuInfo);
+  linkStoreToEnv(env, store);
   const testEnv = Object.assign({ store }, env);
   return testEnv;
 }
+
+function cloneRegistry<T>(registry: Registry<T>): Registry<T> {
+  const clone: Registry<T> = new Registry();
+  (<any>clone).map = Object.assign({}, (<any>registry).map);
+  return clone;
+}