Merge pull request #2120 from MoveOnOrg/stage-main-12

stage-main 12.0 release candidate

Author: crayolakat

.env.example

@@ -32,10 +32,8 @@ NEXMO_API_KEY=
 NEXMO_API_SECRET=
 TWILIO_ACCOUNT_SID=
 TWILIO_AUTH_TOKEN=
-TWILIO_MESSAGE_CALLBACK_URL=
 TWILIO_MESSAGE_SERVICE_SID=
 EXPERIMENTAL_TWILIO_PER_CAMPAIGN_MESSAGING_SERVICE=false
-TWILIO_STATUS_CALLBACK_URL=
 TWILIO_SQS_QUEUE_URL=
 PHONE_NUMBER_COUNTRY=US
 ROLLBAR_CLIENT_TOKEN=

README.md

@@ -7,7 +7,7 @@ Spoke is an open source text-distribution tool for organizations to mobilize sup
 
 Spoke was created by Saikat Chakrabarti and Sheena Pakanati, and is now maintained by MoveOn.org.
 
-The latest version is [11.1](https://github.com/MoveOnOrg/Spoke/tree/v11.1) (see [release notes](https://github.com/MoveOnOrg/Spoke/blob/main/docs/RELEASE_NOTES.md#v111))
+The latest version is [12.0](https://github.com/MoveOnOrg/Spoke/tree/v12.0) (see [release notes](https://github.com/MoveOnOrg/Spoke/blob/main/docs/RELEASE_NOTES.md#v120))
 
 
 ## Setting up Spoke
@@ -24,7 +24,7 @@ Want to know more?
 ### Quick Start with Heroku
 This version of Spoke suitable for testing and, potentially, for small campaigns. This won't cost any money and will not support production(aka large-scale) usage. It's a great way to practice deploying Spoke or see it in action.  
 
-<a href="https://heroku.com/deploy?template=https://github.com/MoveOnOrg/Spoke/tree/v11.1">
+<a href="https://heroku.com/deploy?template=https://github.com/MoveOnOrg/Spoke/tree/v12.0">
 
   <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
 </a>

__test__/TexterStats.test.js

@@ -65,7 +65,7 @@ describe("TexterStats (Non-dynamic campaign)", () => {
       <TexterStats campaign={campaign} organizationId="1" />
     );
     expect(stats.text()).toEqual(
-      "Test Tester <Link />19%<Link />  |  <Link />  |  <Link />Someone Else (Suspended) <Link />99%<Link />  |  <Link />  |  <Link />"
+      "Test Tester 19%Sweep conversations  |  View conversations in Message Review  |  Unmessaged: 193Someone Else (Suspended) 99%Sweep conversations  |  View conversations in Message Review  |  Unmessaged: 4"
     );
   });
 
@@ -85,7 +85,7 @@ describe("TexterStats (Dynamic campaign)", () => {
   it("contains the right text", () => {
     const stats = shallow(<TexterStats campaign={campaignDynamic} />);
     expect(stats.text()).toEqual(
-      "Test Tester <Link />45 initial messages sent. <Link />  |  <Link />  |  <Link />Someone Else (Suspended) <Link />541 initial messages sent. <Link />  |  <Link />  |  <Link />"
+      "Test Tester 45 initial messages sent. Sweep conversations  |  View conversations in Message Review  |  Unmessaged: 193Someone Else (Suspended) 541 initial messages sent. Sweep conversations  |  View conversations in Message Review  |  Unmessaged: 4"
     );
   });
 });

__test__/TopNav.test.js

@@ -2,29 +2,37 @@ import React from "react";
 import { shallow } from "enzyme";
 import { StyleSheetTestUtils } from "aphrodite";
 import IconButton from "@material-ui/core/IconButton";
-import TopNav from "../src/components/TopNav";
+import { TopNavBase as TopNav } from "../src/components/TopNav";
+import UserMenu from "../src/containers/UserMenu";
+import { muiTheme } from "./test_helpers";
 
 describe("TopNav", () => {
   it("can render only title", () => {
-    const nav = shallow(<TopNav title="Welcome to my website" />);
-    expect(nav.text()).toEqual(
-      "Welcome to my website<Apollo(withRouter(UserMenu)) />"
+    const nav = shallow(
+      <TopNav muiTheme={muiTheme} title="Welcome to my website" />
     );
+    expect(nav.text()).toContain("Welcome to my website");
     expect(nav.find("Link").length).toBe(0);
   });
 
   it("can render Link to go back", () => {
     const link = shallow(
-      <TopNav title="Welcome" backToURL="/admin/1/campaigns" />
+      <TopNav
+        title="Welcome"
+        muiTheme={muiTheme}
+        backToURL="/admin/1/campaigns"
+      />
     ).find("Link");
     expect(link.length).toBe(1);
     expect(link.prop("to")).toBe("/admin/1/campaigns");
     expect(link.find(IconButton).length).toBe(1);
   });
 
   it("renders UserMenu", () => {
-    const nav = shallow(<TopNav title="Welcome to my website" />);
-    expect(nav.find("Apollo(withRouter(UserMenu))").length).toBe(1);
+    const nav = shallow(
+      <TopNav muiTheme={muiTheme} title="Welcome to my website" />
+    );
+    expect(nav.find(UserMenu).length).toBe(1);
   });
 });
 

__test__/components/AssignmentSummary.test.js

@@ -7,11 +7,12 @@ import { StyleSheetTestUtils } from "aphrodite";
 import each from "jest-each";
 import { ApolloProvider } from "react-apollo";
 import ApolloClientSingleton from "../../src/network/apollo-client-singleton";
-import { AssignmentSummary } from "../../src/components/AssignmentSummary";
+import { AssignmentSummaryBase as AssignmentSummary } from "../../src/components/AssignmentSummary";
 import Badge from "@material-ui/core/Badge";
 import Button from "@material-ui/core/Button";
 import CardContent from "@material-ui/core/CardContent";
 import CardHeader from "@material-ui/core/CardHeader";
+import { muiTheme } from "../test_helpers";
 
 function getAssignment({ isDynamic = false, counts = {} }) {
   return {
@@ -39,6 +40,7 @@ describe("AssignmentSummary text", function t() {
   beforeEach(() => {
     this.summary = mount(
       <AssignmentSummary
+        muiTheme={muiTheme}
         assignment={getAssignment({
           counts: {
             unmessagedCount: 1,
@@ -89,6 +91,7 @@ describe("AssignmentSummary actions inUSA and NOT AllowSendAll", () => {
     return mount(
       <ApolloProvider client={ApolloClientSingleton}>
         <AssignmentSummary
+          muiTheme={muiTheme}
           assignment={getAssignment({
             isDynamic,
             counts: {
@@ -193,6 +196,7 @@ describe("AssignmentSummary NOT inUSA and AllowSendAll", () => {
     window.ALLOW_SEND_ALL = true;
     return mount(
       <AssignmentSummary
+        muiTheme={muiTheme}
         assignment={getAssignment({
           isDynamic,
           counts: {
@@ -231,6 +235,7 @@ describe("AssignmentSummary NOT inUSA and AllowSendAll", () => {
 it('renders "Send later" when there is a badTimezoneCount', () => {
   const actions = mount(
     <AssignmentSummary
+      muiTheme={muiTheme}
       assignment={getAssignment({
         counts: {
           unmessagedCount: 0,
@@ -276,6 +281,7 @@ describe("contacts filters", () => {
     AssignmentSummary.prototype.renderBadgedButton = mockRender;
     mount(
       <AssignmentSummary
+        muiTheme={muiTheme}
         assignment={getAssignment({
           counts: {
             unmessagedCount: 1,
@@ -309,6 +315,7 @@ describe("contacts filters", () => {
     AssignmentSummary.prototype.renderBadgedButton = mockRender;
     mount(
       <AssignmentSummary
+        muiTheme={muiTheme}
         assignment={getAssignment({
           counts: {
             unmessagedCount: 1,

__test__/components/CampaignCannedResponseForm.test.js

@@ -3,9 +3,10 @@
  */
 import React from "react";
 import { mount } from "enzyme";
-import AutoComplete from "@material-ui/lab/Autocomplete";
 import CampaignCannedResponseForm from "../../src/components/CampaignCannedResponseForm";
 import { StyleSheetTestUtils } from "aphrodite";
+import ThemeContext from "../../src/containers/context/ThemeContext";
+import { muiTheme } from "../test_helpers";
 
 describe("CampaignCannedResponseForm component", () => {
   // given
@@ -15,7 +16,12 @@ describe("CampaignCannedResponseForm component", () => {
       id: 1,
       title: "Response1",
       text: "Response1 desc",
-      tagIds: [1, 2]
+      tagIds: [1, 2],
+      answerActions: "fake-action",
+      answerActionsData: JSON.stringify({
+        label: "Test Property",
+        value: { property: "test" }
+      })
     },
     tags: [
       {
@@ -28,7 +34,16 @@ describe("CampaignCannedResponseForm component", () => {
         name: "Tag2",
         description: "Tag2Desc"
       }
-    ]
+    ],
+    availableActions: [
+      {
+        name: "fake-action",
+        clientChoiceData: [
+          { name: "Test Property", details: { property: "test" } }
+        ]
+      }
+    ],
+    muiTheme: muiTheme
   };
 
   const props2 = {
@@ -45,13 +60,18 @@ describe("CampaignCannedResponseForm component", () => {
         name: "Tag2",
         description: "Tag2Desc"
       }
-    ]
+    ],
+    muiTheme: muiTheme
   };
 
   // when
   test("Renders form with correct fields and label for editing", () => {
     StyleSheetTestUtils.suppressStyleInjection();
-    const wrapper = mount(<CampaignCannedResponseForm {...props1} />);
+    const wrapper = mount(
+      <ThemeContext.Provider value={{ muiTheme }}>
+        <CampaignCannedResponseForm {...props1} />
+      </ThemeContext.Provider>
+    );
     expect(
       wrapper
         .find({ label: "Title" })
@@ -64,7 +84,12 @@ describe("CampaignCannedResponseForm component", () => {
         .find("button")
         .text()
     ).toBe("Edit Response");
-    expect(wrapper.find(AutoComplete).prop("value")).toEqual([
+    expect(
+      wrapper
+        .find({ "data-test": "autocompleteTags" })
+        .first()
+        .prop("value")
+    ).toEqual([
       {
         id: 1,
         name: "Tag1",
@@ -76,11 +101,27 @@ describe("CampaignCannedResponseForm component", () => {
         description: "Tag2Desc"
       }
     ]);
+    expect(
+      wrapper
+        .find({ "data-test": "actionSelect" })
+        .find("input")
+        .prop("value")
+    ).toBe(props1.defaultValue.answerActions);
+    expect(
+      wrapper
+        .find({ "data-test": "actionDataAutoComplete" })
+        .find("input")
+        .prop("value")
+    ).toEqual(JSON.parse(props1.defaultValue.answerActionsData).label);
   });
 
   test("Renders form with correct fields and label for adding", () => {
     StyleSheetTestUtils.suppressStyleInjection();
-    const wrapper = mount(<CampaignCannedResponseForm {...props2} />);
+    const wrapper = mount(
+      <ThemeContext.Provider value={{ muiTheme }}>
+        <CampaignCannedResponseForm {...props2} />
+      </ThemeContext.Provider>
+    );
     expect(
       wrapper
         .find({ label: "Title" })

__test__/components/CampaignCannedResponsesForm.test.js

@@ -7,6 +7,8 @@ import { CampaignCannedResponsesForm } from "../../src/components/CampaignCanned
 import { StyleSheetTestUtils } from "aphrodite";
 import IconButton from "@material-ui/core/IconButton";
 import ListItemText from "@material-ui/core/ListItemText";
+import ThemeContext from "../../src/containers/context/ThemeContext";
+import { muiTheme } from "../test_helpers";
 
 describe("CampaignCannedResponsesForm component", () => {
   // given
@@ -16,7 +18,9 @@ describe("CampaignCannedResponsesForm component", () => {
         id: 1,
         title: "Response1",
         text: "Response1 desc",
-        tagIds: [1, 2]
+        tagIds: [1, 2],
+        answerActions: "fake-action",
+        answerActionsData: JSON.stringify({ label: "Test Property" })
       }
     ]
   };
@@ -38,16 +42,32 @@ describe("CampaignCannedResponsesForm component", () => {
     }
   };
 
+  const availableActions = [
+    {
+      name: "fake-action",
+      displayName: "Fake Action"
+    }
+  ];
+
   StyleSheetTestUtils.suppressStyleInjection();
   const wrapper = mount(
-    <CampaignCannedResponsesForm formValues={formValues} data={data} />
+    <ThemeContext.Provider value={{ muiTheme }}>
+      <CampaignCannedResponsesForm
+        formValues={formValues}
+        data={data}
+        availableActions={availableActions}
+        muiTheme={muiTheme}
+      />
+    </ThemeContext.Provider>
   );
 
   // when
 
   test("Renders canned responses with correct text", () => {
     expect(wrapper.find(ListItemText).text()).toContain("Response1");
     expect(wrapper.find(ListItemText).text()).toContain("Response1 desc");
+    expect(wrapper.find(ListItemText).text()).toContain("Fake Action");
+    expect(wrapper.find(ListItemText).text()).toContain("Test Property");
     expect(wrapper.find("TagChips").prop("tagIds")).toEqual([1, 2]);
     expect(wrapper.find("TagChips").prop("tags")).toEqual([
       {
@@ -76,7 +96,9 @@ describe("CampaignCannedResponsesForm component", () => {
       id: 1,
       title: "Response1",
       text: "Response1 desc",
-      tagIds: [1, 2]
+      tagIds: [1, 2],
+      answerActions: "fake-action",
+      answerActionsData: JSON.stringify({ label: "Test Property" })
     });
     expect(cannedResponseForm.prop("formButtonText")).toBe("Edit Response");
   });