From 9f5dd59d750dae7e90f08ab58085330c023f5a14 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 16 Jul 2020 20:18:02 +0300 Subject: [PATCH] Wizard: do not add test task for JS when no test framework is chosen #KT-40378 fixed --- .../moduleConfigurators/JsModuleConfigurator.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt index d9e0d05f9db..aa75372009a 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt @@ -43,7 +43,11 @@ interface JSConfigurator : ModuleConfiguratorWithModuleType, ModuleConfiguratorW if (reader.isApplication(module)) { applicationCssSupport() } - testCssSupport() + } + if (this@JSConfigurator is ModuleConfiguratorWithTests + && reader.settingValue(module, ModuleConfiguratorWithTests.testFramework) != KotlinTestFramework.NONE + ) { + testTask(cssSupport = reader.hasCssSupport(module)) } } } @@ -132,11 +136,13 @@ fun GradleIRListBuilder.applicationCssSupport() { } } -fun GradleIRListBuilder.testCssSupport() { +fun GradleIRListBuilder.testTask(cssSupport: Boolean) { "testTask" { "useKarma" { +"useChromeHeadless()" - +"webpackConfig.cssSupport.enabled = true" + if (cssSupport) { + +"webpackConfig.cssSupport.enabled = true" + } } } } \ No newline at end of file