From df664bdb73b34dbc995c4c378011ea492da8693c Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 7 Sep 2018 00:51:23 +0200
Subject: [PATCH] Fix types and tests

---
 src/core/client/auth/test/navigation.spec.tsx | 39 ++++---------------
 .../framework/lib/bootstrap/createContext.tsx |  3 ++
 src/core/client/stream/test/create.tsx        |  2 +-
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/core/client/auth/test/navigation.spec.tsx b/src/core/client/auth/test/navigation.spec.tsx
index 858719901..c9c224d21 100644
--- a/src/core/client/auth/test/navigation.spec.tsx
+++ b/src/core/client/auth/test/navigation.spec.tsx
@@ -1,39 +1,16 @@
-// Enable after this is solved: https://github.com/projectfluent/fluent.js/issues/280
+import { ReactTestRenderer } from "react-test-renderer";
 
-import React from "react";
-import TestRenderer, { ReactTestRenderer } from "react-test-renderer";
-import { RecordProxy } from "relay-runtime";
-
-import AppContainer from "talk-auth/containers/AppContainer";
-import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
-import { PostMessageService } from "talk-framework/lib/postMessage";
-import { RestClient } from "talk-framework/lib/rest";
-import { createPromisifiedStorage } from "talk-framework/lib/storage";
-
-import createEnvironment from "./createEnvironment";
-import createFluentBundle from "./createFluentBundle";
+import create from "./create";
 
 function createTestRenderer(initialView: string): ReactTestRenderer {
-  const environment = createEnvironment({
-    initLocalState: (localRecord: RecordProxy) => {
-      localRecord.setValue(initialView, "view");
+  const { testRenderer } = create({
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    initLocalState: localRecord => {
+      localRecord.setValue("SIGN_IN", "view");
     },
   });
-
-  const context: TalkContext = {
-    relayEnvironment: environment,
-    localeBundles: [createFluentBundle()],
-    localStorage: createPromisifiedStorage(),
-    sessionStorage: createPromisifiedStorage(),
-    rest: new RestClient("http://localhost/api"),
-    postMessage: new PostMessageService(),
-    browserInfo: { ios: false },
-  };
-  return TestRenderer.create(
-    <TalkContextProvider value={context}>
-      <AppContainer />
-    </TalkContextProvider>
-  );
+  return testRenderer;
 }
 
 it("renders sign in form", async () => {
diff --git a/src/core/client/framework/lib/bootstrap/createContext.tsx b/src/core/client/framework/lib/bootstrap/createContext.tsx
index 696ab8262..839cee453 100644
--- a/src/core/client/framework/lib/bootstrap/createContext.tsx
+++ b/src/core/client/framework/lib/bootstrap/createContext.tsx
@@ -5,6 +5,8 @@ import { Child as PymChild } from "pym.js";
 import React from "react";
 import { Formatter } from "react-timeago";
 import { Environment, Network, RecordSource, Store } from "relay-runtime";
+import uuid from "uuid/v4";
+
 import { getBrowserInfo } from "talk-framework/lib/browserInfo";
 import { LOCAL_ID } from "talk-framework/lib/relay";
 import {
@@ -135,6 +137,7 @@ export default async function createContext({
       (pym && inIframe && createPymStorage(pym, "sessionStorage")) ||
       createPromisifiedStorage(createSessionStorage()),
     browserInfo: getBrowserInfo(),
+    uuidGenerator: uuid,
   };
 
   // Run custom initializations.
diff --git a/src/core/client/stream/test/create.tsx b/src/core/client/stream/test/create.tsx
index f40a52266..49d885c66 100644
--- a/src/core/client/stream/test/create.tsx
+++ b/src/core/client/stream/test/create.tsx
@@ -7,8 +7,8 @@ import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
 import { PostMessageService } from "talk-framework/lib/postMessage";
 import { RestClient } from "talk-framework/lib/rest";
 import { createPromisifiedStorage } from "talk-framework/lib/storage";
-import AppContainer from "talk-stream/containers/AppContainer";
 import { createUUIDGenerator } from "talk-framework/testHelpers";
+import AppContainer from "talk-stream/containers/AppContainer";
 
 import createEnvironment from "./createEnvironment";
 import createFluentBundle from "./createFluentBundle";