Stage main2

.gitignore

@@ -21,3 +21,4 @@ coverage/
 *.vscode
 *.rdb
 package-lock.json
+CONFIG_FILE.json

__test__/backend.test.js

@@ -14,9 +14,20 @@ import {
   UserOrganization
 } from "../src/server/models/";
 import { resolvers as campaignResolvers } from "../src/server/api/campaign";
-import { getContext, setupTest, cleanupTest } from "./test_helpers";
+import {
+  setupTest,
+  cleanupTest,
+  getContext,
+  createUser as helperCreateUser,
+  createTexter as helperCreateTexter,
+  createOrganization as helperCreateOrganization,
+  createInvite as helperCreateInvite,
+  runGql
+} from "./test_helpers";
 import { makeExecutableSchema } from "graphql-tools";
 
+import { editUserMutation } from "../src/containers/UserEdit.jsx";
+
 const mySchema = makeExecutableSchema({
   typeDefs: schema,
   resolvers,
@@ -697,3 +708,80 @@ describe("Campaign", () => {
     });
   });
 });
+
+describe.only("editUser mutation", () => {
+  let testAdminUser;
+  let testTexter;
+  let testOrganization;
+  let organizationId;
+  let variables;
+
+  beforeEach(async () => {
+    await setupTest();
+    testAdminUser = await helperCreateUser();
+    testOrganization = await helperCreateOrganization(
+      testAdminUser,
+      await helperCreateInvite()
+    );
+    organizationId = testOrganization.data.createOrganization.id;
+    testTexter = await helperCreateTexter(testOrganization);
+
+    variables = {
+      organizationId,
+      userId: testTexter.id,
+      userData: null
+    };
+  }, global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
+
+  afterEach(async () => {
+    await cleanupTest();
+    if (r.redis) r.redis.flushdb();
+  }, global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
+
+  it("returns the user if it is called with a userId by no userData", async () => {
+    const result = await runGql(editUserMutation, variables, testAdminUser);
+    expect(result).toEqual({
+      data: {
+        editUser: {
+          id: "2",
+          firstName: "TestTexterFirst",
+          lastName: "TestTexterLast",
+          cell: "555-555-6666",
+          email: "testtexter@example.com"
+        }
+      }
+    });
+  });
+
+  it("updates the user if it is called with a userId and userData", async () => {
+    const userData = {
+      firstName: "Jerry",
+      lastName: "Garcia",
+      email: "jerry@heaven.org",
+      cell: "4151111111"
+    };
+
+    variables.userData = userData;
+
+    // the mutation returns the right thing
+    const result = await runGql(editUserMutation, variables, testAdminUser);
+    expect(result).toEqual({
+      data: {
+        editUser: {
+          ...userData,
+          id: testTexter.id.toString()
+        }
+      }
+    });
+
+    // it gets updated in the database
+    const updatedUser = await r.knex("user").where("id", testTexter.id);
+    expect(updatedUser[0]).toMatchObject({
+      first_name: userData.firstName,
+      last_name: userData.lastName,
+      email: userData.email,
+      cell: userData.cell,
+      id: testTexter.id
+    });
+  });
+});

__test__/lib.test.js

@@ -1,6 +1,7 @@
 import { resolvers } from "../src/server/api/schema";
 import { schema } from "../src/api/schema";
 import twilio from "../src/server/api/lib/twilio";
+import { getConfig, hasConfig } from "../src/server/api/lib/config";
 import { makeExecutableSchema } from "graphql-tools";
 
 const mySchema = makeExecutableSchema({
@@ -35,3 +36,27 @@ it("should parse a message with a media url", () => {
 
   expect(twilio.parseMessageText({ text: undefined }).body).toBe("");
 });
+
+describe("getConfig/hasConfig", () => {
+  // note this is only testing global.* for set vars
+  // but implicitly it's testing CONFIG_FILE.json for unset vars, at least
+  it("should return getConfig for set var", () => {
+    expect(getConfig("TEST_ENVIRONMENT")).toBe("1");
+  });
+
+  it("should return getConfig for unset var", () => {
+    expect(getConfig("XXXTEST_ENVIRONMENT")).toBe(undefined);
+  });
+
+  it("should return false for hasConfig for unset var", () => {
+    expect(hasConfig("XXXTEST_ENVIRONMENT")).toBe(false);
+  });
+
+  it("should return false for hasConfig for blank set var", () => {
+    expect(hasConfig("TWILIO_API_KEY")).toBe(false);
+  });
+
+  it("should return true for hasConfig for set var", () => {
+    expect(hasConfig("TEST_ENVIRONMENT")).toBe(true);
+  });
+});

__test__/lib/color-contrast-helper.test.js

@@ -0,0 +1,23 @@
+import { setContrastingColor } from "../../src/lib/color-contrast-helper";
+
+import theme from "../../src/styles/theme";
+
+describe("test setContrastingColor", () => {
+  it("returns darkGray when a light color is passed in", () => {
+    expect(setContrastingColor("#fff")).toEqual(theme.colors.darkGray);
+  });
+
+  it("returns white when a dark color is passed in", () => {
+    expect(setContrastingColor("#000")).toEqual(theme.colors.white);
+  });
+
+  it("returns darkGray when a color is passed in with an opacity of less than .4", () => {
+    expect(setContrastingColor("rgba(0, 0, 0, .39)")).toEqual(
+      theme.colors.darkGray
+    );
+  });
+
+  it("returns darkGray when an invalid color is passed in", () => {
+    expect(setContrastingColor("incorrect")).toEqual(theme.colors.darkGray);
+  });
+});

__test__/server/api/campaign.test.js

@@ -808,7 +808,6 @@ describe("Bulk Send", async () => {
 
     // send some texts
     const bulkSendResult = await bulkSendMessages(assignmentId, testTexterUser);
-    console.log(bulkSendResult);
     resultTestFunction(bulkSendResult);
 
     // TEXTER 1 (95 needsMessage, 5 needsResponse)

__test__/server/api/lib/twilio.test.js

@@ -1,6 +1,8 @@
 /* eslint-disable no-unused-expressions, consistent-return */
 import { r, Message } from "../../../../src/server/models/";
 import { postMessageSend } from "../../../../src/server/api/lib/twilio";
+import twilio from "../../../../src/server/api/lib/twilio";
+import { getLastMessage } from "../../../../src/server/api/lib/message-sending";
 
 import {
   setupTest,
@@ -154,6 +156,43 @@ it("postMessageSend error from twilio response should fail immediately", async (
   }
 });
 
+it("handleIncomingMessage should save message and update contact state", async () => {
+  const message = await Message.save({
+    assignment_id: assignmentId,
+    campaign_contact_id: dbCampaignContact.id,
+    contact_number: dbCampaignContact.cell,
+    messageservice_sid: "fakeSid_MK123",
+    is_from_contact: false,
+    send_status: "SENT",
+    service: "twilio",
+    text: "some message",
+    user_id: testTexterUser.id,
+    service_id: "123123123"
+  });
+  const lastMessage = await getLastMessage({
+    contactNumber: dbCampaignContact.cell,
+    service: "twilio",
+    messageServiceSid: "fakeSid_MK123"
+  });
+
+  expect(lastMessage.campaign_contact_id).toEqual(dbCampaignContact.id);
+  await twilio.handleIncomingMessage({
+    From: dbCampaignContact.cell,
+    To: "+16465559999",
+    MessageSid: "TestMessageId",
+    Body: "Fake reply",
+    MessagingServiceSid: "fakeSid_MK123"
+  });
+  const [reply] = await r.knex("message").where("service_id", "TestMessageId");
+  dbCampaignContact = await getCampaignContact(dbCampaignContact.id);
+  expect(reply.send_status).toEqual("DELIVERED");
+  expect(reply.campaign_contact_id).toEqual(dbCampaignContact.id);
+  expect(reply.contact_number).toEqual(dbCampaignContact.cell);
+  expect(reply.user_number).toEqual("+16465559999");
+  expect(reply.messageservice_sid).toEqual("fakeSid_MK123");
+  expect(dbCampaignContact.message_status).toEqual("needsResponse");
+});
+
 // FUTURE
 // * handleDeliveryReport (error and non-error)
 // * parseMessageText