[Tests] Clean up tests (#1787)

andreidubov · web-flow · commit f95194fece49 · 2020-02-10T15:14:17.000+03:00
diff --git a/code-push-plugin-testing-framework/package.json b/code-push-plugin-testing-framework/package.json
@@ -16,14 +16,15 @@
   "license": "MIT",
   "homepage": "https://microsoft.github.io/code-push",
   "dependencies": {
+    "@types/uuid": "^3.4.7",
     "base-64": "^0.1.0",
     "mocha": "latest",
     "mocha-junit-reporter": "latest",
-    "node-uuid": "^1.4.8",
     "q": "^1.5.1",
     "replace": "latest",
-    "superagent": "^3.8.3",
-    "superagent-proxy": "^1.0.3"
+    "superagent": "^5.2.1",
+    "superagent-proxy": "^1.0.3",
+    "uuid": "^3.4.0"
   },
   "bugs": {
     "url": "https://github.com/Microsoft/code-push/issues"
diff --git a/code-push-plugin-testing-framework/script/platform.js b/code-push-plugin-testing-framework/script/platform.js
@@ -1,7 +1,6 @@
 "use strict";
 var Q = require("q");
 var testUtil_1 = require("./testUtil");
-var TestConfig = require("./testConfig");
 //////////////////////////////////////////////////////////////////////////////////////////
 // PLATFORMS
 /**
diff --git a/code-push-plugin-testing-framework/script/serverUtil.js b/code-push-plugin-testing-framework/script/serverUtil.js
@@ -1,7 +1,7 @@
 "use strict";
 // IMPORTS
 var assert = require("assert");
-var bodyparser = require("body-parser");
+var bodyParser = require("body-parser");
 var express = require("express");
 var Q = require("q");
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -12,8 +12,8 @@ var Q = require("q");
 function setupServer(targetPlatform) {
     console.log("Setting up server at " + targetPlatform.getServerUrl());
     var app = express();
-    app.use(bodyparser.json());
-    app.use(bodyparser.urlencoded({ extended: true }));
+    app.use(bodyParser.json());
+    app.use(bodyParser.urlencoded({ extended: true }));
     app.use(function (req, res, next) {
         res.setHeader("Access-Control-Allow-Origin", "*");
         res.setHeader("Access-Control-Allow-Methods", "*");
diff --git a/code-push-plugin-testing-framework/script/test.js b/code-push-plugin-testing-framework/script/test.js
@@ -54,10 +54,10 @@ function initializeTests(projectManager, supportedTargetPlatforms, describeTests
             // create the test project
             promises.push(createTestProject(TestConfig.testRunDirectory)
                 .then(function () {
-                console.log("Building update project.");
-                // create the update project
-                return createTestProject(TestConfig.updatesDirectory);
-            }).then(function () { return null; }));
+                    console.log("Building update project.");
+                    // create the update project
+                    return createTestProject(TestConfig.updatesDirectory);
+                }).then(function () { return null; }));
             Q.all(promises).then(function () { done(); }, function (error) { done(error); });
         });
     }
diff --git a/code-push-plugin-testing-framework/script/testUtil.js b/code-push-plugin-testing-framework/script/testUtil.js
@@ -1,7 +1,6 @@
 "use strict";
 var archiver = require("archiver");
 var child_process = require("child_process");
-var del = require("del");
 var fs = require("fs");
 var replace = require("replace");
 var Q = require("q");
diff --git a/test/template/codePushWrapper.js b/test/template/codePushWrapper.js
@@ -3,25 +3,25 @@ import CodePush from "react-native-code-push";
 // This module wraps CodePush API calls to add test message callbacks to every function for simpler test code.
 
 module.exports = {
-    checkForUpdate: function(testApp, onSuccess, onError, deploymentKey) {
+    checkForUpdate: function (testApp, onSuccess, onError, deploymentKey) {
         return CodePush.checkForUpdate(deploymentKey)
             .then((remotePackage) => {
                 return testApp.checkUpdateSuccess(remotePackage).then(() => { return onSuccess && onSuccess(remotePackage); });
             }, (error) => {
                 return testApp.checkUpdateError(error).then(() => { return onError && onError(error); });
             });
     },
-    
-    download: function(testApp, onSuccess, onError, remotePackage) {
+
+    download: function (testApp, onSuccess, onError, remotePackage) {
         return remotePackage.download()
             .then((localPackage) => {
                 return testApp.downloadSuccess(localPackage).then(() => { return onSuccess && onSuccess(localPackage); });
             }, (error) => {
                 return testApp.downloadError(error).then(() => { return onError && onError(error); });
             });
     },
-    
-    install: function(testApp, onSuccess, onError, installMode, minBackgroundDuration, localPackage) {
+
+    install: function (testApp, onSuccess, onError, installMode, minBackgroundDuration, localPackage) {
         return localPackage.install(installMode, minBackgroundDuration)
             .then(() => {
                 // Since immediate installs cannot be reliably logged (due to async network calls), we only log "UPDATE_INSTALLED" if it is a resume or restart update.
@@ -31,14 +31,14 @@ module.exports = {
                 return testApp.installError().then(() => { return onError && onError(); });
             });
     },
-    
-    checkAndInstall: function(testApp, onSuccess, onError, installMode, minBackgroundDuration) {
+
+    checkAndInstall: function (testApp, onSuccess, onError, installMode, minBackgroundDuration) {
         var installUpdate = this.install.bind(this, testApp, onSuccess, onError, installMode, minBackgroundDuration);
         var downloadUpdate = this.download.bind(this, testApp, installUpdate, onError);
         return this.checkForUpdate(testApp, downloadUpdate, onError);
     },
-    
-    sync: function(testApp, onSyncStatus, onSyncError, options) {
+
+    sync: function (testApp, onSyncStatus, onSyncError, options) {
         return CodePush.checkForUpdate()
             .then(
                 (remotePackage) => {
@@ -48,7 +48,7 @@ module.exports = {
                     var regularUpdateIsImmediate = options && options.installMode === CodePush.InstallMode.IMMEDIATE;
                     var mandatoryUpdateIsImmediate = !options || (options && (!options.mandatoryInstallMode || options.mandatoryInstallMode === CodePush.InstallMode.IMMEDIATE));
                     var isInstallImmediate = (remotePackage && remotePackage.isMandatory) ? mandatoryUpdateIsImmediate : regularUpdateIsImmediate;
-                    
+
                     return CodePush.sync(options)
                         .then((status) => {
                             if (!(isInstallImmediate && status === CodePush.SyncStatus.UPDATE_INSTALLED)) {
diff --git a/test/template/scenarios/scenarioCheckForUpdate.js b/test/template/scenarios/scenarioCheckForUpdate.js
@@ -1,11 +1,11 @@
 var CodePushWrapper = require("../codePushWrapper.js");
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkForUpdate(testApp);
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Check for Update";
     }
-};
+}; 
diff --git a/test/template/scenarios/scenarioCheckForUpdateCustomKey.js b/test/template/scenarios/scenarioCheckForUpdateCustomKey.js
@@ -1,11 +1,11 @@
 var CodePushWrapper = require("../codePushWrapper.js");
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkForUpdate(testApp, undefined, undefined, "CUSTOM-DEPLOYMENT-KEY");
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Check for Update Custom Key";
     }
 };
diff --git a/test/template/scenarios/scenarioDownloadUpdate.js b/test/template/scenarios/scenarioDownloadUpdate.js
@@ -1,12 +1,12 @@
 var CodePushWrapper = require("../codePushWrapper.js");
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkForUpdate(testApp,
             CodePushWrapper.download.bind(undefined, testApp, undefined, undefined));
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Download Update";
     }
 };
diff --git a/test/template/scenarios/scenarioInstall.js b/test/template/scenarios/scenarioInstall.js
@@ -2,11 +2,11 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkAndInstall(testApp, undefined, undefined, CodePush.InstallMode.IMMEDIATE);
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Install";
     }
 };
diff --git a/test/template/scenarios/scenarioInstallOnRestartWithRevert.js b/test/template/scenarios/scenarioInstallOnRestartWithRevert.js
@@ -2,11 +2,11 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkAndInstall(testApp, undefined, undefined, CodePush.InstallMode.ON_NEXT_RESTART);
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Install on Restart with Revert";
     }
 };
diff --git a/test/template/scenarios/scenarioInstallOnResumeWithRevert.js b/test/template/scenarios/scenarioInstallOnResumeWithRevert.js
@@ -2,11 +2,11 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkAndInstall(testApp, undefined, undefined, CodePush.InstallMode.ON_NEXT_RESUME);
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Install on Resume with Revert";
     }
 };
diff --git a/test/template/scenarios/scenarioInstallRestart2x.js b/test/template/scenarios/scenarioInstallRestart2x.js
@@ -2,16 +2,16 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
-        CodePushWrapper.checkAndInstall(testApp, 
+    startTest: function (testApp) {
+        CodePushWrapper.checkAndInstall(testApp,
             () => {
                 CodePush.restartApp();
                 CodePush.restartApp();
             }
         );
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Install and Restart 2x";
     }
 };
diff --git a/test/template/scenarios/scenarioInstallWithRevert.js b/test/template/scenarios/scenarioInstallWithRevert.js
@@ -2,11 +2,11 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.checkAndInstall(testApp, undefined, undefined, CodePush.InstallMode.IMMEDIATE);
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Install with Revert";
     }
 };
diff --git a/test/template/scenarios/scenarioRestart.js b/test/template/scenarios/scenarioRestart.js
@@ -2,7 +2,7 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         testApp.sendCurrentAndPendingPackage()
             .then(() => {
                 CodePushWrapper.sync(testApp, (status) => {
@@ -12,8 +12,8 @@ module.exports = {
                 }, undefined, { installMode: CodePush.InstallMode.ON_NEXT_RESTART });
             });
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Restart";
     }
 };
diff --git a/test/template/scenarios/scenarioRestart2x.js b/test/template/scenarios/scenarioRestart2x.js
@@ -2,16 +2,16 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePush.restartApp(true);
-        CodePushWrapper.checkAndInstall(testApp, 
+        CodePushWrapper.checkAndInstall(testApp,
             () => {
                 CodePush.restartApp(true);
             }
         );
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Restart2x";
     }
 };
diff --git a/test/template/scenarios/scenarioSync.js b/test/template/scenarios/scenarioSync.js
@@ -2,11 +2,11 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.sync(testApp, undefined, undefined, { installMode: CodePush.InstallMode.IMMEDIATE });
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Sync";
     }
 };
diff --git a/test/template/scenarios/scenarioSync2x.js b/test/template/scenarios/scenarioSync2x.js
@@ -2,12 +2,12 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.sync(testApp, undefined, undefined, { installMode: CodePush.InstallMode.IMMEDIATE });
         CodePushWrapper.sync(testApp, undefined, undefined, { installMode: CodePush.InstallMode.IMMEDIATE });
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Sync 2x";
     }
 };
diff --git a/test/template/scenarios/scenarioSyncMandatoryDefault.js b/test/template/scenarios/scenarioSyncMandatoryDefault.js
@@ -2,11 +2,11 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.sync(testApp, undefined, undefined, { installMode: CodePush.InstallMode.ON_NEXT_RESTART });
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Sync Mandatory Default";
     }
 };
diff --git a/test/template/scenarios/scenarioSyncMandatoryRestart.js b/test/template/scenarios/scenarioSyncMandatoryRestart.js
@@ -2,13 +2,15 @@ var CodePushWrapper = require("../codePushWrapper.js");
 import CodePush from "react-native-code-push";
 
 module.exports = {
-    startTest: function(testApp) {
+    startTest: function (testApp) {
         CodePushWrapper.sync(testApp, undefined, undefined,
-            { installMode: CodePush.InstallMode.IMMEDIATE,
-                mandatoryInstallMode: CodePush.InstallMode.ON_NEXT_RESTART });
+            {
+                installMode: CodePush.InstallMode.IMMEDIATE,
+                mandatoryInstallMode: CodePush.InstallMode.ON_NEXT_RESTART
+            });
     },
-    
-    getScenarioName: function() {
+
+    getScenarioName: function () {
         return "Sync Mandatory Restart";
     }
 };
diff --git a/test/template/scenarios/scenarioSyncMandatoryResume.js b/test/template/scenarios/scenarioSyncMandatoryResume.js
diff --git a/test/template/scenarios/scenarioSyncRestartDelay.js b/test/template/scenarios/scenarioSyncRestartDelay.js
diff --git a/test/template/scenarios/scenarioSyncResume.js b/test/template/scenarios/scenarioSyncResume.js
diff --git a/test/template/scenarios/scenarioSyncResumeDelay.js b/test/template/scenarios/scenarioSyncResumeDelay.js
diff --git a/test/template/scenarios/updateDeviceReady.js b/test/template/scenarios/updateDeviceReady.js
diff --git a/test/template/scenarios/updateNARConditional.js b/test/template/scenarios/updateNARConditional.js
diff --git a/test/template/scenarios/updateNotifyApplicationReady.js b/test/template/scenarios/updateNotifyApplicationReady.js
diff --git a/test/template/scenarios/updateSync.js b/test/template/scenarios/updateSync.js
diff --git a/test/template/scenarios/updateSync2x.js b/test/template/scenarios/updateSync2x.js
