address code review fix tests

Author: bcoe

doc/api/errors.md

@@ -1127,7 +1127,7 @@ added: REPLACEME
 -->
 
 An attempt was made to copy over a file that already existed with
-[`fs.copy()`][], with the `overwrite` and `errorOnExist` set to `true`.
+[`fs.copy()`][], with the `force` and `errorOnExist` set to `true`.
 
 <a id="ERR_FS_COPY_FIFO_PIPE"></a>
 ### `ERR_FS_COPY_FIFO_PIPE`
@@ -1169,7 +1169,7 @@ of `src`.
 added: REPLACEME
 -->
 
-When using [`fs.copy()`][], `dest` pointed to a subfolder in `src`.
+When using [`fs.copy()`][], `dest` pointed to a subdirectory in `src`.
 
 <a id="ERR_FS_COPY_UNKNOWN"></a>
 ### `ERR_FS_COPY_UNKNOWN`

doc/api/fs.md

@@ -4267,7 +4267,7 @@ through any other `fs` operation may lead to undefined behavior.
 
 See the POSIX close(2) documentation for more detail.
 
-### `fs.copy(src, dest[, options])`
+### `fs.copySync(src, dest[, options])`
 <!-- YAML
 added: REPLACEME
 -->

lib/internal/fs/copy/copy-sync.js

@@ -33,12 +33,10 @@ const {
 const fs = require('fs');
 const {
   chmodSync,
-  closeSync,
   copyFileSync,
   existsSync,
   lstatSync,
   mkdirSync,
-  openSync,
   readdirSync,
   readlinkSync,
   statSync,
@@ -57,7 +55,7 @@ const {
 function copySyncFn(src, dest, opts) {
   // Warn about using preserveTimestamps on 32-bit node
   if (opts.preserveTimestamps && process.arch === 'ia32') {
-    const warning = 'Using the preserveTimestamps option in 32-bit' +
+    const warning = 'Using the preserveTimestamps option in 32-bit ' +
       'node is not recommended';
     process.emitWarning(warning, 'TimestampPrecisionWarning');
   }
@@ -73,7 +71,7 @@ function checkPathsSync(src, dest, opts) {
     if (areIdentical(srcStat, destStat)) {
       throw new ERR_FS_COPY_TO_SUBDIRECTORY({
         code: 'EINVAL',
-        message: 'src and dest cannot be the same directory',
+        message: 'src and dest cannot be the same',
         path: dest,
         syscall: 'copy',
         errno: EINVAL,

lib/internal/fs/copy/copy.js

@@ -46,7 +46,6 @@ const {
   copyFile,
   lstat,
   mkdir,
-  open,
   readdir,
   readlink,
   stat,
@@ -66,7 +65,7 @@ const {
 async function copyFn(src, dest, opts) {
   // Warn about using preserveTimestamps on 32-bit node
   if (opts.preserveTimestamps && process.arch === 'ia32') {
-    const warning = 'Using the preserveTimestamps option in 32-bit' +
+    const warning = 'Using the preserveTimestamps option in 32-bit ' +
       'node is not recommended';
     process.emitWarning(warning, 'TimestampPrecisionWarning');
   }
@@ -86,7 +85,7 @@ async function checkPaths(src, dest, opts) {
     if (areIdentical(srcStat, destStat)) {
       throw new ERR_FS_COPY_TO_SUBDIRECTORY({
         code: 'EINVAL',
-        message: 'src and dest cannot be the same directory',
+        message: 'src and dest cannot be the same',
         path: dest,
         syscall: 'copy',
         errno: EINVAL,

test/parallel/test-fs-copy.js

@@ -12,6 +12,7 @@ const {
   lstatSync,
   mkdirSync,
   readdirSync,
+  readFileSync,
   symlinkSync,
   statSync,
   writeFileSync,
@@ -58,16 +59,13 @@ function nextdir() {
 {
   const src = dirname(require.resolve('../fixtures/copy/kitchen-sink'));
   const dest = nextdir();
-  copySync(src, dest);
-  const initialStat = lstatSync(join(dest, 'README.md'));
+  mkdirSync(dest, { recursive: true });
+  writeFileSync(join(dest, 'README.md'), '# Goodbye\n', 'utf8');
+
   copy(src, dest, { force: true }, common.mustCall((err) => {
     assertDirEquivalent(src, dest);
-    // File was copied over, so creation time will differ.
-    const finalStat = lstatSync(join(dest, 'README.md'));
-    assert.notStrictEqual(
-      finalStat.ctime.getTime(),
-      initialStat.ctime.getTime()
-    );
+    const content = readFileSync(join(dest, 'README.md'), 'utf8');
+    assert.strictEqual(content, '# Hello\n');
   }));
 }
 
@@ -120,7 +118,10 @@ function nextdir() {
 
 // It returns error if symlink in dest points to location in src.
 {
-  const src = dirname(require.resolve('../fixtures/copy/kitchen-sink'));
+  const src = nextdir();
+  mkdirSync(join(src, 'a', 'b'), { recursive: true });
+  symlinkSync(join(src, 'a', 'b'), join(src, 'a', 'c'));
+
   const dest = nextdir();
   mkdirSync(join(dest, 'a'), { recursive: true });
   symlinkSync(src, join(dest, 'a', 'c'));
@@ -248,7 +249,10 @@ if (!isWindows) {
 
 // It returns EEXIST error if attempt is made to copy symlink over file.
 {
-  const src = dirname(require.resolve('../fixtures/copy/kitchen-sink'));
+  const src = nextdir();
+  mkdirSync(join(src, 'a', 'b'), { recursive: true });
+  symlinkSync(join(src, 'a', 'b'), join(src, 'a', 'c'));
+
   const dest = nextdir();
   mkdirSync(join(dest, 'a'), { recursive: true });
   writeFileSync(join(dest, 'a', 'c'), 'hello', 'utf8');