some tests are running!

hwangjr · May 17, 2016 · f09ab17 · f09ab17
1 parent 7ae7b48
commit f09ab17
Show file tree

Hide file tree

Showing 5 changed files with 900 additions and 860 deletions.
diff --git a/test/template/android/app/src/main/java/com/microsoft/codepush/test/MainActivity.java b/test/template/android/app/src/main/java/com/microsoft/codepush/test/MainActivity.java
@@ -12,7 +12,7 @@ public class MainActivity extends ReactActivity {
 
     @Override
     protected String getJSBundleFile() {
-        return CodePush.getBundleUrl("index.android.bundle");
+        return CodePush.getBundleUrl();
     }
 
     /**

diff --git a/test/template/codePushWrapper.js b/test/template/codePushWrapper.js
@@ -28,7 +28,8 @@ module.exports = {
     install: function(testApp, onSuccess, onError, installMode, minBackgroundDuration, localPackage) {
         return localPackage.install(installMode, minBackgroundDuration)
             .then(() => {
-                testApp.installSuccess();
+                // Since immediate installs cannot be reliably logged, we only log "UPDATE_INSTALLED" if it is a resume or restart update.
+                if (installMode !== CodePush.InstallMode.IMMEDIATE) testApp.installSuccess();
                 return onSuccess && onSuccess();
             }, () => {
                 testApp.installError();
@@ -39,8 +40,8 @@ module.exports = {
     checkAndInstall: function(testApp, onSuccess, onError, installMode, minBackgroundDuration) {
         return this.checkForUpdate(testApp,
             this.download.bind(undefined, testApp,
-                this.install.bind(undefined, testApp, undefined, undefined, installMode, minBackgroundDuration),
-                undefined));
+                this.install.bind(undefined, testApp, onSuccess, onError, installMode, minBackgroundDuration),
+                onError));
     },
 
     sync: function(testApp, onSyncStatus, onSyncError, options) {

diff --git a/test/template/index.js b/test/template/index.js
@@ -23,7 +23,7 @@ var TestCodePush = React.createClass({
     checkUpdateSuccess(remotePackage) {
         if (remotePackage) {
             if (!remotePackage.failedInstall) {
-                this.setStateAndSendMessage("There is an update available. Remote package:" + JSON.stringify(remotePackage), "CHECK_UPDATE_AVAILABLE");
+                this.setStateAndSendMessage("There is an update available. Remote package:" + JSON.stringify(remotePackage), "CHECK_UPDATE_AVAILABLE", [remotePackage]);
             } else {
                 this.setStateAndSendMessage("An update is available but failed previously. Remote package:" + JSON.stringify(remotePackage), "UPDATE_FAILED_PREVIOUSLY");
             }

diff --git a/test/template/scenarios/scenarioInstall.js b/test/template/scenarios/scenarioInstall.js
@@ -1,8 +1,9 @@
 var CodePushWrapper = require("../codePushWrapper.js");
+import CodePush from "react-native-code-push";
 
 module.exports = {
     startTest: function(testApp) {
-        CodePushWrapper.checkAndInstall(testApp);
+        CodePushWrapper.checkAndInstall(testApp, undefined, undefined, CodePush.InstallMode.IMMEDIATE);
     },
 
     getScenarioName: function() {