Fix tests on wasmJs

ajalt · Jun 15, 2024 · 1d1dcc5 · 1d1dcc5
1 parent 70c6cb6
commit 1d1dcc5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mordant/src/commonTest/kotlin/com/github/ajalt/mordant/test/TestUtils.kt b/mordant/src/commonTest/kotlin/com/github/ajalt/mordant/test/TestUtils.kt
@@ -21,7 +21,7 @@ private val upMove = Regex("${Regex.escape(CSI)}\\d+A")
 
 // This handles the difference in wasm movements and the other targets
 fun TerminalRecorder.normalizedOutput(): String {
-    return if (CR_IMPLIES_LF) output().replace(upMove, "\r") else output()
+    return if (CR_IMPLIES_LF) output().replace("\r${CSI}1A", "\r") else output()
 }
 
 fun TerminalRecorder.latestOutput(): String {

diff --git a/test/graalvm/src/test/kotlin/GraalSmokeTest.kt b/test/graalvm/src/test/kotlin/GraalSmokeTest.kt
@@ -12,6 +12,7 @@ import com.github.ajalt.mordant.widgets.progress.progressBar
 import com.github.ajalt.mordant.widgets.progress.progressBarLayout
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 import java.util.concurrent.TimeUnit
 import kotlin.test.Ignore
 import kotlin.test.assertNull
@@ -42,7 +43,9 @@ class GraalSmokeTest {
     @Test
     fun `raw mode test`() {
         val t = Terminal(interactive = true)
-        assertNull(t.enterRawMode()?.use {})
+        assertThrows<RuntimeException> {
+            t.enterRawMode().use {}
+        }
     }
 
     @Test