Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit b530292

Browse files
geof90geof90
committed
fixed tests
1 parent 95e77a1 commit b530292

14 files changed

+104
-88
lines changed

‎CodePush.ios.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,23 @@ var requestFetchAdapter = require("./request-fetch-adapter.js");
1111
var Sdk = require("code-push/script/acquisition-sdk").AcquisitionManager;
1212
var packageMixins = require("./package-mixins")(NativeCodePush);
1313

14+
1415
// This function is only used for tests. Replaces the default SDK, configuration and native bridge
15-
function setUpTestDependencies(testSdk, testConfiguration, testNativeBridge){
16-
if (testSdk) sdk = testSdk;
17-
if (testConfiguration) config = testConfiguration;
16+
function setUpTestDependencies(providedTestSdk, providedTestConfig, testNativeBridge){
17+
if (providedTestSdk) testSdk = providedTestSdk;
18+
if (providedTestConfig) testConfig = providedTestConfig;
1819
if (testNativeBridge) NativeCodePush = testNativeBridge;
1920
}
21+
var testConfig;
22+
var testSdk;
2023

2124
var getConfiguration = (() => {
2225
var config;
2326
return function getConfiguration() {
2427
if (config) {
2528
return Promise.resolve(config);
29+
} else if (testConfig) {
30+
return Promise.resolve(testConfig);
2631
} else {
2732
return NativeCodePush.getConfiguration()
2833
.then((configuration) => {
@@ -38,6 +43,8 @@ var getSdk = (() => {
3843
return function getSdk() {
3944
if (sdk) {
4045
return Promise.resolve(sdk);
46+
} else if (testSdk) {
47+
return Promise.resolve(testSdk);
4148
} else {
4249
return getConfiguration()
4350
.then((configuration) => {

‎Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ @implementation ApplyUpdateTests
2727

2828
- (void)setUp
2929
{
30-
app = @"CodePushDemoAppTests/ApplyUpdateTests/ApplyUpdateTestApp";
30+
app = @"CodePushDemoAppTests/ApplyUpdateTests/ApplyUpdateTestApp.ios";
3131
#if __LP64__
3232
RCTAssert(false, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
3333
#endif
@@ -70,7 +70,7 @@ - (void)testDownloadAndApplyUpdate
7070
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
7171
moduleName:@"DownloadAndApplyUpdateTest"
7272
initialProperties:nil];
73-
73+
7474
NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
7575
BOOL foundElement = NO;
7676

‎Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests/ApplyUpdateTestApp.js renamed to ‎Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests/ApplyUpdateTestApp.ios.js

File renamed without changes.

‎Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests/CodePushDemoApp.ios.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,23 @@ var NativeCodePush = require('react-native').NativeModules.CodePush;
1919
var CodePushDemoApp = React.createClass({
2020
componentDidMount: function() {
2121
NativeCodePush.setUsingTestFolder(true);
22-
NativeCodePush.getLocalPackage(function(err, savedPackage) {
23-
if (err || !savedPackage) {
24-
throw new Error("The updated package was not saved");
25-
} else {
26-
var testPackage = require("./TestPackage");
27-
for (var key in testPackage) {
28-
if (savedPackage[key] !== testPackage[key]) {
29-
throw new Error("The local package is still different from the updated package after installation");
22+
NativeCodePush.getCurrentPackage().then(
23+
(savedPackage) => {
24+
if (savedPackage) {
25+
var testPackage = require("./TestPackage");
26+
for (var key in testPackage) {
27+
if (savedPackage[key] !== testPackage[key]) {
28+
throw new Error("The local package is still different from the updated package after installation");
29+
}
3030
}
31+
} else {
32+
throw new Error("The updated package was not saved");
3133
}
34+
},
35+
(err) => {
36+
throw new Error("The updated package was not saved");
3237
}
33-
});
38+
);
3439
},
3540
render: function() {
3641
return (

‎Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests/DownloadAndApplyUpdateTest.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ var DownloadAndApplyUpdateTest = React.createClass({
3838

3939
runTest() {
4040
var update = require("./TestPackage");
41-
CodePushSdk.installUpdate(update);
41+
NativeBridge.downloadUpdate(update).done((downloadedPackage) => {
42+
NativeBridge.applyUpdate(downloadedPackage, 1000);
43+
});
4244
},
4345

4446
render() {

‎Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ - (void)setUp
2323

2424
NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
2525
RCTAssert(version.majorVersion == 8 || version.minorVersion == 3, @"Tests should be run on iOS 8.3, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
26-
_runner = RCTInitRunnerForApp(@"CodePushDemoAppTests/QueryUpdateTests/QueryUpdateTestApp", nil);
26+
_runner = RCTInitRunnerForApp(@"CodePushDemoAppTests/QueryUpdateTests/QueryUpdateTestApp.ios", nil);
2727
}
2828

2929
#pragma mark Logic Tests

‎Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/FirstUpdateTest.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@ var FirstUpdateTest = React.createClass({
5757
NativeBridge.setUsingTestFolder(true);
5858
CodePushSdk.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeBridge);
5959

60-
NativeBridge.removeLocalPackage(function(err){
61-
if (err) {
62-
throw new Error('Setup: Error removing local package');
63-
} else {
64-
callWhenDone();
65-
}
66-
});
60+
CodePushSdk.getCurrentPackage = function () {
61+
return Promise.resolve(null);
62+
}
63+
callWhenDone();
6764
},
6865

6966
runTest() {
70-
CodePushSdk.queryUpdate((err, update) => {
71-
if (update) {
72-
this.setState({done: true}, RCTTestModule.markTestCompleted);
73-
} else if (err) {
67+
CodePushSdk.checkForUpdate().then(
68+
(update) => {
69+
if (update) {
70+
throw new Error('SDK should return a package when there is an update');
71+
} else {
72+
this.setState({done: true}, RCTTestModule.markTestCompleted);
73+
}
74+
},
75+
(err) => {
7476
throw new Error(err.message);
75-
} else {
76-
throw new Error('SDK should return a package when there is an update');
77-
}
78-
});
77+
},
78+
);
7979
},
8080

8181
render() {

‎Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NewUpdateTest.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ var NewUpdateTest = React.createClass({
6969
NativeBridge.setUsingTestFolder(true);
7070
CodePushSdk.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeBridge);
7171

72-
NativeBridge.writeToLocalPackage(localPackage, function(err){
73-
if (err) {
74-
throw new Error('Setup: Error removing local package');
75-
} else {
76-
callWhenDone();
77-
}
78-
});
72+
CodePushSdk.getCurrentPackage = function () {
73+
return Promise.resolve(localPackage);
74+
}
75+
callWhenDone();
7976
},
8077

8178
runTest() {
82-
CodePushSdk.queryUpdate((err, update) => {
83-
if (update) {
84-
this.setState({done: true}, RCTTestModule.markTestCompleted);
85-
} else if (err) {
79+
CodePushSdk.checkForUpdate().then(
80+
(update) => {
81+
if (update) {
82+
throw new Error('SDK should return a package when there is a new update');
83+
} else {
84+
this.setState({done: true}, RCTTestModule.markTestCompleted);
85+
}
86+
},
87+
(err) => {
8688
throw new Error(err.message);
87-
} else {
88-
throw new Error('SDK should return a package when there is a new update');
89-
}
90-
});
89+
},
90+
);
9191
},
9292

9393
render() {

‎Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageTest.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,18 @@ var NoRemotePackageTest = React.createClass({
5050
},
5151

5252
runTest() {
53-
CodePushSdk.queryUpdate((err, update) => {
54-
if (update) {
55-
throw new Error('SDK should not return a package if remote does not contain a package');
56-
} else if (err) {
53+
CodePushSdk.checkForUpdate().then(
54+
(update) => {
55+
if (update) {
56+
throw new Error('SDK should not return a package if remote does not contain a package');
57+
} else {
58+
this.setState({done: true}, RCTTestModule.markTestCompleted);
59+
}
60+
},
61+
(err) => {
5762
throw new Error(err.message);
58-
} else {
59-
this.setState({done: true}, RCTTestModule.markTestCompleted);
60-
}
61-
});
63+
},
64+
);
6265
},
6366

6467
render() {

‎Examples/CodePushDemoApp/CodePushDemoAppTests/QueryUpdateTests/NoRemotePackageWithSameAppVersionTest.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,26 @@ var NoRemotePackageWithSameAppVersionTest = React.createClass({
6868

6969
var mockConfiguration = { appVersion : "1.0.0" };
7070
CodePushSdk.setUpTestDependencies(mockAcquisitionSdk, mockConfiguration, NativeBridge);
71-
NativeBridge.writeToLocalPackage(localPackage, function(err){
72-
if (err) {
73-
throw new Error('Setup: Error removing local package');
74-
} else {
75-
callWhenDone();
76-
}
77-
});
71+
72+
CodePushSdk.getCurrentPackage = function () {
73+
return Promise.resolve(localPackage);
74+
}
75+
callWhenDone();
7876
},
7977

8078
runTest() {
81-
CodePushSdk.queryUpdate((err, update) => {
82-
if (update) {
83-
throw new Error('SDK should not return a package if remote package is of a different version');
84-
} else if (err) {
79+
CodePushSdk.checkForUpdate().then(
80+
(update) => {
81+
if (update) {
82+
throw new Error('SDK should not return a package if remote package is of a different version');
83+
} else {
84+
this.setState({done: true}, RCTTestModule.markTestCompleted);
85+
}
86+
},
87+
(err) => {
8588
throw new Error(err.message);
86-
} else {
87-
this.setState({done: true}, RCTTestModule.markTestCompleted);
88-
}
89-
});
89+
},
90+
);
9091
},
9192

9293
render() {

0 commit comments

Comments
 (0)