diff --git a/src/BotTester.ts b/src/BotTester.ts index c4207ba..d297f3b 100644 --- a/src/BotTester.ts +++ b/src/BotTester.ts @@ -1,7 +1,7 @@ import * as Promise from 'bluebird'; import { IAddress, IMessage, Message, Session, UniversalBot } from 'botbuilder'; import { ignoreEndOfConversationEventFilter, ignoreTypingEventFilter } from './builtInMessageFilters'; -import { config, IConfig, MessageFilter } from './config'; +import { getConfig, IConfig, MessageFilter } from './config'; import { ExpectedMessage, PossibleExpectedMessageCollections, PossibleExpectedMessageType } from './ExpectedMessage'; import { botToUserMessageCheckerFunction, MessageService } from './MessageService'; import { SessionService } from './SessionService'; @@ -109,8 +109,8 @@ export class BotTester implements IBotTester, IOptionsModifier { private testSteps: TestStep[]; private config: IConfig; - constructor(bot: UniversalBot, options: IConfig = config) { - this.config = Object.assign({}, config, options); + constructor(bot: UniversalBot, options?: IConfig) { + this.config = Object.assign({}, getConfig(), options); this.config.messageFilters = this.config.messageFilters.slice(); this.bot = bot; this.messageService = new MessageService(bot, this.config); diff --git a/src/config.ts b/src/config.ts index 923317e..04697b0 100644 --- a/src/config.ts +++ b/src/config.ts @@ -40,14 +40,13 @@ export interface IConfig { } const configFilePath = `bot-tester.json`; -const configFileExists = fs.existsSync(configFilePath); /** * default value for timeout. If config/options are set to this value, no timeout will be used */ export const NO_TIMEOUT = -1; -let configInternal: IConfig = { +const defaultConfig: IConfig = { timeout: NO_TIMEOUT, defaultAddress: { channelId: 'console', @@ -57,14 +56,26 @@ let configInternal: IConfig = { } }; -if (configFileExists) { - configInternal = JSON.parse(fs.readFileSync(configFilePath, { encoding: 'utf8' })); -} +export function getConfig(): IConfig { + let configInternal: IConfig; -configInternal.messageFilters = []; + if (configInternal) { + return configInternal; + } -if (configInternal.ignoreInternalSaveMessage) { - configInternal.messageFilters.push(ignoreInternalSaveMessageFilter); -} + configInternal = defaultConfig; + + const configFileExists = fs.existsSync(configFilePath); + + if (configFileExists) { + configInternal = JSON.parse(fs.readFileSync(configFilePath, { encoding: 'utf8' })); + } + + configInternal.messageFilters = []; -export const config = configInternal; + if (configInternal.ignoreInternalSaveMessage) { + configInternal.messageFilters.push(ignoreInternalSaveMessageFilter); + } + + return configInternal; +}