diff --git a/libraries/kotlin.test/js/it/package.json b/libraries/kotlin.test/js/it/package.json index fd7b8dadc16..8d808ae8922 100644 --- a/libraries/kotlin.test/js/it/package.json +++ b/libraries/kotlin.test/js/it/package.json @@ -1,10 +1,10 @@ { "scripts": { - "test-jasmine": "jasmine js/jasmine-reporter.js build/classes/test/kotlin-test-js-it_test.js", + "test-jasmine": "jasmine js/jasmine-reporter.js build/classes/kotlin/test/kotlin-test-js-it_test.js", "test-jest": "jest", - "test-mocha": "mocha --reporter js/mocha-reporter.js build/classes/test/kotlin-test-js-it_test.js", - "test-qunit": "qunit -c js/qunit-reporter.js -t build/classes/test/kotlin-test-js-it_test.js", - "test-tape": "tape js/tape-reporter.js js/tape-plugin.js build/classes/test/kotlin-test-js-it_test.js" + "test-mocha": "mocha --reporter js/mocha-reporter.js build/classes/kotlin/test/kotlin-test-js-it_test.js", + "test-qunit": "qunit -c js/qunit-reporter.js -t build/classes/kotlin/test/kotlin-test-js-it_test.js", + "test-tape": "tape js/tape-reporter.js js/tape-plugin.js build/classes/kotlin/test/kotlin-test-js-it_test.js" }, "devDependencies": { "jasmine": "^2.6.0", diff --git a/libraries/stdlib/js/web/index.html b/libraries/stdlib/js/web/index.html index b701fcf925c..929b14fe729 100644 --- a/libraries/stdlib/js/web/index.html +++ b/libraries/stdlib/js/web/index.html @@ -11,8 +11,8 @@ - - + +
diff --git a/settings.gradle b/settings.gradle index 1f61490e952..272ba2463b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -89,7 +89,7 @@ include ":kotlin-build-common", ":kotlin-test:kotlin-test-jvm", ":kotlin-test:kotlin-test-junit", ":kotlin-test:kotlin-test-js", - ":kotlin-test:kotlin-test-js-it", + ":kotlin-test:kotlin-test-js:kotlin-test-js-it", ":kotlin-stdlib-common", ":kotlin-stdlib", ":kotlin-stdlib-js", @@ -143,7 +143,7 @@ project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotl project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/libraries/kotlin.test/jvm" as File project(':kotlin-test:kotlin-test-junit').projectDir = "$rootDir/libraries/kotlin.test/junit" as File project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File -project(':kotlin-test:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File +project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" as File project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js" as File