Merge pull request #78 from xzyfer/fix/broken-tests

Fix failing tests for copyDirSyncRecursive.
ryanmcgrath · Feb 10, 2014 · 6b80b65 · 6b80b65
2 parents 1b4ef04 + b46a972
commit 6b80b65
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/tests/copydirsync_unix.js b/tests/copydirsync_unix.js
@@ -92,7 +92,6 @@ module.exports = testCase({
 
  test.ok(fs.existsSync(dir), 'Folders should exist');
 
- wrench.mkdirSyncRecursive(testdir, 0777);
  wrench.copyDirSyncRecursive(dir, testdir, { excludeHiddenUnix: false });
 
  var files = wrench.readdirSyncRecursive(testdir);
@@ -109,7 +108,6 @@ module.exports = testCase({
 
  test.ok(fs.existsSync(dir), 'Folders should exist');
 
- wrench.mkdirSyncRecursive(testdir, 0777);
  wrench.copyDirSyncRecursive(dir, testdir, { excludeHiddenUnix: true });
 
  var files = wrench.readdirSyncRecursive(testdir);
@@ -126,7 +124,6 @@ module.exports = testCase({
 
  test.ok(fs.existsSync(dir), 'Folders should exist');
 
- wrench.mkdirSyncRecursive(testdir, 0777);
  wrench.copyDirSyncRecursive(dir, testdir, { excludeHiddenUnix: false, inflateSymlinks: true });
 
  var files = wrench.readdirSyncRecursive(testdir);
@@ -143,7 +140,6 @@ module.exports = testCase({
 
  test.ok(fs.existsSync(dir), 'Folders should exist');
 
- wrench.mkdirSyncRecursive(testdir, 0777);
  wrench.copyDirSyncRecursive(dir, testdir, { excludeHiddenUnix: false, inflateSymlinks: false });
 
  var files = wrench.readdirSyncRecursive(testdir);
@@ -161,14 +157,14 @@ module.exports = testCase({
 
  test.ok(fs.existsSync(dir), 'Folders should exist');
 
- wrench.mkdirSyncRecursive(testdir1, 0777);
+ // wrench.mkdirSyncRecursive(testdir1, 0777);
  wrench.copyDirSyncRecursive(dir, testdir1, { excludeHiddenUnix: false });
  wrench.copyDirSyncRecursive(dir, testdir2, { excludeHiddenUnix: false });
 
  fs.writeFileSync(path.join(testdir1, ".hidden.txt"), 'just some text for .hidden.txt');
  fs.writeFileSync(path.join(testdir1, "bar.txt"), 'just some text for bar.txt');
 
- wrench.copyDirSyncRecursive(testdir1, testdir2, { preserve: true, excludeHiddenUnix: false, preserveFiles: true });
+ wrench.copyDirSyncRecursive(testdir1, testdir2, { excludeHiddenUnix: false, preserveFiles: true });
 
  var files = wrench.readdirSyncRecursive(testdir2);
 
@@ -186,14 +182,14 @@ module.exports = testCase({
 
  test.ok(fs.existsSync(dir), 'Folders should exist');
 
- wrench.mkdirSyncRecursive(testdir1, 0777);
+ // wrench.mkdirSyncRecursive(testdir1, 0777);
  wrench.copyDirSyncRecursive(dir, testdir1, { excludeHiddenUnix: false });
  wrench.copyDirSyncRecursive(dir, testdir2, { excludeHiddenUnix: false });
 
  fs.writeFileSync(path.join(testdir1, ".hidden.txt"), 'just some text for .hidden.txt');
  fs.writeFileSync(path.join(testdir1, "bar.txt"), 'just some text for bar.txt');
 
- wrench.copyDirSyncRecursive(testdir1, testdir2, { preserve: true, excludeHiddenUnix: false, preserveFiles: false });
+ wrench.copyDirSyncRecursive(testdir1, testdir2, { forceDelete: true, excludeHiddenUnix: false, preserveFiles: false });
 
  var files = wrench.readdirSyncRecursive(testdir2);