From 206299fd510479d28fdb9c79eace44d85d93cba8 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Thu, 24 Jun 2021 18:42:16 +0300 Subject: [PATCH] [Tests] Fixes after sessions rework --- src/modules/actions/api/initial.ts | 3 --- src/util/sessions.ts | 4 ++-- webpack.config.js | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/actions/api/initial.ts b/src/modules/actions/api/initial.ts index 928e837a0..e6ff1093e 100644 --- a/src/modules/actions/api/initial.ts +++ b/src/modules/actions/api/initial.ts @@ -22,7 +22,6 @@ import { clearStoredSession, importLegacySession, clearLegacySessions, - importTestSession, } from '../../../util/sessions'; addReducer('initApi', (global: GlobalState, actions) => { @@ -30,8 +29,6 @@ addReducer('initApi', (global: GlobalState, actions) => { if (!IS_TEST) { await importLegacySession(); void clearLegacySessions(); - } else { - importTestSession(); } void initApi(actions.apiUpdate, { diff --git a/src/util/sessions.ts b/src/util/sessions.ts index 0c89c1e94..adaaba31e 100644 --- a/src/util/sessions.ts +++ b/src/util/sessions.ts @@ -121,8 +121,8 @@ export async function clearLegacySessions() { export function importTestSession() { const sessionJson = process.env.TEST_SESSION!; try { - const sessionData = JSON.parse(sessionJson) as ApiSessionData; - storeSession(sessionData); + const sessionData = JSON.parse(sessionJson) as ApiSessionData & { userId: number }; + storeSession(sessionData, sessionData.userId); } catch (err) { if (DEBUG) { // eslint-disable-next-line no-console diff --git a/webpack.config.js b/webpack.config.js index 93fca3c60..d9410c53b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -108,6 +108,7 @@ module.exports = (env = {}, argv = {}) => { APP_ENV: 'production', TELEGRAM_T_API_ID: '', TELEGRAM_T_API_HASH: '', + TEST_SESSION: '', }), ...(argv.mode === 'production' ? [ new BundleAnalyzerPlugin({