diff --git a/libraries/kotlin.test/js/it/build.gradle b/libraries/kotlin.test/js/it/build.gradle index 1d4a40fe003..7b00ce34732 100644 --- a/libraries/kotlin.test/js/it/build.gradle +++ b/libraries/kotlin.test/js/it/build.gradle @@ -21,7 +21,7 @@ task populateNodeModules(type: Copy, dependsOn: compileKotlin2Js) { from zipTree(it.absolutePath).matching { include '*.js' } } - into "${buildDir}/classes" + into "${buildDir}/node_modules" } node { diff --git a/libraries/kotlin.test/js/it/js/paths.js b/libraries/kotlin.test/js/it/js/paths.js deleted file mode 100644 index 26188f99769..00000000000 --- a/libraries/kotlin.test/js/it/js/paths.js +++ /dev/null @@ -1,5 +0,0 @@ -var paths = require('app-module-path'); - -paths.addPath('build/classes'); -paths.addPath('build/classes/main'); -paths.addPath('build/classes/test'); diff --git a/libraries/kotlin.test/js/it/package.json b/libraries/kotlin.test/js/it/package.json index 72d16ca1641..fd7b8dadc16 100644 --- a/libraries/kotlin.test/js/it/package.json +++ b/libraries/kotlin.test/js/it/package.json @@ -1,39 +1,20 @@ { - "name": "it", - "version": "1.0.0", - "description": "", - "main": "js/index.js", "scripts": { - "test-jasmine": "jasmine js/paths.js js/jasmine-reporter.js build/classes/test/kotlin-test-js-it_test.js", + "test-jasmine": "jasmine js/jasmine-reporter.js build/classes/test/kotlin-test-js-it_test.js", "test-jest": "jest", - "test-mocha": "mocha -r js/paths.js --reporter js/mocha-reporter.js build/classes/test/kotlin-test-js-it_test.js", - "test-qunit": "qunit -c js/paths.js -d js/qunit-reporter.js -t build/classes/test/kotlin-test-js-it_test.js", - "test-tape": "tape js/paths.js 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/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" }, - "author": "", - "license": "ISC", "devDependencies": { - "app-module-path": "^2.2.0", "jasmine": "^2.6.0", "jest": "^20.0.4", "mocha": "^3.4.2", "qunit": "^1.0.0", - "tape": "^4.6.3", - "watchify": "^3.9.0" + "tape": "^4.6.3" }, "jest": { - "verbose": true, - "roots": [ - "/build/classes/", - "/build/classes/main/", - "/build/classes/test/" - ], "testResultsProcessor": "/js/jest-reporter.js", - "testRegex": "_test\\.js$", - "moduleNameMapper": { - "^kotlin$": "/build/classes/kotlin.js", - "^kotlin-test$": "/build/classes/kotlin-test.js", - "^kotlin-test-js-it_main$": "/build/classes/main/kotlin-test-js-it_main.js" - } + "testRegex": "_test\\.js$" } }