From b9bc11d5e071643be55d4a54a9b4f5b1e6862e26 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 1 Sep 2020 15:19:29 +0300 Subject: [PATCH] [Gradle, JS] Consider custom launcher's base ^KT-41475 fixed --- .../src/DebugConfigurator.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-test-js-runner/src/DebugConfigurator.js b/libraries/tools/kotlin-test-js-runner/src/DebugConfigurator.js index 118596e2c4b..f957ecf8a07 100644 --- a/libraries/tools/kotlin-test-js-runner/src/DebugConfigurator.js +++ b/libraries/tools/kotlin-test-js-runner/src/DebugConfigurator.js @@ -25,11 +25,7 @@ export function configureBrowsers(config) { } function isDebuggableBrowser(browserName, config) { - if ([ - 'ChromeHeadless', - 'ChromeCanaryHeadless', - 'ChromiumHeadless' - ].includes(browserName)) { + if (isDebuggableBrowserName(browserName)) { return true } @@ -43,6 +39,10 @@ function isDebuggableBrowser(browserName, config) { return false; } + if (isDebuggableBrowserName(customLauncher.base)) { + return true + } + const flags = customLauncher.flags; if (!Array.isArray(flags)) { return false; @@ -63,6 +63,14 @@ function isDebuggableBrowser(browserName, config) { return true; } +function isDebuggableBrowserName(browserName) { + return [ + 'ChromeHeadless', + 'ChromeCanaryHeadless', + 'ChromiumHeadless' + ].includes(browserName); +} + export function fixMochaTimeout(config) { let client = config.client; if (typeof client === 'undefined') {