Fixed script context block

kotest · Jan 31, 2021 · 8486e12 · 8486e12
1 parent 9fa5066
commit 8486e12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/kotest-framework/kotest-framework-api/src/commonMain/kotlin/io/kotest/core/script/styles.kt b/kotest-framework/kotest-framework-api/src/commonMain/kotlin/io/kotest/core/script/styles.kt
@@ -20,7 +20,7 @@ fun test(name: String, test: suspend TestContext.() -> Unit) {
 fun context(name: String, test: suspend ContextScope.() -> Unit) {
    val testName = createTestName(name)
    val description = ScriptSpec().description().append(testName, TestType.Container)
-   ScriptRuntime.registerRootTest(testName, false, TestType.Test) { ContextScope(description, it).test() }
+   ScriptRuntime.registerRootTest(testName, false, TestType.Container) { ContextScope(description, it).test() }
 }
 
 class ContextScope(

diff --git a/.../kotest-framework-discovery/src/jvmMain/kotlin/io/kotest/framework/discovery/Discovery.kt b/.../kotest-framework-discovery/src/jvmMain/kotlin/io/kotest/framework/discovery/Discovery.kt
@@ -113,9 +113,11 @@ class Discovery(private val discoveryExtensions: List<DiscoveryExtension> = empt
 
       log("After discovery extensions there are ${filtered.size} spec classes")
 
+      val scriptsEnabled = System.getProperty(KotestEngineSystemProperties.scriptsEnabled) == "true" ||
+         System.getenv(KotestEngineSystemProperties.scriptsEnabled) == "true"
+
       val scripts = when {
-         System.getProperty(KotestEngineSystemProperties.scriptsEnabled) == "true" -> discoverScripts()
-         System.getenv(KotestEngineSystemProperties.scriptsEnabled) == "true" -> discoverScripts()
+         scriptsEnabled -> discoverScripts()
          else -> emptyList()
       }