Merge pull request #127 from Microsoft/es6-es7-changes

ES7-ify project

Author: geof90

CodePush.js

@@ -1,17 +1,15 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   ScrollView,
   StyleSheet,
   Text,
   TouchableOpacity,
   View,
-} = React;
+} from "react-native";
 
-let TESTS = [
+const TESTS = [
   require("./testcases/FirstUpdateTest"),
   require("./testcases/NewUpdateTest"),
   require("./testcases/NoRemotePackageTest"),
@@ -38,6 +36,7 @@ let CheckForUpdateTestApp = React.createClass({
         </ScrollView>
       );
     }
+    
     return (
       <View style={styles.container}>
         <Text style={styles.row}>
@@ -64,7 +63,7 @@ let CheckForUpdateTestApp = React.createClass({
   }
 });
 
-let styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     backgroundColor: "white",
     marginTop: 40,

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/CheckForUpdateTestApp.js

@@ -2,13 +2,13 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
-
 import { serverPackage } from "../resources/testPackages";
+
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 const localPackage = {};
 
 let FirstUpdateTest = createTestCaseComponent(
@@ -18,20 +18,13 @@ let FirstUpdateTest = createTestCaseComponent(
     let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage);
     let mockConfiguration = { appVersion : "1.5.0" };
     CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
-    CodePush.getCurrentPackage = () => {
-      return Promise.resolve(localPackage);
-    }
-    return Promise.resolve();
+    CodePush.getCurrentPackage = async () => {
+      return localPackage;
+    };
   },
-  () => {
-    return CodePush.checkForUpdate()
-      .then((update) => {
-        if (update) {
-          assert.deepEqual(update, Object.assign(serverPackage, PackageMixins.remote));
-        } else {
-          throw new Error("checkForUpdate did not return the update from the server");
-        }
-      });
+  async () => {
+    let update = await CodePush.checkForUpdate();
+    assert.equal(JSON.stringify(update), JSON.stringify({ ...serverPackage, ...PackageMixins.remote, failedInstall: false }), "checkForUpdate did not return the update from the server");
   }
 );
 

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/FirstUpdateTest.js

@@ -2,36 +2,29 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
-
 import { serverPackage, localPackage } from "../resources/testPackages";
 
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+
 let NewUpdateTest = createTestCaseComponent(
   "NewUpdateTest",
   "should return an update when server has a package that is newer than the current one",
   () => {
     let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage);       
     let mockConfiguration = { appVersion : "1.5.0" };
     CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
-    CodePush.getCurrentPackage = () => {
-      return Promise.resolve(localPackage);
-    }
-    return Promise.resolve();
+    CodePush.getCurrentPackage = async () => {
+      return localPackage;
+    };
   },
-  () => {
-    return CodePush.checkForUpdate()
-      .then((update) => {
-        if (update) {
-          assert.deepEqual(update, Object.assign(serverPackage, PackageMixins.remote));
-        } else {
-          throw new Error("checkForUpdate did not return the update from the server");
-        }
-      });
+  async () => {
+    let update = await CodePush.checkForUpdate();
+    assert.equal(JSON.stringify(update), JSON.stringify({ ...serverPackage, ...PackageMixins.remote, failedInstall: false }), "checkForUpdate did not return the update from the server");
   }
 );
 
-module.exports = NewUpdateTest;
+export default NewUpdateTest;

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NewUpdateTest.js

@@ -2,14 +2,14 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = null;
-let localPackage =  {};
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const serverPackage = null;
+const localPackage =  {};
 
 let NoRemotePackageTest = createTestCaseComponent(
   "NoRemotePackageTest",
@@ -18,19 +18,14 @@ let NoRemotePackageTest = createTestCaseComponent(
     let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage);       
     let mockConfiguration = { appVersion : "1.5.0" };
     CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
-    CodePush.getCurrentPackage = () => {
-      return Promise.resolve(localPackage);
-    }
-    return Promise.resolve();
+    CodePush.getCurrentPackage = async () => {
+      return localPackage;
+    };
   },
-  () => {
-    return CodePush.checkForUpdate()
-      .then((update) => {
-        if (update) {
-          throw new Error("checkForUpdate should not return an update if there is none on the server");
-        }
-      });
+  async () => {
+    let update = await CodePush.checkForUpdate();
+    assert(!update, "checkForUpdate should not return an update if there is none on the server");
   }
 );
 
-module.exports = NoRemotePackageTest;
+export default NoRemotePackageTest;

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NoRemotePackageTest.js

@@ -2,37 +2,30 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
-
 import { updateAppVersionPackage as serverPackage } from "../resources/testPackages";
-let localPackage = {};
+
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const localPackage = {};
 
 let RemotePackageAppVersionNewerTest = createTestCaseComponent(
   "RemotePackageAppVersionNewerTest",
   "should drop the update when the server reports one with a newer binary version",
   () => {
-    return new Promise((resolve, reject) => { 
-      let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage);       
-      let mockConfiguration = { appVersion : "1.0.0" };
-      CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
-      CodePush.getCurrentPackage = () => {
-        return Promise.resolve(localPackage);
-      }
-      resolve();
-    });
+    let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage);       
+    let mockConfiguration = { appVersion : "1.0.0" };
+    CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
+    CodePush.getCurrentPackage = async () => {
+      return localPackage;
+    };
   },
-  () => {
-    return CodePush.checkForUpdate()
-      .then((update) => {
-        if (update) {
-          throw new Error("checkForUpdate should not return an update if remote package is of a different binary version");
-        }
-      });
+  async () => {
+    let update = await CodePush.checkForUpdate();
+    assert(!update, "checkForUpdate should not return an update if remote package is of a different binary version");
   }
 );
 
-module.exports = RemotePackageAppVersionNewerTest;
+export default RemotePackageAppVersionNewerTest;

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/RemotePackageAppVersionNewerTest.js

@@ -2,13 +2,13 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
-
 import { serverPackage } from "../resources/testPackages";
+
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 const localPackage = serverPackage;
 
 let SamePackageTest = createTestCaseComponent(
@@ -18,19 +18,14 @@ let SamePackageTest = createTestCaseComponent(
     let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage);       
     let mockConfiguration = { appVersion : "1.5.0" };
     CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
-    CodePush.getCurrentPackage = () => {
-      return Promise.resolve(localPackage);
-    }
-    return Promise.resolve();
+    CodePush.getCurrentPackage = async () => {
+      return localPackage;
+    };
   },
-  () => {
-    return CodePush.checkForUpdate()
-      .then((update) => {
-        if (update) {
-          throw new Error("checkForUpdate should not return a package when local package is identical");
-        }
-      });
+  async () => {
+    let update = await CodePush.checkForUpdate();
+    assert(!update, "checkForUpdate should not return a package when local package is identical");
   }
 );
 
-module.exports = SamePackageTest;
+export default SamePackageTest;

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SamePackageTest.js

@@ -2,16 +2,15 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
-
 import { serverPackage } from "../resources/testPackages";
-const localPackage = {};
 
-let deploymentKey = "myKey123";
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const localPackage = {};
+const deploymentKey = "myKey123";
 
 let SwitchDeploymentKeyTest = createTestCaseComponent(
   "SwitchDeploymentKeyTest",
@@ -20,21 +19,14 @@ let SwitchDeploymentKeyTest = createTestCaseComponent(
     let mockAcquisitionSdk = createMockAcquisitionSdk(serverPackage, localPackage, deploymentKey);       
     let mockConfiguration = { appVersion : "1.5.0" };
     CodePush.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeCodePush);
-    CodePush.getCurrentPackage = () => {
-      return Promise.resolve(localPackage);
-    }
-    return Promise.resolve();
+    CodePush.getCurrentPackage = async () => {
+      return localPackage;
+    };
   },
-  () => {
-    return CodePush.checkForUpdate(deploymentKey)
-      .then((update) => {
-        if (update) {
-          assert.deepEqual(update, Object.assign(serverPackage, PackageMixins.remote));
-        } else {
-          throw new Error("checkForUpdate did not return the update from the server");
-        }
-      });
+  async () => {
+    let update = await CodePush.checkForUpdate(deploymentKey);
+    assert.equal(JSON.stringify(update), JSON.stringify({ ...serverPackage, ...PackageMixins.remote, failedInstall: false }), "checkForUpdate did not return the update from the server");
   }
 );
 
-module.exports = SwitchDeploymentKeyTest;
+export default SwitchDeploymentKeyTest;

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SwitchDeploymentKeyTest.js

@@ -1,15 +1,13 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   ScrollView,
   StyleSheet,
   Text,
   TouchableOpacity,
   View,
-} = React;
+} from "react-native";
 
 let TESTS = [
   require("./testcases/DownloadProgressTest")

Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTestApp.js

@@ -1,6 +1,6 @@
-let { Platform } = require("react-native");
+import { Platform } from "react-native";
 
-let packages = [
+const packages = [
   {
     downloadUrl: "smallFile",
     description: "Angry flappy birds",