update tests

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',

__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,

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;
     }
 

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 () => {

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) {

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]);