Commit 7103893
fs: fix wrong order of file names in cpSync error message
PR-URL: #59775
Reviewed-By: Dario Piotrowicz <dario.piotrowicz@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent f291eda commit 7103893
2 files changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3157,7 +3157,7 @@ static void CpSyncCheckPaths(const FunctionCallbackInfo<Value>& args) { | |||
| 3157 | 3157 | std::string message = | |
| 3158 | 3158 | "Cannot overwrite non-directory %s with directory %s"; | |
| 3159 | 3159 | return THROW_ERR_FS_CP_DIR_TO_NON_DIR( | |
| 3160 | - env, message.c_str(), src_path_str, dest_path_str); | ||
| 3160 | + env, message.c_str(), dest_path_str, src_path_str); | ||
| 3161 | 3161 | } | |
| 3162 | 3162 | ||
| 3163 | 3163 | if (!src_is_dir && dest_is_dir) { | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,11 +14,11 @@ if (isInsideDirWithUnusualChars) { | |||
| 14 | 14 | tmpdir.refresh(); | |
| 15 | 15 | ||
| 16 | 16 | { | |
| 17 | - const src = nextdir(); | ||
| 17 | + const src = nextdir('FIRST_DIRECTORY'); | ||
| 18 | 18 | mkdirSync(src, mustNotMutateObjectDeep({ recursive: true })); | |
| 19 | 19 | const dest = fixtures.path('copy/kitchen-sink/README.md'); | |
| 20 | 20 | assert.throws( | |
| 21 | 21 | () => cpSync(src, dest), | |
| 22 | - { code: 'ERR_FS_CP_DIR_TO_NON_DIR' } | ||
| 22 | + { code: 'ERR_FS_CP_DIR_TO_NON_DIR', message: /non-directory .*README\.md with directory .*FIRST_DIRECTORY/ } | ||
| 23 | 23 | ); | |
| 24 | 24 | } | |
0 commit comments