From 75cd65ed105547fd7bd4617db85e04bc907fe04c Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 24 Nov 2015 18:33:02 -0800 Subject: [PATCH] fix tests --- CodePush.m | 2 +- .../DownloadProgressTests/DownloadProgressTest.js | 14 +++----------- .../DownloadAndInstallUpdateTest.js | 2 +- .../QueryUpdateTests/FirstUpdateTest.js | 2 +- .../QueryUpdateTests/NewUpdateTest.js | 2 +- .../QueryUpdateTests/NoRemotePackageTest.js | 2 +- .../NoRemotePackageWithSameAppVersionTest.js | 2 +- .../QueryUpdateTests/SamePackageTest.js | 2 +- 8 files changed, 10 insertions(+), 18 deletions(-) diff --git a/CodePush.m b/CodePush.m index b90be1f..00cbfad 100644 --- a/CodePush.m +++ b/CodePush.m @@ -321,7 +321,7 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage progressCallback:^(long expectedContentLength, long receivedContentLength) { // Notify the script-side about the progress [self.bridge.eventDispatcher - sendAppEventWithName:@"CodePushDownloadProgress" + sendDeviceEventWithName:@"CodePushDownloadProgress" body:@{ @"totalBytes":[NSNumber numberWithLong:expectedContentLength], @"receivedBytes":[NSNumber numberWithLong:receivedContentLength] diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTest.js index 2bbaba4..63b876b 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTest.js @@ -1,20 +1,12 @@ "use strict"; var React = require("react-native"); +var { DeviceEventEmitter } = require("react-native"); var CodePushSdk = require("react-native-code-push"); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; -var EventEmitter; var Platform = require("Platform"); -if (Platform.OS === "android") { - var { DeviceEventEmitter } = require("react-native"); - EventEmitter = DeviceEventEmitter; -} else if (Platform.OS === "ios") { - var { NativeAppEventEmitter } = require("react-native"); - EventEmitter = NativeAppEventEmitter; -} - var { Text, View, @@ -47,7 +39,7 @@ var DownloadProgressTest = React.createClass({ }, runTest() { - var downloadProgressSubscription = EventEmitter.addListener( + var downloadProgressSubscription = DeviceEventEmitter.addListener( "CodePushDownloadProgress", (progress) => { this.setState({ diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/DownloadAndInstallUpdateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/DownloadAndInstallUpdateTest.js index 04effc7..a861114 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/DownloadAndInstallUpdateTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/DownloadAndInstallUpdateTest.js @@ -2,7 +2,7 @@ var React = require('react-native'); var CodePushSdk = require('react-native-code-push'); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; var { diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/FirstUpdateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/FirstUpdateTest.js index 0cbe032..0c7b2fc 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/FirstUpdateTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/FirstUpdateTest.js @@ -3,7 +3,7 @@ var RCTTestModule = require('NativeModules').TestModule; var React = require('react-native'); var CodePushSdk = require('react-native-code-push'); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; var { diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NewUpdateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NewUpdateTest.js index 3da3835..20bef6b 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NewUpdateTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NewUpdateTest.js @@ -3,7 +3,7 @@ var RCTTestModule = require('NativeModules').TestModule; var React = require('react-native'); var CodePushSdk = require('react-native-code-push'); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; var { diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageTest.js index 0b58ef3..75c55c3 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageTest.js @@ -2,7 +2,7 @@ var React = require('react-native'); var CodePushSdk = require('react-native-code-push'); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; var { diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageWithSameAppVersionTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageWithSameAppVersionTest.js index 6789bf7..0fa0c43 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageWithSameAppVersionTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageWithSameAppVersionTest.js @@ -3,7 +3,7 @@ var React = require('react-native'); var RCTTestModule = React.NativeModules.TestModule; var CodePushSdk = require('react-native-code-push'); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; var { diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/SamePackageTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/SamePackageTest.js index 2db76b8..8808e77 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/SamePackageTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/SamePackageTest.js @@ -3,7 +3,7 @@ var RCTTestModule = require('NativeModules').TestModule; var React = require('react-native'); var CodePushSdk = require('react-native-code-push'); -var { NativeCodePush } = require("react-native-code-push/CodePushNativePlatformAdapter"); +var NativeCodePush = require("react-native").NativeModules.CodePush; var RCTTestModule = require('NativeModules').TestModule || {}; var {