Add and refactor tests

src/core/client/framework/testHelpers/createRelayEnvironment.ts

@@ -0,0 +1,78 @@
+import { IResolvers } from "graphql-tools";
+import { createFetch } from "relay-local-schema";
+import {
+  commitLocalUpdate,
+  Environment,
+  Network,
+  RecordProxy,
+  RecordSource,
+  RecordSourceProxy,
+  Store,
+} from "relay-runtime";
+
+import {
+  createAndRetain,
+  LOCAL_ID,
+  LOCAL_TYPE,
+  wrapFetchWithLogger,
+} from "talk-framework/lib/relay";
+
+import { loadSchema } from "talk-common/graphql";
+
+export interface CreateRelayEnvironmentNetworkParams {
+  /** project name of graphql-config */
+  projectName: string;
+  /** graphql resolvers */
+  resolvers: IResolvers<any, any>;
+  /** If enabled, graphql responses will be logged to the console */
+  logNetwork?: boolean;
+}
+
+export interface CreateRelayEnvironmentParams {
+  /** If set, creates a network to a local graphql server with a local schema */
+  network?: CreateRelayEnvironmentNetworkParams;
+  /** Allows to set initial state for Local state */
+  initLocalState?: (
+    local: RecordProxy,
+    source: RecordSourceProxy,
+    environment: Environment
+  ) => void;
+  /** Use this source for creating the environment */
+  source?: RecordSource;
+}
+
+/**
+ * create Relay environment for tests environments.
+ */
+export default function createRelayEnvironment(
+  params: CreateRelayEnvironmentParams = {}
+) {
+  let network: Network = null as any;
+  if (params.network) {
+    const schema = loadSchema(
+      params.network.projectName,
+      params.network.resolvers
+    );
+    network = Network.create(
+      wrapFetchWithLogger(createFetch({ schema }), params.network.logNetwork)
+    );
+  }
+  const environment = new Environment({
+    network,
+    store: new Store(params.source || new RecordSource()),
+  });
+  commitLocalUpdate(environment, sourceProxy => {
+    const root = sourceProxy.getRoot();
+    const localRecord = createAndRetain(
+      environment,
+      sourceProxy,
+      LOCAL_ID,
+      LOCAL_TYPE
+    );
+    root.setLinkedRecord(localRecord, "local");
+    if (params.initLocalState) {
+      params.initLocalState!(localRecord, sourceProxy, environment);
+    }
+  });
+  return environment;
+}

src/core/client/framework/testHelpers/index.ts

@@ -0,0 +1,4 @@
+export {
+  default as createRelayEnvironment,
+  CreateRelayEnvironmentParams,
+} from "./createRelayEnvironment";

src/core/client/stream/mutations/SetCommentIDMutation.spec.ts

@@ -0,0 +1,54 @@
+import { Environment, RecordSource } from "relay-runtime";
+import sinon from "sinon";
+
+import { timeout } from "talk-common/utils";
+import { LOCAL_ID } from "talk-framework/lib/relay";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
+
+import { commit } from "./SetCommentIDMutation";
+
+let environment: Environment;
+const source: RecordSource = new RecordSource();
+
+beforeAll(() => {
+  environment = createRelayEnvironment({
+    source,
+  });
+});
+
+it("Sets comment id", () => {
+  const id = "comment1-id";
+  commit(environment, { id }, {} as any);
+  expect(source.get(LOCAL_ID)!.commentID).toEqual(id);
+});
+
+it("Should call setCommentID in pym", async () => {
+  const id = "comment2-id";
+  const context = {
+    pym: {
+      sendMessage: sinon
+        .mock()
+        .once()
+        .withArgs("setCommentID", id),
+    },
+  };
+  commit(environment, { id }, context as any);
+  await timeout();
+  expect(source.get(LOCAL_ID)!.commentID).toEqual(id);
+  context.pym.sendMessage.verify();
+});
+
+it("Should call setCommentID in pym with empty id", async () => {
+  const context = {
+    pym: {
+      sendMessage: sinon
+        .mock()
+        .once()
+        .withArgs("setCommentID", ""),
+    },
+  };
+  commit(environment, { id: null }, context as any);
+  await timeout();
+  expect(source.get(LOCAL_ID)!.commentID).toEqual(null);
+  context.pym.sendMessage.verify();
+});

src/core/client/stream/mutations/SetCommentIDMutation.ts

@@ -10,7 +10,7 @@ export interface SetCommentIDInput {
 
 export type SetCommentIDMutation = (input: SetCommentIDInput) => Promise<void>;
 
-async function commit(
+export async function commit(
   environment: Environment,
   input: SetCommentIDInput,
   { pym }: TalkContext

src/core/client/stream/mutations/SetNetworkStatusMutation.spec.ts

@@ -0,0 +1,26 @@
+import { Environment, RecordSource } from "relay-runtime";
+
+import { createRelayEnvironment } from "talk-framework/testHelpers";
+
+import { NETWORK_ID, NETWORK_TYPE } from "../local";
+
+import { commit } from "./SetNetworkStatusMutation";
+
+let environment: Environment;
+const source: RecordSource = new RecordSource();
+
+beforeAll(() => {
+  environment = createRelayEnvironment({
+    source,
+    initLocalState: (localRecord, sourceProxy) => {
+      const networkRecord = sourceProxy.create(NETWORK_ID, NETWORK_TYPE);
+      networkRecord.setValue(false, "isOffline");
+      localRecord.setLinkedRecord(networkRecord, "network");
+    },
+  });
+});
+
+it("Sets comment id", () => {
+  commit(environment, { isOffline: true });
+  expect(source.get(NETWORK_ID)!.isOffline).toEqual(true);
+});

src/core/client/stream/mutations/SetNetworkStatusMutation.ts

@@ -12,7 +12,10 @@ export type SetNetworkStatusMutation = (
   input: SetNetworkStatusInput
 ) => Promise<void>;
 
-async function commit(environment: Environment, input: SetNetworkStatusInput) {
+export async function commit(
+  environment: Environment,
+  input: SetNetworkStatusInput
+) {
   return commitLocalUpdate(environment, store => {
     const record = store.get(NETWORK_ID)!;
     record.setValue(input.isOffline, "isOffline");

src/core/client/stream/test/createEnvironment.ts

@@ -1,49 +0,0 @@
-import { IResolvers } from "graphql-tools";
-import { createFetch } from "relay-local-schema";
-import {
-  commitLocalUpdate,
-  Environment,
-  Network,
-  RecordProxy,
-  RecordSource,
-  Store,
-} from "relay-runtime";
-
-import { loadSchema } from "talk-common/graphql";
-import {
-  createAndRetain,
-  LOCAL_ID,
-  LOCAL_TYPE,
-  wrapFetchWithLogger,
-} from "talk-framework/lib/relay";
-
-export interface CreateEnvironmentParams {
-  /** graphql resolvers */
-  resolvers: IResolvers<any, any>;
-  /** Allows to set initial state for Local state */
-  initLocalState?: (local: RecordProxy) => void;
-  /** If enabled, graphql responses will be logged to the console */
-  logNetwork?: boolean;
-}
-
-/**
- * create Relay environment for integration tests.
- */
-export default function createEnvironment(params: CreateEnvironmentParams) {
-  const schema = loadSchema("tenant", params.resolvers);
-  const environment = new Environment({
-    network: Network.create(
-      wrapFetchWithLogger(createFetch({ schema }), params.logNetwork)
-    ),
-    store: new Store(new RecordSource()),
-  });
-  if (params.initLocalState) {
-    commitLocalUpdate(environment, s => {
-      const root = s.getRoot();
-      const localRecord = createAndRetain(environment, s, LOCAL_ID, LOCAL_TYPE);
-      root.setLinkedRecord(localRecord, "local");
-      params.initLocalState!(localRecord);
-    });
-  }
-  return environment;
-}

src/core/client/stream/test/loadMore.spec.tsx

@@ -5,9 +5,9 @@ import sinon from "sinon";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
 import { assets, comments } from "./fixtures";
 
 const connectionStub = sinon.stub().throws();
@@ -61,10 +61,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue(assetStub.id, "assetID");
   },

src/core/client/stream/test/permalinkView.spec.tsx

@@ -5,9 +5,9 @@ import sinon from "sinon";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
 import { assets, comments } from "./fixtures";
 
 const commentStub = {
@@ -44,10 +44,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue(assetStub.id, "assetID");
     localRecord.setValue(commentStub.id, "commentID");

src/core/client/stream/test/permalinkViewAssetNotFound.spec.tsx

@@ -4,10 +4,9 @@ import { RecordProxy } from "relay-runtime";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
-
 const resolvers = {
   Query: {
     comment: () => null,
@@ -15,10 +14,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue("unknown-asset-id", "assetID");
     localRecord.setValue("unknown-comment-id", "commentID");

src/core/client/stream/test/permalinkViewCommentNotFound.spec.tsx

@@ -5,9 +5,9 @@ import sinon from "sinon";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
 import { assets, comments } from "./fixtures";
 
 const commentStub = {
@@ -40,10 +40,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue(assetStub.id, "assetID");
     localRecord.setValue("unknown-comment-id", "commentID");

src/core/client/stream/test/renderReplies.spec.tsx

@@ -5,9 +5,9 @@ import sinon from "sinon";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
 import { assetWithReplies } from "./fixtures";
 
 const resolvers = {
@@ -20,10 +20,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue(assetWithReplies.id, "assetID");
   },

src/core/client/stream/test/renderStream.spec.tsx

@@ -5,9 +5,9 @@ import sinon from "sinon";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
 import { assets } from "./fixtures";
 
 const resolvers = {
@@ -20,10 +20,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue(assets[0].id, "assetID");
   },

src/core/client/stream/test/showAllReplies.spec.tsx

@@ -5,9 +5,9 @@ import sinon from "sinon";
 
 import { timeout } from "talk-common/utils";
 import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
 import AppContainer from "talk-stream/containers/AppContainer";
 
-import createEnvironment from "./createEnvironment";
 import { assets, comments } from "./fixtures";
 
 const connectionStub = sinon.stub().throws();
@@ -77,10 +77,13 @@ const resolvers = {
   },
 };
 
-const environment = createEnvironment({
-  // Set this to true, to see graphql responses.
-  logNetwork: false,
-  resolvers,
+const environment = createRelayEnvironment({
+  network: {
+    // Set this to true, to see graphql responses.
+    logNetwork: false,
+    resolvers,
+    projectName: "tenant",
+  },
   initLocalState: (localRecord: RecordProxy) => {
     localRecord.setValue(assetStub.id, "assetID");
   },