fixed test and deduplicate

Author: geof90

CodePush.h

@@ -54,6 +54,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 
 + (NSDictionary *)getCurrentPackage:(NSError **)error;
 + (NSString *)getCurrentPackageFolderPath:(NSError **)error;
++ (NSString *)getCurrentPackageBundlePath:(NSError **)error;
 + (NSString *)getCurrentPackageHash:(NSError **)error;
 
 + (NSDictionary *)getPackage:(NSString *)packageHash

CodePush.m

@@ -14,7 +14,6 @@ @implementation CodePush
 
 NSString * const FailedUpdatesKey = @"CODE_PUSH_FAILED_UPDATES";
 NSString * const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
-NSString * const UpdateBundleFileName = @"app.jsbundle";
 
 @synthesize bridge = _bridge;
 
@@ -28,16 +27,14 @@ + (NSString *)getDocumentsDirectory
 + (NSURL *)getBundleUrl
 {
     NSError *error;
-    NSString *packageFolder = [CodePushPackage getCurrentPackageFolderPath:&error];
+    NSString *packageFile = [CodePushPackage getCurrentPackageBundlePath:&error];
     NSURL *binaryJsBundleUrl = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
-    if (error || !packageFolder)
+    if (error || !packageFile)
     {
         return binaryJsBundleUrl;
     }
 
-    NSString *packageFile = [packageFolder stringByAppendingPathComponent:UpdateBundleFileName];
-    
     NSDictionary *binaryFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[binaryJsBundleUrl path] error:nil];
     NSDictionary *appFileAttribs = [[NSFileManager defaultManager] attributesOfItemAtPath:packageFile error:nil];
     NSDate *binaryDate = [binaryFileAttributes objectForKey:NSFileModificationDate];

CodePushPackage.m

@@ -3,6 +3,7 @@
 @implementation CodePushPackage
 
 NSString * const StatusFile = @"codepush.json";
+NSString * const UpdateBundleFileName = @"app.jsbundle";
 
 + (NSString *)getCodePushPath
 {
@@ -72,6 +73,17 @@ + (NSString *)getCurrentPackageFolderPath:(NSError **)error
     return [self getPackageFolderPath:packageHash];
 }
 
++ (NSString *)getCurrentPackageBundlePath:(NSError **)error
+{
+    NSString *packageFolder = [self getCurrentPackageFolderPath:error];
+    
+    if(*error) {
+        return NULL;
+    }
+    
+    return [packageFolder stringByAppendingPathComponent:UpdateBundleFileName];
+}
+
 + (NSString *)getCurrentPackageHash:(NSError **)error
 {
     NSDictionary *info = [self getCurrentPackageInfo:error];
@@ -167,10 +179,10 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
         return failCallback(error);
     }
 
-    NSString *updateBundleFileName = [packageFolderPath stringByAppendingPathComponent:@"app.jsbundle"];
+    NSString *downloadFilePath = [packageFolderPath stringByAppendingPathComponent:UpdateBundleFileName];
 
     CodePushDownloadHandler *downloadHandler = [[CodePushDownloadHandler alloc]
-        init:updateBundleFileName
+        init:downloadFilePath
         progressCallback:progressCallback
         doneCallback:^{
             NSError *error;

Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests/DownloadAndApplyUpdateTest.js

@@ -39,7 +39,7 @@ var DownloadAndApplyUpdateTest = React.createClass({
   runTest() {
     var update = require("./TestPackage");
     NativeBridge.downloadUpdate(update).done((downloadedPackage) => {
-      NativeBridge.applyUpdate(downloadedPackage, 1000);
+      NativeBridge.applyUpdate(downloadedPackage, /*rollbackTimeout*/ 1000, /*restartImmediately*/ true);
     });
   },
 

package-mixins.js

@@ -15,7 +15,7 @@ module.exports = (NativeCodePush) => {
       if (progressHandler) {
         // Use event subscription to obtain download progress.   
         downloadProgressSubscription = NativeAppEventEmitter.addListener(
-          'CodePushDownloadProgress',
+          "CodePushDownloadProgress",
           progressHandler
         );
       }