Skip to content

Commit 935faf7

Browse files
authored
Use outputFileProperty instead of outputFile (#3460)
1 parent 4f1d41f commit 935faf7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

gradle/test-mocha-js.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def compileTestJsLegacy = tasks.hasProperty("compileTestKotlinJsLegacy")
2323
// todo: use atomicfu-transformed test files here (not critical)
2424
task testMochaNode(type: NodeTask, dependsOn: [compileTestJsLegacy, installDependenciesMochaNode]) {
2525
script = file("${node.nodeProjectDir.getAsFile().get()}/node_modules/mocha/bin/mocha")
26-
args = [compileTestJsLegacy.outputFile.path, '--require', 'source-map-support/register']
26+
args = [compileTestJsLegacy.outputFileProperty.get().path, '--require', 'source-map-support/register']
2727
if (project.hasProperty("teamcity")) args.addAll(['--reporter', 'mocha-teamcity-reporter'])
2828
}
2929

@@ -65,8 +65,8 @@ prepareMochaChrome.doLast {
6565
<script>mocha.setup('bdd');</script>
6666
<script src="$nodeProjDir/node_modules/kotlin/kotlin.js"></script>
6767
<script src="$nodeProjDir/node_modules/kotlin-test/kotlin-test.js"></script>
68-
<script src="$compileJsLegacy.outputFile"></script>
69-
<script src="$compileTestJsLegacy.outputFile"></script>
68+
<script src="${compileJsLegacy.outputFileProperty.get().path}"></script>
69+
<script src="${compileTestJsLegacy.outputFileProperty.get().path}"></script>
7070
<script>mocha.run();</script>
7171
</body>
7272
</html>
@@ -75,7 +75,7 @@ prepareMochaChrome.doLast {
7575

7676
task testMochaChrome(type: NodeTask, dependsOn: prepareMochaChrome) {
7777
script = file("${node.nodeProjectDir.getAsFile().get()}/node_modules/mocha-headless-chrome/bin/start")
78-
args = [compileTestJsLegacy.outputFile.path, '--file', mochaChromeTestPage]
78+
args = [compileTestJsLegacy.outputFileProperty.get().path, '--file', mochaChromeTestPage]
7979
if (project.hasProperty("teamcity")) args.addAll(['--reporter', 'mocha-teamcity-reporter'])
8080
}
8181

@@ -96,7 +96,7 @@ task installDependenciesMochaJsdom(type: NpmTask, dependsOn: [npmInstall]) {
9696

9797
task testMochaJsdom(type: NodeTask, dependsOn: [compileTestJsLegacy, installDependenciesMochaJsdom]) {
9898
script = file("${node.nodeProjectDir.getAsFile().get()}/node_modules/mocha/bin/mocha")
99-
args = [compileTestJsLegacy.outputFile.path, '--require', 'source-map-support/register', '--require', 'jsdom-global/register']
99+
args = [compileTestJsLegacy.outputFileProperty.get().path, '--require', 'source-map-support/register', '--require', 'jsdom-global/register']
100100
if (project.hasProperty("teamcity")) args.addAll(['--reporter', 'mocha-teamcity-reporter'])
101101
}
102102

0 commit comments

Comments
 (0)