Merge 780563f into 4ba65f4

packages/app/main/src/commands/clientInitCommands.spec.ts

@@ -3,7 +3,6 @@ import { BotConfigWithPathImpl, CommandRegistryImpl } from '@bfemulator/sdk-shar
 import { bot } from '../botData/reducers/bot';
 import * as store from '../botData/store';
 import { mainWindow } from '../main';
-import { getStore } from '../settingsData/store';
 import { registerCommands } from './clientInitCommands';
 import { combineReducers, createStore } from 'redux';
 import reducers from '../settingsData/reducers';
@@ -13,13 +12,13 @@ const mockCreateStore = () => createStore(reducers);
 const mockSettingsImpl = SettingsImpl;
 jest.mock('../settingsData/store', () => ({
   getStore: function () {
-    return mockSettingsStore || (mockSettingsStore = mockCreateStore())
+    return mockSettingsStore || (mockSettingsStore = mockCreateStore());
   },
   getSettings: function () {
     return new mockSettingsImpl(mockSettingsStore.getState());
   },
   get dispatch() {
-    return mockSettingsStore.dispatch
+    return mockSettingsStore.dispatch;
   }
 }));
 
@@ -55,16 +54,16 @@ jest.mock('electron', () => ({
 jest.mock('mkdirp', () => ({
   sync: () => void(0)
 }));
-const mockReadFileSyncResponses = ['{"bots":[]}', '[]'];
+const mockReadFileSyncResponses = [`{"bots":[]}`, '[]'];
 jest.mock('../utils/readFileSync', () => ({
   readFileSync: (file) => {
     if (file.includes('.transcript')) {
       return '[]';
     }
     if (file.includes('bots.json')) {
-      return '{"bots":[]}'
+      return `{"bots":[]}`;
     }
-    mockReadFileSyncResponses.shift()
+    return mockReadFileSyncResponses.shift();
   }
 }));
 
@@ -104,12 +103,12 @@ describe('The clientInitCommands', () => {
     };
 
     await command();
-    expect(localCommandArgs).toEqual([["electron:set-title-bar"], ["electron:set-fullscreen", false]]);
-    expect(remoteCommandArgs).toEqual([["receive-global-settings", {
-      "cwd": jasmine.any(String),
-      "locale": "",
-      "serverUrl": "http://localhost:3000",
-      "users": {}
+    expect(localCommandArgs).toEqual([['electron:set-title-bar'], ['electron:set-fullscreen', false]]);
+    expect(remoteCommandArgs).toEqual([['receive-global-settings', {
+      'cwd': jasmine.any(String),
+      'locale': '',
+      'serverUrl': 'http://localhost:3000',
+      'users': {}
     }]]);
   });
 
@@ -121,11 +120,11 @@ describe('The clientInitCommands', () => {
       remoteCommandArgs.push(args);
     };
     await command();
-    expect(remoteCommandArgs).toEqual([["receive-global-settings", {
-      "cwd": jasmine.any(String),
-      "locale": "",
-      "serverUrl": "http://localhost:3000",
-      "users": {}
+    expect(remoteCommandArgs).toEqual([['receive-global-settings', {
+      'cwd': jasmine.any(String),
+      'locale': '',
+      'serverUrl': 'http://localhost:3000',
+      'users': {}
     }]]);
   });
 
@@ -156,51 +155,52 @@ describe('The clientInitCommands', () => {
       remoteCommandArgs.push(args);
     };
 
-    (mainWindow.commandService as any).call = (...args) => {
+    (mainWindow.commandService as any).call = (...args: any[]) => {
       localCommandArgs.push(args);
       if (args[0] === SharedConstants.Commands.Bot.Open) {
         return mockBot;
       }
+      return null;
     };
 
     const command = registry.getCommand(SharedConstants.Commands.ClientInit.PostWelcomeScreen).handler;
     await command();
     expect(localCommandArgs).toEqual([
-      ["menu:update-file-menu"], ["bot:open", "pathtobot.bot", undefined], ["bot:set-active", {
-        "description": "",
-        "name": "AuthBot",
-        "overrides": null,
-        "padlock": "",
-        "path": "some/path",
-        "services": [{
-          "appId": "4f8fde3f-48d3-4d8a-a954-393efe39809e",
-          "appPassword": "REDACTED",
-          "endpoint": "http://localhost:55697/api/messages",
-          "id": "cded37c0-83f2-11e8-ac6d-b7172cd24b28",
-          "name": "authsample",
-          "type": "endpoint"
+      ['menu:update-file-menu'], ['bot:open', 'pathtobot.bot', undefined], ['bot:set-active', {
+        'description': '',
+        'name': 'AuthBot',
+        'overrides': null,
+        'padlock': '',
+        'path': 'some/path',
+        'services': [{
+          'appId': '4f8fde3f-48d3-4d8a-a954-393efe39809e',
+          'appPassword': 'REDACTED',
+          'endpoint': 'http://localhost:55697/api/messages',
+          'id': 'cded37c0-83f2-11e8-ac6d-b7172cd24b28',
+          'name': 'authsample',
+          'type': 'endpoint'
         }],
-        "version": "2.0"
+        'version': '2.0'
       }]]);
 
-    expect(remoteCommandArgs).toEqual([["transcript:open", "deepLinkedTranscript", {
-      "activities": [],
-      "inMemory": true
-    }], ["bot:load", {
-      "description": "",
-      "name": "AuthBot",
-      "overrides": null,
-      "padlock": "",
-      "path": "some/path",
-      "services": [{
-        "appId": "4f8fde3f-48d3-4d8a-a954-393efe39809e",
-        "appPassword": "REDACTED",
-        "endpoint": "http://localhost:55697/api/messages",
-        "id": "cded37c0-83f2-11e8-ac6d-b7172cd24b28",
-        "name": "authsample",
-        "type": "endpoint"
+    expect(remoteCommandArgs).toEqual([['transcript:open', 'deepLinkedTranscript', {
+      'activities': [],
+      'inMemory': true
+    }], ['bot:load', {
+      'description': '',
+      'name': 'AuthBot',
+      'overrides': null,
+      'padlock': '',
+      'path': 'some/path',
+      'services': [{
+        'appId': '4f8fde3f-48d3-4d8a-a954-393efe39809e',
+        'appPassword': 'REDACTED',
+        'endpoint': 'http://localhost:55697/api/messages',
+        'id': 'cded37c0-83f2-11e8-ac6d-b7172cd24b28',
+        'name': 'authsample',
+        'type': 'endpoint'
       }],
-      "version": "2.0"
+      'version': '2.0'
     }]]);
   });
 });

packages/app/main/src/utils/ensureStoragePath.ts

@@ -32,7 +32,7 @@
 //
 
 import * as path from 'path';
-import * as Mkdirp from 'mkdirp';
+import * as mkdirp from 'mkdirp';
 import * as globals from '../globals';
 import * as electron from 'electron'; // use a lowercase name "electron" to prevent clash with "Electron" namespace
 const electronApp: Electron.App = electron.app;
@@ -43,6 +43,6 @@ export const ensureStoragePath = (): string => {
   const commandLineArgs = globals.getGlobal('commandlineargs');
   const app = electronApp || electronRemote.app;
   const storagePath = commandLineArgs.storagepath || path.join(app.getPath('userData'), 'botframework-emulator');
-  Mkdirp.sync(storagePath);
+  mkdirp.sync(storagePath);
   return storagePath;
 };

packages/app/main/src/utils/exceptionToAPIException.spec.ts

@@ -0,0 +1,26 @@
+import { APIException } from '@bfemulator/app-shared';
+import * as HttpStatus from 'http-status-codes';
+import { exceptionToAPIException } from './exceptionToAPIException';
+
+describe('The exceptionToAPIException', () => {
+  it('should pass an APIException though unchanged', () => {
+    const apiException: APIException = {
+      error: { error: { code: '42', message: 'oh noes!' } },
+      statusCode: HttpStatus.BAD_REQUEST
+    };
+
+    expect(exceptionToAPIException(apiException)).toBe(apiException);
+  });
+
+  it('should convert an exception to an APIException', () => {
+    const error = new Error('This is an error');
+    expect(exceptionToAPIException(error)).toEqual({
+      'error': {
+        'error': {
+          'code': 'ServiceError',
+          'message': 'This is an error'
+        }
+      }, 'statusCode': HttpStatus.BAD_REQUEST
+    });
+  });
+});

packages/app/main/src/utils/getThemes.spec.ts

@@ -0,0 +1,11 @@
+import { getThemes } from './getThemes';
+
+describe('The getThemes utility', () => {
+  it('should retrieve the available themes from the themes directory', () => {
+    const themes = getThemes();
+    expect(themes).toEqual([
+      { 'href': './themes/dark.css', 'name': 'Dark' },
+      { 'href': './themes/high-contrast.css', 'name': 'High-contrast' },
+      { 'href': './themes/light.css', 'name': 'Light' }]);
+  });
+});

packages/app/main/src/utils/index.ts

@@ -33,23 +33,19 @@
 
 export * from './botListsAreDifferent';
 export * from './conversation';
-export * from './directoryExists';
 export * from './ensureStoragePath';
 export * from './exceptionToAPIException';
-export * from './fileExists';
 export * from './getBotsFromDisk';
 export * from './getDirectories';
 export * from './getFilesInDir';
 export * from './getSafeBotName';
 export * from './isDev';
 export * from './isLocalhostUrl';
-export * from './isSecureUrl';
 export * from './loadSettings';
 export * from './parseActivitiesFromChatFile';
 export * from './readFileSync';
 export * from './saveSettings';
 export * from './sendErrorResponse';
-export * from './showMessageBox';
 export * from './showOpenDialog';
 export * from './showSaveDialog';
 export * from './writeFile';

packages/app/main/src/utils/isLocalHostUrl.spec.ts

@@ -0,0 +1,11 @@
+import { isLocalhostUrl } from './isLocalhostUrl';
+
+describe('The isLocalHostUrl util', () => {
+  it('should return true for urls that contain "localhost"', () => {
+    expect(isLocalhostUrl('http://localhost')).toBeTruthy();
+  });
+
+  it('should return true for urls that contain "127.0.0.1" ', () => {
+    expect(isLocalhostUrl('http://127.0.0.1')).toBeTruthy();
+  });
+});