From 8d95f46fce8d129c530dd6dc8cecae6af528622c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 14 Mar 2019 11:50:39 +0100
Subject: [PATCH] move test helpers from demo app to tests/

---
 demo/static/tests/helpers/index.ts                    | 11 +++--------
 tests/component.test.ts                               |  2 +-
 .../tests/helpers/test_utils.ts => tests/helpers.ts   |  9 +++++++++
 tests/qweb_vdom.test.ts                               |  3 ++-
 tsconfig.json                                         |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)
 rename demo/static/tests/helpers/test_utils.ts => tests/helpers.ts (82%)

diff --git a/demo/static/tests/helpers/index.ts b/demo/static/tests/helpers/index.ts
index 0117aa96..807028c1 100644
--- a/demo/static/tests/helpers/index.ts
+++ b/demo/static/tests/helpers/index.ts
@@ -1,11 +1,6 @@
 export { MockRouter } from "./mock_router";
 export { MockServer } from "./mock_server";
 export { makeMenuInfo, makeTestData, TestData } from "./test_data";
-export { makeTestEnv, makeTestWEnv, TestEnv, TestInfo } from "./test_env";
-export {
-  makeDeferred,
-  makeTestFixture,
-  nextMicroTick,
-  nextTick,
-  normalize
-} from "./test_utils";
+export { makeTestEnv, TestEnv, TestInfo } from "./test_env";
+
+export * from "../../../../tests/helpers";
diff --git a/tests/component.test.ts b/tests/component.test.ts
index 1c1a3cd4..acfdd346 100644
--- a/tests/component.test.ts
+++ b/tests/component.test.ts
@@ -6,7 +6,7 @@ import {
   nextMicroTick,
   nextTick,
   normalize
-} from "../demo/static/tests/helpers";
+} from "./helpers";
 
 //------------------------------------------------------------------------------
 // Setup and helpers
diff --git a/demo/static/tests/helpers/test_utils.ts b/tests/helpers.ts
similarity index 82%
rename from demo/static/tests/helpers/test_utils.ts
rename to tests/helpers.ts
index b5c0f278..9d4c5188 100644
--- a/demo/static/tests/helpers/test_utils.ts
+++ b/tests/helpers.ts
@@ -1,3 +1,6 @@
+import { WEnv } from "../src/component";
+import { QWeb } from "../src/qweb_vdom";
+
 export function nextMicroTick(): Promise<void> {
   return Promise.resolve();
 }
@@ -31,3 +34,9 @@ export function makeDeferred(): Deferred {
   (<Deferred>def).reject = reject;
   return <Deferred>def;
 }
+
+export function makeTestWEnv(): WEnv {
+  return {
+    qweb: new QWeb()
+  };
+}
diff --git a/tests/qweb_vdom.test.ts b/tests/qweb_vdom.test.ts
index 2dda5425..ba8c707a 100644
--- a/tests/qweb_vdom.test.ts
+++ b/tests/qweb_vdom.test.ts
@@ -2,7 +2,8 @@ import sdAttributes from "../libs/snabbdom/src/modules/attributes";
 import sdListeners from "../libs/snabbdom/src/modules/eventlisteners";
 import { init } from "../libs/snabbdom/src/snabbdom";
 import { EvalContext, QWeb } from "../src/qweb_vdom";
-import { normalize } from "../demo/static/tests/helpers";
+import { normalize } from "./helpers";
+
 //------------------------------------------------------------------------------
 // Setup and helpers
 //------------------------------------------------------------------------------
diff --git a/tsconfig.json b/tsconfig.json
index 0853593e..34944047 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,5 +17,5 @@
     "strictPropertyInitialization": true,
     "strictNullChecks": true
   },
-  "include": ["web/static/**/*.ts"]
+  "include": ["demo/static/**/*.ts", "src/*.ts"]
 }