From c5b15034eb43a8e81176480ec4ae2ea57b69b2ca Mon Sep 17 00:00:00 2001
From: Sharon Kennedy <sharon@nomadiclabs.ca>
Date: Wed, 29 Apr 2020 11:31:23 -0400
Subject: [PATCH] update tests

---
 README.md                       | 8 ++++----
 __mocks__/matrix-js-sdk.js      | 2 ++
 src/components/chatbox.jsx      | 2 --
 src/components/chatbox.test.js  | 8 +++++---
 src/outputs/bookmarklet.js      | 8 ++++----
 src/outputs/bookmarklet.test.js | 7 -------
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index ce6eb42..587cfde 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Built on:
 
 ## Usage
 ```
-<script src="./chatbox.js"></script>
+<script src="https://unpkg.com/safesupport-chatbox" type="text/javascript"></script>
 <script>
   var config = {
     matrixServerUrl: 'https://matrix.rhok.space',
@@ -66,11 +66,11 @@ This chatbox is meant to be used with a bot account that handles a number of fun
 * Keeps a transcript of the conversation
 * Notifies user if there are not facilitators available
 
-The bot account is invited to the chatroom when a support request is initiated. 
+The bot account is invited to the chatroom when a support request is initiated.
 
-You can find the code for the bot at [ocrcc-bot](https://github.com/nomadic-labs/ocrcc-bot). 
+You can find the code for the bot at [ocrcc-bot](https://github.com/nomadic-labs/ocrcc-bot).
 
-## Bookmarklet 
+## Bookmarklet
 
 The bookmarklet is a special link that runs a script on any website. The user saves the link by dragging it to their bookmarks bar. Then they can click on the bookmark on any page to run the script and load the chatbox.
 
diff --git a/__mocks__/matrix-js-sdk.js b/__mocks__/matrix-js-sdk.js
index 16a0094..8f1bc35 100644
--- a/__mocks__/matrix-js-sdk.js
+++ b/__mocks__/matrix-js-sdk.js
@@ -35,6 +35,7 @@ export const mockGetRoom = jest.fn()
 export const mockDownloadKeys = jest.fn()
 export const mockSetDeviceVerified = jest.fn()
 export const mockIsCryptoEnabled = jest.fn()
+export const mockIsRoomEncrypted = jest.fn()
 export const mockCreateRoom = jest.fn().mockReturnValue({ room_id: 'room_id_1234' })
 export const mockSetPowerLevel = jest.fn()
 export const mockSendTextMessage = jest.fn(() => {
@@ -61,6 +62,7 @@ export const mockClient = {
   setDeviceVerified: mockSetDeviceVerified,
   setDeviceKnown: mockSetDeviceKnown,
   isCryptoEnabled: mockIsCryptoEnabled,
+  isRoomEncrypted: mockIsRoomEncrypted,
   createRoom: mockCreateRoom,
   setPowerLevel: mockSetPowerLevel,
   sendTextMessage: mockSendTextMessage,
diff --git a/src/components/chatbox.jsx b/src/components/chatbox.jsx
index 39fb79a..f915966 100644
--- a/src/components/chatbox.jsx
+++ b/src/components/chatbox.jsx
@@ -75,12 +75,10 @@ class ChatBox extends React.Component {
     let isMobile = false;
 
     if ( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
-      console.log('navigator.userAgent', navigator.userAgent)
       isMobile = true;
     }
 
     if (screen.width < 767) {
-      console.log('screen.width', screen.width)
       isMobile = true;
     }
 
diff --git a/src/components/chatbox.test.js b/src/components/chatbox.test.js
index 1d90028..5fd9d8b 100644
--- a/src/components/chatbox.test.js
+++ b/src/components/chatbox.test.js
@@ -14,7 +14,9 @@ import {
   mockClearStores,
   mockOn,
   mockOnce,
-  mockSendTextMessage
+  mockSendTextMessage,
+  mockIsCryptoEnabled,
+  mockIsRoomEncrypted,
 } from "matrix-js-sdk";
 import { mount, shallow } from 'enzyme';
 import { createWaitForElement } from 'enzyme-wait';
@@ -53,6 +55,8 @@ describe('Chatbox', () => {
     mockOnce.mockClear()
     mockOn.mockClear()
     mockSendTextMessage.mockClear()
+    mockIsCryptoEnabled.mockClear()
+    mockIsRoomEncrypted.mockClear()
   })
 
   test('chat window should open and close', async () => {
@@ -113,9 +117,7 @@ describe('Chatbox', () => {
     expect(mockStartClient).toHaveBeenCalled()
     expect(mockCreateRoom).toHaveBeenCalled()
     expect(mockSetPowerLevel).toHaveBeenCalled()
-    expect(mockSetPowerLevel).toHaveBeenCalled()
     expect(mockOn).toHaveBeenCalled()
-    expect(mockOnce).toHaveBeenCalled()
   })
 
   test('rejecting terms should not start chat', async () => {
diff --git a/src/outputs/bookmarklet.js b/src/outputs/bookmarklet.js
index 880fe28..2b89875 100644
--- a/src/outputs/bookmarklet.js
+++ b/src/outputs/bookmarklet.js
@@ -1,17 +1,17 @@
 import EmbeddableChatbox from './embeddable-chatbox';
 
-const config = {
+var config = {
   matrixServerUrl: 'https://matrix.rhok.space',
   botId: '@help-bot:rhok.space',
   roomName: 'Support Chat',
   termsUrl: 'https://tosdr.org/',
   introMessage: 'This chat application does not collect any of your personal data or any data from your use of this service.',
-  agreementMessage: '👉 Do you want to continue? Type yes or no.',
+  agreementMessage: 'Do you want to continue?',
   confirmationMessage: 'Waiting for a facilitator to join the chat...',
-  exitMessage: 'The chat was not started.',
+  exitMessage: 'The chat is closed. You may close this window.',
   chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
   anonymousDisplayName: 'Anonymous',
-};
+}
 
 export default function bookmarklet() {
   if (window.EmbeddableChatbox) {
diff --git a/src/outputs/bookmarklet.test.js b/src/outputs/bookmarklet.test.js
index ca40031..3f7f3e3 100644
--- a/src/outputs/bookmarklet.test.js
+++ b/src/outputs/bookmarklet.test.js
@@ -2,13 +2,6 @@ import ReactDOM from 'react-dom';
 import bookmarklet from './bookmarklet';
 
 describe('bookmarklet', () => {
-  beforeAll(() => {
-    const el = document.querySelectorAll('body > div');
-    ReactDOM.unmountComponentAtNode(el[0]);
-    el[0].parentNode.removeChild(el[0]);
-    window.EmbeddableChatbox = null;
-  })
-
   afterEach(() => {
     const el = document.querySelectorAll('body > div');
     ReactDOM.unmountComponentAtNode(el[0]);