Merge pull request #324 from billba/master

Shell tests
microsoft · Feb 3, 2017 · a3157bf · a3157bf
2 parents 4fd8d96 + 7e67886
commit a3157bf
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 4 deletions.
diff --git a/src/Chat.tsx b/src/Chat.tsx
@@ -54,7 +54,7 @@ export class Chat extends React.Component<ChatProps, {}> {
             this.store.dispatch<FormatAction>({ type: 'Set_Format_Options', options: props.formatOptions });
 
         if (props.sendTyping)
-            this.store.dispatch<ShellAction>({ type: 'Set_Send_Typing' });        
+            this.store.dispatch<ShellAction>({ type: 'Set_Send_Typing', sendTyping: props.sendTyping });        
     }
 
     private handleIncomingActivity(activity: Activity) {

diff --git a/src/Store.ts b/src/Store.ts
@@ -16,7 +16,8 @@ export type ShellAction = {
     type: 'Update_Input',
     input: string
 } | {
-    type: 'Set_Send_Typing'
+    type: 'Set_Send_Typing',
+    sendTyping: boolean
 } | {
     type: 'Send_Message',
     activity: Activity
@@ -45,7 +46,7 @@ export const shell: Reducer<ShellState> = (
         case 'Set_Send_Typing':
             return {
                 ... state,
-                sendTyping: true
+                sendTyping: action.sendTyping
             };
 
         default:

diff --git a/test/history.js b/test/history.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const expect = chai.expect;
-const history = require('../built/Store.js').history;
+const { history } = require('../built/Store.js');
 
 chai.use(require('chai-subset'));
 

diff --git a/test/shell.js b/test/shell.js
@@ -0,0 +1,45 @@
+"use strict";
+
+const chai = require('chai');
+const expect = chai.expect;
+const { shell } = require('../built/Store.js');
+
+chai.use(require('chai-subset'));
+
+describe("shell", () => {
+    it("should start with an empty input", () => {
+        expect(shell(undefined, { type: undefined })).to.containSubset({
+            input: ''
+        });
+    });
+    it("should update when it's intitially updated", () => {
+        expect(shell(undefined, { type: 'Update_Input', input: 'foo' })).to.containSubset({
+            input: 'foo'
+        });
+    });
+    it("should update when it's subsequently updated", () => {
+        expect(shell({ input: 'foo' }, { type: 'Update_Input', input: 'bar' })).to.containSubset({
+            input: 'bar'
+        });
+    });
+    it("should clear when a message is sent", () => {
+        expect(shell({ input: 'foo' }, { type: 'Send_Message' })).to.containSubset({
+            input: ''
+        });
+    });
+    it("should default to not sending typing", () => {
+        expect(shell(undefined, { type: undefined })).to.containSubset({
+            sendTyping: false
+        });
+    });
+    it("should update sendTyping to true", () => {
+        expect(shell(undefined, { type: 'Set_Send_Typing', sendTyping: true })).to.containSubset({
+            sendTyping: true
+        });
+    });
+    it("should update sendTyping to false", () => {
+        expect(shell(undefined, { type: 'Set_Send_Typing', sendTyping: false })).to.containSubset({
+            sendTyping: false
+        });
+    });
+});