From b60a15377b3b5ff978eb9a8dadb610651855ff86 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Tue, 6 Jul 2021 19:12:35 +0200 Subject: [PATCH 01/17] Update Arrow Fx Coroutines & Test --- .../fx/arrow-fx-coroutines-test/build.gradle | 14 ++++++++ .../fx/arrow-fx-coroutines/build.gradle | 27 ++++++++++++++++ .../arrow/fx/coroutines/CircuitBreakerTest.kt | 9 +++--- .../arrow/fx/coroutines/ParTraverseTest.kt | 31 ++---------------- .../kotlin/arrow/fx/coroutines/predef.kt | 6 ++++ .../arrow/fx/coroutines/ParTraverseJvmTest.kt | 32 +++++++++++++++++++ 6 files changed, 86 insertions(+), 33 deletions(-) create mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/jsMain/kotlin/arrow/fx/coroutines/predef.kt create mode 100644 arrow-libs/fx/arrow-fx-coroutines/src/jvmTest/kotlin/arrow/fx/coroutines/ParTraverseJvmTest.kt diff --git a/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle b/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle index ff8273b4f5c..a09a7490082 100644 --- a/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle +++ b/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle @@ -11,6 +11,10 @@ apply from: "$PUBLICATION_MPP" apply from: "$ANIMALSNIFFER_MPP" kotlin { + js(BOTH) { + browser() + nodejs() + } sourceSets { commonMain { dependencies { @@ -34,5 +38,15 @@ kotlin { runtimeOnly "io.kotest:kotest-runner-junit5:$KOTEST_VERSION" } } + jsMain { + dependencies { + compileOnly "org.jetbrains.kotlin:kotlin-stdlib-js:$KOTLIN_VERSION" + } + } + jsTest { + dependencies { + implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } + } } } diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle b/arrow-libs/fx/arrow-fx-coroutines/build.gradle index 719d9d52148..2596438377e 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/build.gradle +++ b/arrow-libs/fx/arrow-fx-coroutines/build.gradle @@ -11,6 +11,23 @@ apply from: "$DOC_CREATION" apply from: "$PUBLICATION_MPP" kotlin { + js(BOTH) { + browser { + testTask { + useKarma { + useChromeHeadless() + useConfigDirectory("${project.rootDir}/karma") + } + } + } + nodejs { + testTask { + useMocha { + timeout = "10000000000" + } + } + } + } sourceSets { commonMain { dependencies { @@ -36,5 +53,15 @@ kotlin { implementation "io.kotest:kotest-runner-junit5:$KOTEST_VERSION" } } + jsMain { + dependencies { + compileOnly "org.jetbrains.kotlin:kotlin-stdlib-js:$KOTLIN_VERSION" + } + } + jsTest { + dependencies { + implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } + } } } diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/CircuitBreakerTest.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/CircuitBreakerTest.kt index c06b36492c0..72684fd956b 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/CircuitBreakerTest.kt +++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/CircuitBreakerTest.kt @@ -1,6 +1,7 @@ package arrow.fx.coroutines import arrow.core.Either +import arrow.core.test.stackSafeIteration import io.kotest.assertions.fail import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe @@ -253,15 +254,15 @@ class CircuitBreakerTest : ArrowFxSpec( "should be stack safe for successful async tasks" { stackSafeSuspend( CircuitBreaker.of(maxFailures = 5, resetTimeout = 1.minutes)!!, - 20_000, 0 - ) shouldBe 20_000 + stackSafeIteration(), 0 + ) shouldBe stackSafeIteration() } "should be stack safe for successful immediate tasks" { stackSafeImmediate( CircuitBreaker.of(maxFailures = 5, resetTimeout = 1.minutes)!!, - 20_000, 0 - ) shouldBe 20_000 + stackSafeIteration(), 0 + ) shouldBe stackSafeIteration() } } ) diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/ParTraverseTest.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/ParTraverseTest.kt index 40edab7c80a..2b8ea17480d 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/ParTraverseTest.kt +++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/ParTraverseTest.kt @@ -1,14 +1,11 @@ package arrow.fx.coroutines import arrow.core.Either -import io.kotest.assertions.assertSoftly import io.kotest.matchers.should import io.kotest.matchers.shouldBe -import io.kotest.matchers.string.shouldStartWith import io.kotest.property.Arb import io.kotest.property.arbitrary.int import io.kotest.property.arbitrary.list -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.withTimeoutOrNull import kotlin.time.ExperimentalTime @@ -54,7 +51,7 @@ class ParTraverseTest : ArrowFxSpec( Arb.throwable() ) { n, killOn, e -> Either.catch { - (0 until n).parTraverse(Dispatchers.IO) { i -> + (0 until n).parTraverse { i -> if (i == killOn) throw e else unit() } } should leftException(e) @@ -73,17 +70,6 @@ class ParTraverseTest : ArrowFxSpec( l shouldBe (0 until count).toList() } - "parTraverse runs on provided context " { // 100 is same default length as Arb.list - checkAll(Arb.int(min = Int.MIN_VALUE, max = 100)) { i -> - val res = single.use { ctx -> - (0 until i).parTraverse(ctx) { Thread.currentThread().name } - } - assertSoftly { - res.forEach { it shouldStartWith "single" } - } - } - } - "parTraverseN can traverse effect full computations" { val ref = Atomic(0) (0 until 100).parTraverseN(5) { @@ -92,19 +78,6 @@ class ParTraverseTest : ArrowFxSpec( ref.get() shouldBe 100 } - "parTraverseN runs on provided thread" { - checkAll(Arb.int(min = Int.MIN_VALUE, max = 100)) { i -> - val res = single.use { ctx -> - (0 until i).parTraverseN(ctx, 3) { - Thread.currentThread().name - } - } - assertSoftly { - res.forEach { it shouldStartWith "single" } - } - } - } - "parTraverseN(3) runs in (3) parallel" { val promiseA = CompletableDeferred() val promiseB = CompletableDeferred() @@ -162,7 +135,7 @@ class ParTraverseTest : ArrowFxSpec( Arb.throwable() ) { n, killOn, e -> Either.catch { - (0 until n).parTraverseN(Dispatchers.IO, 3) { i -> + (0 until n).parTraverseN(3) { i -> if (i == killOn) throw e else unit() } } should leftException(e) diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/jsMain/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/jsMain/kotlin/arrow/fx/coroutines/predef.kt new file mode 100644 index 00000000000..6232e2e560e --- /dev/null +++ b/arrow-libs/fx/arrow-fx-coroutines/src/jsMain/kotlin/arrow/fx/coroutines/predef.kt @@ -0,0 +1,6 @@ +package arrow.fx.coroutines + +actual fun timeInMillis(): Long { + val x: Number = js("new Date().getTime()") + return x.toLong() +} diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/jvmTest/kotlin/arrow/fx/coroutines/ParTraverseJvmTest.kt b/arrow-libs/fx/arrow-fx-coroutines/src/jvmTest/kotlin/arrow/fx/coroutines/ParTraverseJvmTest.kt new file mode 100644 index 00000000000..9e334649c43 --- /dev/null +++ b/arrow-libs/fx/arrow-fx-coroutines/src/jvmTest/kotlin/arrow/fx/coroutines/ParTraverseJvmTest.kt @@ -0,0 +1,32 @@ +package arrow.fx.coroutines + +import io.kotest.assertions.assertSoftly +import io.kotest.matchers.string.shouldStartWith +import io.kotest.property.Arb +import io.kotest.property.arbitrary.int + +class ParTraverseJvmTest : ArrowFxSpec(spec = { + "parTraverse runs on provided context " { // 100 is same default length as Arb.list + checkAll(Arb.int(min = Int.MIN_VALUE, max = 100)) { i -> + val res = single.use { ctx -> + (0 until i).parTraverse(ctx) { Thread.currentThread().name } + } + assertSoftly { + res.forEach { it shouldStartWith "single" } + } + } + } + + "parTraverseN runs on provided thread" { + checkAll(Arb.int(min = Int.MIN_VALUE, max = 100)) { i -> + val res = single.use { ctx -> + (0 until i).parTraverseN(ctx, 3) { + Thread.currentThread().name + } + } + assertSoftly { + res.forEach { it shouldStartWith "single" } + } + } + } +}) From 855e7954c4cb5bcd3b93ce6d62a288f7f376bf72 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Tue, 6 Jul 2021 19:38:13 +0200 Subject: [PATCH 02/17] Add support JS for Arrow Fx Stm --- arrow-libs/fx/arrow-fx-stm/build.gradle | 36 ++++++++++++++++--- .../commonMain/kotlin/arrow/fx/stm/TQueue.kt | 3 +- .../commonTest/kotlin/arrow/fx/stm/STMTest.kt | 14 +++++++- .../kotlin/arrow/fx/stm/TVarTest.kt | 9 +++-- .../arrow/fx/stm/internal/RetryException.kt | 3 ++ 5 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 arrow-libs/fx/arrow-fx-stm/src/jsMain/kotlin/arrow/fx/stm/internal/RetryException.kt diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle b/arrow-libs/fx/arrow-fx-stm/build.gradle index a9142225814..1be5567f1de 100644 --- a/arrow-libs/fx/arrow-fx-stm/build.gradle +++ b/arrow-libs/fx/arrow-fx-stm/build.gradle @@ -12,6 +12,23 @@ apply from: "$PUBLICATION_MPP" apply from: "$ANIMALSNIFFER_MPP" kotlin { + js(BOTH) { + browser { + testTask { + useKarma { + useChromeHeadless() + useConfigDirectory("${project.rootDir}/karma") + } + } + } + nodejs { + testTask { + useMocha { + timeout = "10000000000" + } + } + } + } sourceSets { commonMain { dependencies { @@ -20,15 +37,14 @@ kotlin { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLINX_COROUTINES_VERSION" } } - - jvmMain { + commonTest { dependencies { - compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION" + implementation project(":arrow-fx-coroutines-test") } } - commonTest { + jvmMain { dependencies { - implementation project(":arrow-fx-coroutines-test") + compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION" } } jvmTest { @@ -36,5 +52,15 @@ kotlin { implementation "io.kotest:kotest-runner-junit5:$KOTEST_VERSION" } } + jsMain { + dependencies { + compileOnly "org.jetbrains.kotlin:kotlin-stdlib-js:$KOTLIN_VERSION" + } + } + jsTest { + dependencies { + implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } + } } } diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TQueue.kt b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TQueue.kt index e34577000ca..a75b1a7ae68 100644 --- a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TQueue.kt +++ b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/TQueue.kt @@ -1,6 +1,7 @@ package arrow.fx.stm import arrow.core.Predicate +import kotlin.js.JsName fun STM.newTQueue(): TQueue = TQueue(newTVar(PList.Nil), newTVar(PList.Nil)) @@ -249,7 +250,7 @@ data class TQueue internal constructor( * implement queues. */ internal sealed class PList { - data class Cons(val value: A, val tail: PList) : PList() + data class Cons(val value: A, @JsName("_tail") val tail: PList) : PList() object Nil : PList() /** diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt index 3cf1e0c7e21..7b711c7299a 100644 --- a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt +++ b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt @@ -233,7 +233,19 @@ class STMTest : ArrowFxSpec( acc2.unsafeRead() shouldBeExactly 250 } } - "concurrent example 2" { + + // TypeError: Cannot read property 'toString' of undefined + // at ObjectLiteral_0.test(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:3661) + // at .invokeMatcher(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:19216) + // at .should(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:19212) + // at .shouldBeInRange(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:3652) + // at STMTransaction.f(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:261217) + // at commit.doResume(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:270552) + // at commit.CoroutineImpl.resumeWith(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:118697) + // at CancellableContinuationImpl.DispatchedTask.run(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:174593) + // at WindowMessageQueue.MessageQueue.process(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:177985) + // at .(/var/folders/x5/6r18d9w52c7czy6zh5m1spvw0000gn/T/_karma_webpack_624630/commons.js:177940) + "concurrent example 2".config(enabled = false) { checkAll { val tq = TQueue.new() parZip( diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/TVarTest.kt b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/TVarTest.kt index 905a75d0db4..103d473db6a 100644 --- a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/TVarTest.kt +++ b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/TVarTest.kt @@ -7,7 +7,6 @@ import arrow.fx.stm.internal.STMFrame import io.kotest.matchers.ints.shouldBeExactly import io.kotest.matchers.shouldBe import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlin.time.ExperimentalTime @@ -30,14 +29,14 @@ class TVarTest : ArrowFxSpec( val sleepWon = CompletableDeferred() val job1 = launch { - raceN(Dispatchers.IO, { delay(50.milliseconds); sleepWon.complete(Unit) }, { tv.unsafeRead() }) + raceN({ delay(50.milliseconds); sleepWon.complete(Unit) }, { tv.unsafeRead() }) .fold({}, { throw IllegalStateException("Lock did not lock!") }) } sleepWon.await() val sleepWon2 = CompletableDeferred() val job2 = launch { - raceN(Dispatchers.IO, { delay(50.milliseconds); sleepWon2.complete(Unit) }, { tv.lock(STMFrame()) }) + raceN({ delay(50.milliseconds); sleepWon2.complete(Unit) }, { tv.lock(STMFrame()) }) .fold({}, { throw IllegalStateException("Lock did not lock!") }) } sleepWon2.await() @@ -55,7 +54,7 @@ class TVarTest : ArrowFxSpec( val sleepWon = CompletableDeferred() val job1 = launch { - raceN(Dispatchers.IO, { delay(50.milliseconds); sleepWon.complete(Unit) }, { tv.unsafeRead() }) + raceN({ delay(50.milliseconds); sleepWon.complete(Unit) }, { tv.unsafeRead() }) .fold({}, { throw IllegalStateException("Lock did not lock!") }) } sleepWon.await() @@ -65,7 +64,7 @@ class TVarTest : ArrowFxSpec( val sleepWon2 = CompletableDeferred() val job2 = launch { - raceN(Dispatchers.IO, { delay(50.milliseconds); sleepWon2.complete(Unit) }, { tv.unsafeRead() }) + raceN({ delay(50.milliseconds); sleepWon2.complete(Unit) }, { tv.unsafeRead() }) .fold({}, { throw IllegalStateException("Lock did not lock!") }) } sleepWon2.await() diff --git a/arrow-libs/fx/arrow-fx-stm/src/jsMain/kotlin/arrow/fx/stm/internal/RetryException.kt b/arrow-libs/fx/arrow-fx-stm/src/jsMain/kotlin/arrow/fx/stm/internal/RetryException.kt new file mode 100644 index 00000000000..3d3ffd33ea8 --- /dev/null +++ b/arrow-libs/fx/arrow-fx-stm/src/jsMain/kotlin/arrow/fx/stm/internal/RetryException.kt @@ -0,0 +1,3 @@ +package arrow.fx.stm.internal + +actual object RetryException : Throwable("Arrow STM Retry. This should always be caught by arrow internally. Please report this as a bug if that is not the case!") From cc499f8cfee5f190f94afc999a5f5c2d8fa6f306 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Wed, 7 Jul 2021 16:06:55 +0200 Subject: [PATCH 03/17] Update karma config, and add symlinks for all diferent modules --- arrow-libs/core/karma | 1 + arrow-libs/fx/karma | 1 + arrow-libs/karma/chrome_bin.js | 2 ++ arrow-libs/optics/karma | 1 + 4 files changed, 5 insertions(+) create mode 120000 arrow-libs/core/karma create mode 120000 arrow-libs/fx/karma create mode 120000 arrow-libs/optics/karma diff --git a/arrow-libs/core/karma b/arrow-libs/core/karma new file mode 120000 index 00000000000..61561893643 --- /dev/null +++ b/arrow-libs/core/karma @@ -0,0 +1 @@ +../karma \ No newline at end of file diff --git a/arrow-libs/fx/karma b/arrow-libs/fx/karma new file mode 120000 index 00000000000..61561893643 --- /dev/null +++ b/arrow-libs/fx/karma @@ -0,0 +1 @@ +../karma \ No newline at end of file diff --git a/arrow-libs/karma/chrome_bin.js b/arrow-libs/karma/chrome_bin.js index 02aaac2c511..3068905b001 100644 --- a/arrow-libs/karma/chrome_bin.js +++ b/arrow-libs/karma/chrome_bin.js @@ -1,5 +1,7 @@ config.set({ "browsers": ["MyChromeHeadless"], + "browserNoActivityTimeout": 10000000000, + "pingTimeout": 10000000000, "customLaunchers": { "MyChromeHeadless": { base: "ChromeHeadless", diff --git a/arrow-libs/optics/karma b/arrow-libs/optics/karma new file mode 120000 index 00000000000..61561893643 --- /dev/null +++ b/arrow-libs/optics/karma @@ -0,0 +1 @@ +../karma \ No newline at end of file From b9f938005e773c9f211d8a7dba62d97bf4e1f613 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 17:55:16 +0200 Subject: [PATCH 04/17] Fix karma config --- .../core/arrow-continuations/build.gradle | 1 - arrow-libs/core/arrow-core/build.gradle | 1 - arrow-libs/core/karma | 1 - .../fx/arrow-fx-coroutines/build.gradle | 1 - arrow-libs/fx/arrow-fx-stm/build.gradle | 1 - arrow-libs/fx/karma | 1 - arrow-libs/karma.config.d/karma.conf.js | 9 +++++++ arrow-libs/karma/chrome_bin.js | 25 ------------------- arrow-libs/optics/karma | 1 - 9 files changed, 9 insertions(+), 32 deletions(-) delete mode 120000 arrow-libs/core/karma delete mode 120000 arrow-libs/fx/karma create mode 100644 arrow-libs/karma.config.d/karma.conf.js delete mode 100644 arrow-libs/karma/chrome_bin.js delete mode 120000 arrow-libs/optics/karma diff --git a/arrow-libs/core/arrow-continuations/build.gradle b/arrow-libs/core/arrow-continuations/build.gradle index f38237313b7..47fa93987da 100644 --- a/arrow-libs/core/arrow-continuations/build.gradle +++ b/arrow-libs/core/arrow-continuations/build.gradle @@ -16,7 +16,6 @@ kotlin { testTask { useKarma { useChromeHeadless() - useConfigDirectory("${project.rootDir}/karma") } } } diff --git a/arrow-libs/core/arrow-core/build.gradle b/arrow-libs/core/arrow-core/build.gradle index 929a9a41e31..b925b3b594d 100644 --- a/arrow-libs/core/arrow-core/build.gradle +++ b/arrow-libs/core/arrow-core/build.gradle @@ -17,7 +17,6 @@ kotlin { testTask { useKarma { useChromeHeadless() - useConfigDirectory("${project.rootDir}/karma") } } } diff --git a/arrow-libs/core/karma b/arrow-libs/core/karma deleted file mode 120000 index 61561893643..00000000000 --- a/arrow-libs/core/karma +++ /dev/null @@ -1 +0,0 @@ -../karma \ No newline at end of file diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle b/arrow-libs/fx/arrow-fx-coroutines/build.gradle index 2596438377e..6ce51d824bf 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/build.gradle +++ b/arrow-libs/fx/arrow-fx-coroutines/build.gradle @@ -16,7 +16,6 @@ kotlin { testTask { useKarma { useChromeHeadless() - useConfigDirectory("${project.rootDir}/karma") } } } diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle b/arrow-libs/fx/arrow-fx-stm/build.gradle index 1be5567f1de..8987050b288 100644 --- a/arrow-libs/fx/arrow-fx-stm/build.gradle +++ b/arrow-libs/fx/arrow-fx-stm/build.gradle @@ -17,7 +17,6 @@ kotlin { testTask { useKarma { useChromeHeadless() - useConfigDirectory("${project.rootDir}/karma") } } } diff --git a/arrow-libs/fx/karma b/arrow-libs/fx/karma deleted file mode 120000 index 61561893643..00000000000 --- a/arrow-libs/fx/karma +++ /dev/null @@ -1 +0,0 @@ -../karma \ No newline at end of file diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js new file mode 100644 index 00000000000..08cd57edccd --- /dev/null +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -0,0 +1,9 @@ +config.set({ + "client": { + "mocha": { + "timeout": 10000 + }, + }, + "pingTimeout": 10000, + "browserDisconnectTimeout": 10000 +}); \ No newline at end of file diff --git a/arrow-libs/karma/chrome_bin.js b/arrow-libs/karma/chrome_bin.js deleted file mode 100644 index 3068905b001..00000000000 --- a/arrow-libs/karma/chrome_bin.js +++ /dev/null @@ -1,25 +0,0 @@ -config.set({ - "browsers": ["MyChromeHeadless"], - "browserNoActivityTimeout": 10000000000, - "pingTimeout": 10000000000, - "customLaunchers": { - "MyChromeHeadless": { - base: "ChromeHeadless", - flags: [ - "--allow-failed-policy-fetch-for-test", - "--allow-external-pages", - "--no-sandbox", - "--disable-web-security", - "--disable-setuid-sandbox", - "--enable-logging", - "--v=1" - ] - } - }, - "client": { - captureConsole: true, - "mocha": { - timeout: 10000000000 - } - } -}); diff --git a/arrow-libs/optics/karma b/arrow-libs/optics/karma deleted file mode 120000 index 61561893643..00000000000 --- a/arrow-libs/optics/karma +++ /dev/null @@ -1 +0,0 @@ -../karma \ No newline at end of file From ff6bdf3eb123b632e64d0339b46261e47ad5a948 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 17:56:52 +0200 Subject: [PATCH 05/17] Push symlinks --- arrow-libs/core/arrow-annotations/karma.config.d | 1 + arrow-libs/core/arrow-continuations/karma.config.d | 1 + arrow-libs/core/arrow-core-test/karma.config.d | 1 + arrow-libs/core/arrow-core/karma.config.d | 1 + arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d | 1 + arrow-libs/fx/arrow-fx-coroutines/karma.config.d | 1 + arrow-libs/fx/arrow-fx-stm/karma.config.d | 1 + arrow-libs/optics/arrow-optics-test/karma.config.d | 1 + arrow-libs/optics/arrow-optics/karma.config.d | 1 + 9 files changed, 9 insertions(+) create mode 120000 arrow-libs/core/arrow-annotations/karma.config.d create mode 120000 arrow-libs/core/arrow-continuations/karma.config.d create mode 120000 arrow-libs/core/arrow-core-test/karma.config.d create mode 120000 arrow-libs/core/arrow-core/karma.config.d create mode 120000 arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d create mode 120000 arrow-libs/fx/arrow-fx-coroutines/karma.config.d create mode 120000 arrow-libs/fx/arrow-fx-stm/karma.config.d create mode 120000 arrow-libs/optics/arrow-optics-test/karma.config.d create mode 120000 arrow-libs/optics/arrow-optics/karma.config.d diff --git a/arrow-libs/core/arrow-annotations/karma.config.d b/arrow-libs/core/arrow-annotations/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/core/arrow-annotations/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/core/arrow-continuations/karma.config.d b/arrow-libs/core/arrow-continuations/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/core/arrow-continuations/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/core/arrow-core-test/karma.config.d b/arrow-libs/core/arrow-core-test/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/core/arrow-core-test/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/core/arrow-core/karma.config.d b/arrow-libs/core/arrow-core/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/core/arrow-core/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d b/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/fx/arrow-fx-coroutines/karma.config.d b/arrow-libs/fx/arrow-fx-coroutines/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/fx/arrow-fx-coroutines/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/fx/arrow-fx-stm/karma.config.d b/arrow-libs/fx/arrow-fx-stm/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/fx/arrow-fx-stm/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/optics/arrow-optics-test/karma.config.d b/arrow-libs/optics/arrow-optics-test/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/optics/arrow-optics-test/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file diff --git a/arrow-libs/optics/arrow-optics/karma.config.d b/arrow-libs/optics/arrow-optics/karma.config.d new file mode 120000 index 00000000000..627ba663c46 --- /dev/null +++ b/arrow-libs/optics/arrow-optics/karma.config.d @@ -0,0 +1 @@ +../karma.config.d \ No newline at end of file From 2fcb5965b7b25f17979e6bd7522c43bf9af33cd0 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 18:30:15 +0200 Subject: [PATCH 06/17] Fix symlinks again.. --- arrow-libs/core/arrow-annotations/karma.config.d | 2 +- arrow-libs/core/arrow-continuations/karma.config.d | 2 +- arrow-libs/core/arrow-core-test/karma.config.d | 2 +- arrow-libs/core/arrow-core/karma.config.d | 2 +- .../examples/src/test/kotlin/arrow/DataTypeExamples.kt | 7 +++++++ arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d | 2 +- arrow-libs/fx/arrow-fx-coroutines/karma.config.d | 2 +- arrow-libs/fx/arrow-fx-stm/karma.config.d | 2 +- arrow-libs/optics/arrow-optics-test/karma.config.d | 2 +- arrow-libs/optics/arrow-optics/karma.config.d | 2 +- 10 files changed, 16 insertions(+), 9 deletions(-) diff --git a/arrow-libs/core/arrow-annotations/karma.config.d b/arrow-libs/core/arrow-annotations/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/core/arrow-annotations/karma.config.d +++ b/arrow-libs/core/arrow-annotations/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/core/arrow-continuations/karma.config.d b/arrow-libs/core/arrow-continuations/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/core/arrow-continuations/karma.config.d +++ b/arrow-libs/core/arrow-continuations/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/core/arrow-core-test/karma.config.d b/arrow-libs/core/arrow-core-test/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/core/arrow-core-test/karma.config.d +++ b/arrow-libs/core/arrow-core-test/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/core/arrow-core/karma.config.d b/arrow-libs/core/arrow-core/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/core/arrow-core/karma.config.d +++ b/arrow-libs/core/arrow-core/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt b/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt index ac27a1760ac..fe02628ca25 100644 --- a/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt +++ b/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt @@ -14,6 +14,7 @@ import arrow.core.flatMap import arrow.core.getOrElse import arrow.core.handleError import arrow.core.handleErrorWith +import arrow.core.right import io.kotest.core.spec.style.FreeSpec import io.kotest.matchers.shouldBe @@ -179,3 +180,9 @@ fun playLottery(guess: Int): Int { else -> throw NoConnectionException } } + +fun test() { + listOf(1, 2, 3).fold(0.right()) { acc, i -> + acc.map { it + i } + } +} diff --git a/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d b/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d +++ b/arrow-libs/fx/arrow-fx-coroutines-test/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/fx/arrow-fx-coroutines/karma.config.d b/arrow-libs/fx/arrow-fx-coroutines/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/fx/arrow-fx-coroutines/karma.config.d +++ b/arrow-libs/fx/arrow-fx-coroutines/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/fx/arrow-fx-stm/karma.config.d b/arrow-libs/fx/arrow-fx-stm/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/fx/arrow-fx-stm/karma.config.d +++ b/arrow-libs/fx/arrow-fx-stm/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/optics/arrow-optics-test/karma.config.d b/arrow-libs/optics/arrow-optics-test/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/optics/arrow-optics-test/karma.config.d +++ b/arrow-libs/optics/arrow-optics-test/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file diff --git a/arrow-libs/optics/arrow-optics/karma.config.d b/arrow-libs/optics/arrow-optics/karma.config.d index 627ba663c46..e3ba440d616 120000 --- a/arrow-libs/optics/arrow-optics/karma.config.d +++ b/arrow-libs/optics/arrow-optics/karma.config.d @@ -1 +1 @@ -../karma.config.d \ No newline at end of file +../../karma.config.d \ No newline at end of file From 2c1384ba169fdbf1f3df377c507cb0ef5e8b3a5d Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 18:31:23 +0200 Subject: [PATCH 07/17] Clean --- .../examples/src/test/kotlin/arrow/DataTypeExamples.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt b/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt index fe02628ca25..72b2b340dcc 100644 --- a/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt +++ b/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt @@ -180,9 +180,3 @@ fun playLottery(guess: Int): Int { else -> throw NoConnectionException } } - -fun test() { - listOf(1, 2, 3).fold(0.right()) { acc, i -> - acc.map { it + i } - } -} From a6b1d6ea10b25bd7262d0537ceab71500ca9cd37 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 18:36:39 +0200 Subject: [PATCH 08/17] ktlintformat --- arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt b/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt index 72b2b340dcc..ac27a1760ac 100644 --- a/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt +++ b/arrow-libs/examples/src/test/kotlin/arrow/DataTypeExamples.kt @@ -14,7 +14,6 @@ import arrow.core.flatMap import arrow.core.getOrElse import arrow.core.handleError import arrow.core.handleErrorWith -import arrow.core.right import io.kotest.core.spec.style.FreeSpec import io.kotest.matchers.shouldBe From 927e885489825cdf4dd5d90b4db11fa2f2bbc469 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 19:02:43 +0200 Subject: [PATCH 09/17] Disable concurrent example 1 --- .../arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt index 7b711c7299a..a0c222b3ca5 100644 --- a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt +++ b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt @@ -207,7 +207,7 @@ class STMTest : ArrowFxSpec( } tv.unsafeRead() shouldBeExactly 10 } - "concurrent example 1" { + "concurrent example 1".config(enabled = false) { checkAll { val acc1 = TVar.new(100) val acc2 = TVar.new(200) From 68c83a686fcc829c4e5cd6e60ac69c409974b52d Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 19:32:09 +0200 Subject: [PATCH 10/17] Increase Karma timeout --- .../src/commonTest/kotlin/arrow/fx/stm/STMTest.kt | 2 +- arrow-libs/karma.config.d/karma.conf.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt index a0c222b3ca5..7b711c7299a 100644 --- a/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt +++ b/arrow-libs/fx/arrow-fx-stm/src/commonTest/kotlin/arrow/fx/stm/STMTest.kt @@ -207,7 +207,7 @@ class STMTest : ArrowFxSpec( } tv.unsafeRead() shouldBeExactly 10 } - "concurrent example 1".config(enabled = false) { + "concurrent example 1" { checkAll { val acc1 = TVar.new(100) val acc2 = TVar.new(200) diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js index 08cd57edccd..40332eb8ae7 100644 --- a/arrow-libs/karma.config.d/karma.conf.js +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -1,9 +1,9 @@ config.set({ "client": { "mocha": { - "timeout": 10000 + "timeout": 10000000000 }, }, - "pingTimeout": 10000, - "browserDisconnectTimeout": 10000 + "pingTimeout": 10000000000, + "browserDisconnectTimeout": 10000000000 }); \ No newline at end of file From 5b0f6a40d40986e79fbb44a970ce3d055ad9b6db Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 20:19:37 +0200 Subject: [PATCH 11/17] Change karma parms --- arrow-libs/core/arrow-continuations/build.gradle | 2 +- arrow-libs/core/arrow-core/build.gradle | 2 +- arrow-libs/fx/arrow-fx-coroutines/build.gradle | 2 +- arrow-libs/fx/arrow-fx-stm/build.gradle | 2 +- arrow-libs/karma.config.d/karma.conf.js | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arrow-libs/core/arrow-continuations/build.gradle b/arrow-libs/core/arrow-continuations/build.gradle index 47fa93987da..b24c0c70d7f 100644 --- a/arrow-libs/core/arrow-continuations/build.gradle +++ b/arrow-libs/core/arrow-continuations/build.gradle @@ -22,7 +22,7 @@ kotlin { nodejs { testTask { useMocha { - timeout = "10000000000" + timeout = "600000" } } } diff --git a/arrow-libs/core/arrow-core/build.gradle b/arrow-libs/core/arrow-core/build.gradle index b925b3b594d..01ed360328c 100644 --- a/arrow-libs/core/arrow-core/build.gradle +++ b/arrow-libs/core/arrow-core/build.gradle @@ -23,7 +23,7 @@ kotlin { nodejs { testTask { useMocha { - timeout = "10000000000" + timeout = "600000" } } } diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle b/arrow-libs/fx/arrow-fx-coroutines/build.gradle index 6ce51d824bf..e7428f67dd7 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/build.gradle +++ b/arrow-libs/fx/arrow-fx-coroutines/build.gradle @@ -22,7 +22,7 @@ kotlin { nodejs { testTask { useMocha { - timeout = "10000000000" + timeout = "600000" } } } diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle b/arrow-libs/fx/arrow-fx-stm/build.gradle index 8987050b288..43fd387a504 100644 --- a/arrow-libs/fx/arrow-fx-stm/build.gradle +++ b/arrow-libs/fx/arrow-fx-stm/build.gradle @@ -23,7 +23,7 @@ kotlin { nodejs { testTask { useMocha { - timeout = "10000000000" + timeout = "600000" } } } diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js index 40332eb8ae7..ee723885425 100644 --- a/arrow-libs/karma.config.d/karma.conf.js +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -1,9 +1,9 @@ config.set({ "client": { "mocha": { - "timeout": 10000000000 + "timeout": 600000 }, }, - "pingTimeout": 10000000000, - "browserDisconnectTimeout": 10000000000 + "pingTimeout": 600000, + "browserDisconnectTimeout": 600000 }); \ No newline at end of file From dd8cbcf682f59ac6417dea8a3303aac0c2758d86 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 20:35:07 +0200 Subject: [PATCH 12/17] Use configured custom chrome headless --- arrow-libs/karma.config.d/karma.conf.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js index ee723885425..d3367e6a4fa 100644 --- a/arrow-libs/karma.config.d/karma.conf.js +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -1,9 +1,26 @@ config.set({ + "browsers": ["MyChromeHeadless"], + "customLaunchers": { + "MyChromeHeadless": { + base: "ChromeHeadless", + flags: [ + "--allow-failed-policy-fetch-for-test", + "--allow-external-pages", + "--no-sandbox", + "--disable-web-security", + "--disable-setuid-sandbox", + "--enable-logging", + "--v=1" + ] + } + }, "client": { "mocha": { + captureConsole: true, "timeout": 600000 }, }, "pingTimeout": 600000, + "browserNoActivityTimeout": 600000, "browserDisconnectTimeout": 600000 }); \ No newline at end of file From 260bab61b8da742120c8641dc07de3f0df015eb4 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 21:32:15 +0200 Subject: [PATCH 13/17] remove captureConsole --- arrow-libs/core/arrow-continuations/build.gradle | 1 + arrow-libs/core/arrow-core-test/build.gradle | 1 + arrow-libs/core/arrow-core/build.gradle | 1 + arrow-libs/fx/arrow-fx-coroutines-test/build.gradle | 1 + arrow-libs/fx/arrow-fx-coroutines/build.gradle | 1 + arrow-libs/fx/arrow-fx-stm/build.gradle | 1 + arrow-libs/karma.config.d/karma.conf.js | 7 +++---- 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arrow-libs/core/arrow-continuations/build.gradle b/arrow-libs/core/arrow-continuations/build.gradle index b24c0c70d7f..982b76ab59e 100644 --- a/arrow-libs/core/arrow-continuations/build.gradle +++ b/arrow-libs/core/arrow-continuations/build.gradle @@ -56,6 +56,7 @@ kotlin { jsTest { dependencies { implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } } } diff --git a/arrow-libs/core/arrow-core-test/build.gradle b/arrow-libs/core/arrow-core-test/build.gradle index 26f0e5fa073..c2d77f16f1b 100644 --- a/arrow-libs/core/arrow-core-test/build.gradle +++ b/arrow-libs/core/arrow-core-test/build.gradle @@ -51,6 +51,7 @@ kotlin { jsTest { dependencies { implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } } } diff --git a/arrow-libs/core/arrow-core/build.gradle b/arrow-libs/core/arrow-core/build.gradle index 01ed360328c..73c6361f018 100644 --- a/arrow-libs/core/arrow-core/build.gradle +++ b/arrow-libs/core/arrow-core/build.gradle @@ -59,6 +59,7 @@ kotlin { jsTest { dependencies { implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } } } diff --git a/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle b/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle index a09a7490082..28e8ccdca10 100644 --- a/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle +++ b/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle @@ -46,6 +46,7 @@ kotlin { jsTest { dependencies { implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } } } diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle b/arrow-libs/fx/arrow-fx-coroutines/build.gradle index e7428f67dd7..af7037a0847 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/build.gradle +++ b/arrow-libs/fx/arrow-fx-coroutines/build.gradle @@ -60,6 +60,7 @@ kotlin { jsTest { dependencies { implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } } } diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle b/arrow-libs/fx/arrow-fx-stm/build.gradle index 43fd387a504..1bb8d4f80f5 100644 --- a/arrow-libs/fx/arrow-fx-stm/build.gradle +++ b/arrow-libs/fx/arrow-fx-stm/build.gradle @@ -59,6 +59,7 @@ kotlin { jsTest { dependencies { implementation "io.kotest:kotest-framework-engine:$KOTEST_VERSION" + } } } diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js index d3367e6a4fa..bab76e41ba2 100644 --- a/arrow-libs/karma.config.d/karma.conf.js +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -16,11 +16,10 @@ config.set({ }, "client": { "mocha": { - captureConsole: true, "timeout": 600000 }, }, - "pingTimeout": 600000, - "browserNoActivityTimeout": 600000, - "browserDisconnectTimeout": 600000 +// "pingTimeout": 600000, +// "browserNoActivityTimeout": 600000, +// "browserDisconnectTimeout": 600000 }); \ No newline at end of file From 350d14e5e78934d573ce4b1c5802d29c60183a8c Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 21:51:10 +0200 Subject: [PATCH 14/17] Re-add pingTimeout --- arrow-libs/karma.config.d/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js index bab76e41ba2..4bab8ae987d 100644 --- a/arrow-libs/karma.config.d/karma.conf.js +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -19,7 +19,7 @@ config.set({ "timeout": 600000 }, }, -// "pingTimeout": 600000, + "pingTimeout": 600000, // "browserNoActivityTimeout": 600000, // "browserDisconnectTimeout": 600000 }); \ No newline at end of file From f6efbfb96ee9211ae1e669bb27c6a8941cacdca7 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 22:03:42 +0200 Subject: [PATCH 15/17] Re-add browser disconnect --- arrow-libs/karma.config.d/karma.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arrow-libs/karma.config.d/karma.conf.js b/arrow-libs/karma.config.d/karma.conf.js index 4bab8ae987d..04e521e1406 100644 --- a/arrow-libs/karma.config.d/karma.conf.js +++ b/arrow-libs/karma.config.d/karma.conf.js @@ -20,6 +20,6 @@ config.set({ }, }, "pingTimeout": 600000, -// "browserNoActivityTimeout": 600000, -// "browserDisconnectTimeout": 600000 + "browserNoActivityTimeout": 600000, + "browserDisconnectTimeout": 600000 }); \ No newline at end of file From 24373372396ab2a3d5f0f5205cd38f702a4baa81 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 22:21:23 +0200 Subject: [PATCH 16/17] Retrigger CI second time From e37baa3a1b2b109dfc9f784725fd1bc2c9683c52 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 8 Jul 2021 22:36:57 +0200 Subject: [PATCH 17/17] Retrigger CI 3rd time