Skip to content

Commit 746efe7

Browse files
committed
chore(windows): fix the test.unit.tools task
1 parent ecb2bd0 commit 746efe7

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

tools/broccoli/broccoli-flatten.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
let mockfs = require('mock-fs');
55
import fs = require('fs');
6+
import path = require('path');
67
import {TreeDiffer} from './tree-differ';
78
import {DiffingFlatten} from './broccoli-flatten';
89

@@ -69,6 +70,7 @@ describe('Flatten', () => {
6970
let differ = new TreeDiffer('testLabel', 'input');
7071
let flattenedTree = flatten('input');
7172
expect(() => flattenedTree.rebuild(differ.diffTree()))
72-
.toThrowError("Duplicate file 'file-1.txt' found in path 'dir1/subdir-1/file-1.txt'");
73+
.toThrowError("Duplicate file 'file-1.txt' found in path 'dir1" + path.sep + "subdir-1" +
74+
path.sep + "file-1.txt'");
7375
});
7476
});

tools/broccoli/tree-differ.spec.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
let mockfs = require('mock-fs');
55
import fs = require('fs');
6+
import path = require('path');
67
import {TreeDiffer} from './tree-differ';
78

89

@@ -30,7 +31,8 @@ describe('TreeDiffer', () => {
3031

3132
let diffResult = differ.diffTree();
3233

33-
expect(diffResult.addedPaths).toEqual(['file-1.txt', 'file-2.txt', 'subdir-1/file-1.1.txt']);
34+
expect(diffResult.addedPaths)
35+
.toEqual(['file-1.txt', 'file-2.txt', 'subdir-1' + path.sep + 'file-1.1.txt']);
3436

3537
expect(diffResult.changedPaths).toEqual([]);
3638
expect(diffResult.removedPaths).toEqual([]);
@@ -82,7 +84,8 @@ describe('TreeDiffer', () => {
8284

8385
let diffResult = differ.diffTree();
8486

85-
expect(diffResult.addedPaths).toEqual(['file-1.txt', 'file-2.txt', 'subdir-1/file-1.1.txt']);
87+
expect(diffResult.addedPaths)
88+
.toEqual(['file-1.txt', 'file-2.txt', 'subdir-1' + path.sep + 'file-1.1.txt']);
8689

8790
// change two files
8891
testDir['dir1']['file-1.txt'] = mockfs.file({content: 'new content', mtime: new Date(1000)});
@@ -92,7 +95,8 @@ describe('TreeDiffer', () => {
9295

9396
diffResult = differ.diffTree();
9497

95-
expect(diffResult.changedPaths).toEqual(['file-1.txt', 'subdir-1/file-1.1.txt']);
98+
expect(diffResult.changedPaths)
99+
.toEqual(['file-1.txt', 'subdir-1' + path.sep + 'file-1.1.txt']);
96100

97101
expect(diffResult.removedPaths).toEqual([]);
98102

@@ -127,7 +131,8 @@ describe('TreeDiffer', () => {
127131

128132
let diffResult = differ.diffTree();
129133

130-
expect(diffResult.addedPaths).toEqual(['file-1.txt', 'file-2.txt', 'subdir-1/file-1.1.txt']);
134+
expect(diffResult.addedPaths)
135+
.toEqual(['file-1.txt', 'file-2.txt', 'subdir-1' + path.sep + 'file-1.1.txt']);
131136

132137
// change two files
133138
testDir['orig_path']['file-1.txt'] =
@@ -139,7 +144,8 @@ describe('TreeDiffer', () => {
139144
diffResult = differ.diffTree();
140145

141146
expect(diffResult.addedPaths).toEqual([]);
142-
expect(diffResult.changedPaths).toEqual(['file-1.txt', 'subdir-1/file-1.1.txt']);
147+
expect(diffResult.changedPaths)
148+
.toEqual(['file-1.txt', 'subdir-1' + path.sep + 'file-1.1.txt']);
143149
expect(diffResult.removedPaths).toEqual([]);
144150

145151
// change one file

0 commit comments

Comments
 (0)