Run kotlin-test-js tests with kotlin-stdlib-js

Rework kotlin-test common tests to make them runnable with qunit. Change the way how asserter is overridden in js box tests. Minor: remove unneeded test configs
2017-04-19 07:40:22 +03:00
parent f009e0c665
commit ec8ead754f
12 changed files with 80 additions and 118 deletions
@@ -21,6 +21,8 @@ def jsSrcJsDir = "${jsSrcDir}/js"
 def jsOutputFile = "${buildDir}/classes/kotlin.js"
 def jsTestOutputFile = "${buildDir}/classes/test/kotlin-stdlib-js_test.js"
 def kotlinTestJsOutputFile = "${project(':kotlin-test:kotlin-test-js').buildDir}/classes/main/kotlin-test.js"
+def kotlinTestJsTestOutputFile = "${project(':kotlin-test:kotlin-test-js').buildDir}/classes/test/kotlin-test-js_test.js"
+

 sourceSets {
    builtins {
@@ -268,10 +270,13 @@ karma {
        sourceFiles = []

        testBases = ['']
-        testFiles = [jsTestOutputFile]
+        testFiles = [jsTestOutputFile, kotlinTestJsTestOutputFile]
    }
 }

 karmaGenerateConfig.outputs.upToDateWhen { false }
-karmaRun.dependsOn testClasses
+karmaRun {
+    dependsOn testClasses
+    dependsOn tasks.getByPath(':kotlin-test:kotlin-test-js:testClasses')
+}
 clean.dependsOn karmaClean
@@ -12,6 +12,7 @@
    <script src="../build/classes/kotlin.js"></script>
    <script src="../../../kotlin.test/js/build/classes/main/kotlin-test.js"></script>
    <script src="../build/classes/test/kotlin-stdlib-js_test.js"></script>
+    <script src="../../../kotlin.test/js/build/classes/test/kotlin-test-js_test.js"></script>
 </head>
 <body>
    <div id="qunit"></div>