Migration of CopyFilesV2 task to Node 10 (#13966)

* Migration to Node10 base part * Fixed typing errors * Revert unnecessary changes * Bump task version Co-authored-by: Anatoly Bolshakov <[email protected]> Co-authored-by: Egor Bryzgalov <[email protected]>
microsoft · Dec 7, 2020 · e3b749b · e3b749b
1 parent b1671b4
commit e3b749b
Show file tree

Hide file tree

Showing 15 changed files with 400 additions and 3,987 deletions.
diff --git a/Tasks/CopyFilesV2/Tests/L0.ts b/Tasks/CopyFilesV2/Tests/L0.ts
@@ -10,7 +10,7 @@ describe('CopyFiles L0 Suite', function () {
 
     after(() => { });
 
-    it('copy files from srcdir to destdir', (done: MochaDone) => {
+    it('copy files from srcdir to destdir', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0copyAllFiles.js');
@@ -50,7 +50,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('copy files from srcdir to destdir with brackets in src path', (done: MochaDone) => {
+    it('copy files from srcdir to destdir with brackets in src path', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0copyAllFilesWithBracketsInSrcPath.js');
@@ -90,7 +90,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('copy files and subtract based on exclude pattern', (done: MochaDone) => {
+    it('copy files and subtract based on exclude pattern', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0copySubtractExclude.js');
@@ -121,7 +121,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('fails if Contents not set', (done: MochaDone) => {
+    it('fails if Contents not set', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0failsIfContentsNotSet.js');
@@ -133,7 +133,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('fails if SourceFolder not set', (done: MochaDone) => {
+    it('fails if SourceFolder not set', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0failsIfSourceFolderNotSet.js');
@@ -145,7 +145,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('fails if TargetFolder not set', (done: MochaDone) => {
+    it('fails if TargetFolder not set', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0failsIfTargetFolderNotSet.js');
@@ -157,7 +157,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('fails if SourceFolder not found', (done: MochaDone) => {
+    it('fails if SourceFolder not found', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0failsIfSourceFolderNotFound.js');
@@ -169,7 +169,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('fails if target file is a directory', (done: MochaDone) => {
+    it('fails if target file is a directory', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0failsIfTargetFileIsDir.js');
@@ -206,7 +206,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('overwrites if specified', (done: MochaDone) => {
+    it('overwrites if specified', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0overwritesIfSpecified.js');
@@ -231,7 +231,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('preserves timestamp if specified', (done: MochaDone) => {
+    it('preserves timestamp if specified', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0preservesTimestampIfSpecified.js');
@@ -259,7 +259,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('cleans if specified', (done: MochaDone) => {
+    it('cleans if specified', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0cleansIfSpecified.js');
@@ -290,7 +290,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('cleans if specified and target is file', (done: MochaDone) => {
+    it('cleans if specified and target is file', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0cleansIfSpecifiedAndTargetIsFile.js');
@@ -318,7 +318,7 @@ describe('CopyFiles L0 Suite', function () {
         done();
     });
 
-    it('roots patterns', (done: MochaDone) => {
+    it('roots patterns', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let testPath = path.join(__dirname, 'L0rootsPatterns.js');
@@ -341,7 +341,7 @@ describe('CopyFiles L0 Suite', function () {
     });
 
     if (process.platform == 'win32') {
-        it('overwrites readonly', (done: MochaDone) => {
+        it('overwrites readonly', (done: Mocha.Done) => {
             this.timeout(1000);
 
             let testPath = path.join(__dirname, 'L0overwritesReadonly.js');

diff --git a/Tasks/CopyFilesV2/Tests/L0cleansIfSpecified.ts b/Tasks/CopyFilesV2/Tests/L0cleansIfSpecified.ts
@@ -41,9 +41,10 @@ runner.registerMockExport('stats', (itemPath: string) => {
     }
 });
 let origReaddirSync = fs.readdirSync;
-fs.readdirSync = (p: string | Buffer) => {
+
+fs.readdirSync = (p) => {
     console.log('HERE path ' + p);
-    let result: string[];
+    let result;
     if (p == path.normalize('/destDir')) {
         result = [ 'clean-subDir', 'clean-file.txt' ];
     }

diff --git a/Tasks/CopyFilesV2/Tests/L0preservesTimestampIfSpecified.ts b/Tasks/CopyFilesV2/Tests/L0preservesTimestampIfSpecified.ts
@@ -2,6 +2,7 @@ import fs = require('fs');
 import mockanswer = require('azure-pipelines-task-lib/mock-answer');
 import mockrun = require('azure-pipelines-task-lib/mock-run');
 import path = require('path');
+const { promisify } = require('util')
 
 let taskPath = path.join(__dirname, '..', 'copyfiles.js');
 let runner: mockrun.TaskMockRunner = new mockrun.TaskMockRunner(taskPath);
@@ -46,9 +47,9 @@ runner.registerMockExport('stats', (itemPath: string) => {
     }
 });
 
-fs.utimes = function (targetPath, atime, mtime, err) {
+fs.utimes = promisify(function (targetPath, atime, mtime, err) {
     console.log('Calling fs.utimes on', targetPath);
-}
+});
 runner.registerMock('fs', fs);
 
 runner.run();