Skip to content

Commit 0ff3bf1

Browse files
authored
fix node tests in subdirs (#807)
1 parent 8decadd commit 0ff3bf1

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.12.34+1
2+
3+
* Fixed an issue `--precompiled` node tests in subdirectories.
4+
15
## 0.12.34
26

37
* Requires at least Dart 1.24.0.

lib/src/runner/node/platform.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@ class NodePlatform extends PlatformPlugin
194194
int socketPort,
195195
String precompiledPath) async {
196196
StackTraceMapper mapper;
197-
var jsPath =
198-
p.join(precompiledPath, p.basename(testPath) + ".node_test.dart.js");
199-
197+
var jsPath = p.join(precompiledPath, '$testPath.node_test.dart.js');
200198
if (!suiteConfig.jsTrace) {
201199
var mapPath = jsPath + '.map';
202200
var resolver = await SyncPackageResolver

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: test
2-
version: 0.12.34
2+
version: 0.12.34+1
33
author: Dart Team <[email protected]>
44
description: A library for writing dart unit tests.
55
homepage: https://github.com/dart-lang/test

test/runner/precompiled_test.dart

+14-7
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,25 @@ void main() {
7171
group("node tests", () {
7272
test("run a precompiled version of a test rather than recompiling",
7373
() async {
74-
await d.file("test.dart", """
74+
await d.dir("test", [
75+
d.file("test.dart", """
7576
import "package:test/src/bootstrap/node.dart";
7677
import "package:test/test.dart";
7778
7879
void main() {
7980
internalBootstrapNodeTest(() => () => test("success", () {
8081
expect(true, isTrue);
8182
}));
82-
}""").create();
83+
}""")
84+
]).create();
8385
await _writePackagesFile();
8486

85-
var jsPath = p.join(d.sandbox, "test.dart.node_test.dart.js");
87+
var jsPath = p.join(d.sandbox, "test", "test.dart.node_test.dart.js");
8688
var dart2js = await TestProcess.start(
8789
p.join(sdkDir, "bin", "dart2js"),
8890
[
8991
await PackageResolver.current.processArgument,
90-
"test.dart",
92+
p.join("test", "test.dart"),
9193
"--out=$jsPath",
9294
],
9395
workingDirectory: d.sandbox);
@@ -97,10 +99,15 @@ void main() {
9799
await jsFile.writeAsString(
98100
preamble.getPreamble(minified: true) + await jsFile.readAsString());
99101

100-
await d.file("test.dart", "invalid dart}").create();
102+
await d.dir("test", [d.file("test.dart", "invalid dart}")]).create();
101103

102-
var test = await runTest(
103-
["-p", "node", "--precompiled", d.sandbox, "test.dart"]);
104+
var test = await runTest([
105+
"-p",
106+
"node",
107+
"--precompiled",
108+
d.sandbox,
109+
p.join("test", "test.dart")
110+
]);
104111
expect(test.stdout,
105112
containsInOrder(["+0: success", "+1: All tests passed!"]));
106113
await test.shouldExit(0);

0 commit comments

Comments
 (0)