a few bugfixes

Author: geof90

CodePush.js

@@ -2,10 +2,10 @@
 
 import { AcquisitionManager as Sdk } from "code-push/script/acquisition-sdk";
 import { Alert } from "./AlertAdapter";
-import requestFetchAdapter from "./request-fetch-adapter.js";
+import requestFetchAdapter from "./request-fetch-adapter";
 import semver from "semver";
 
-const NativeCodePush = require("react-native").NativeModules.CodePush;
+let NativeCodePush = require("react-native").NativeModules.CodePush;
 const PackageMixins = require("./package-mixins")(NativeCodePush);
 
 async function checkForUpdate(deploymentKey = null) {
@@ -258,7 +258,7 @@ async function sync(options = {}, syncStatusChangeCallback, downloadProgressCall
   } 
 };
 
-export default {
+const CodePush = {
   AcquisitionSdk: Sdk,
   checkForUpdate,
   getConfiguration,
@@ -294,3 +294,5 @@ export default {
     title: "Update available"
   }
 };
+
+export default CodePush;

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

@@ -23,8 +23,8 @@ let FirstUpdateTest = createTestCaseComponent(
     };
   },
   async () => {
-    let update = await CodePush.checkForUpdate()
-    assert.deepEqual(update, Object.assign(serverPackage, PackageMixins.remote), "checkForUpdate did not return the update from the server");
+    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/NewUpdateTest.js

@@ -22,8 +22,8 @@ let NewUpdateTest = createTestCaseComponent(
     };
   },
   async () => {
-    let update = await CodePush.checkForUpdate()
-    assert.deepEqual(update, Object.assign(serverPackage, PackageMixins.remote), "checkForUpdate did not return the update from the server");
+    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/RemotePackageAppVersionNewerTest.js

@@ -23,7 +23,7 @@ let RemotePackageAppVersionNewerTest = createTestCaseComponent(
     };
   },
   async () => {
-    let update = await CodePush.checkForUpdate()
+    let update = await CodePush.checkForUpdate();
     assert(!update, "checkForUpdate should not return an update if remote package is of a different binary version");
   }
 );

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

@@ -24,8 +24,8 @@ let SwitchDeploymentKeyTest = createTestCaseComponent(
     };
   },
   async () => {
-    let update = await CodePush.checkForUpdate(deploymentKey)
-    assert.deepEqual(update, Object.assign(serverPackage, PackageMixins.remote), "checkForUpdate did not return the update from the server");
+    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");
   }
 );
 

request-fetch-adapter.js

@@ -1,29 +1,33 @@
-let request = async (verb, url, body, callback) => {
+"use strict";
+
+export default {
+  async request(verb, url, body, callback) {
     if (typeof body === "function") {
-        callback = body;
-        body = null;
+      callback = body;
+      body = null;
     }
 
     var headers = {
-        "Accept": "application/json",
-        "Content-Type": "application/json"
+      "Accept": "application/json",
+      "Content-Type": "application/json"
     };
 
     if (body && typeof body === "object") {
-        body = JSON.stringify(body);
+      body = JSON.stringify(body);
     }
 
     try {
-        const response = await fetch(url, {
-            method: verb,
-            headers: headers,
-            body: body
-        });
+      const response = await fetch(url, {
+        method: verb,
+        headers: headers,
+        body: body
+      });
 
-        const statusCode = response.status;
-        const body = await response.text();
-        callback(null, { statusCode, body });
+      const statusCode = response.status;
+      const body = await response.text();
+      callback(null, { statusCode, body });
     } catch (err) {
-        callback(err);
+      callback(err);
     }
-}
+  }
+};