status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for failing React tests 

Since the JS test modules have been renamed to have consistent naming, we add a method to actually run the test methods to use our existing abstraction.
This commit is contained in:
Scott Kyle 2015-12-30 16:47:16 -08:00
parent b3a0627a51
commit 3739fab57f
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/lib/index.js
View File

@ -15,18 +15,26 @@ var SPECIAL_METHODS = {
afterEach: true, afterEach: true,
}; };
Object.defineProperty(exports, 'getTestNames', { // Only the test suites should be iterable members of exports.
value: function() { Object.defineProperties(exports, {
var testNames = {}; getTestNames: {
value: function() {
var testNames = {};
for (var suiteName in exports) { for (var suiteName in exports) {
var testSuite = exports[suiteName]; var testSuite = exports[suiteName];
testNames[suiteName] = Object.keys(testSuite).filter(function(testName) { testNames[suiteName] = Object.keys(testSuite).filter(function(testName) {
return !(testName in SPECIAL_METHODS) && typeof testSuite[testName] == 'function'; return !(testName in SPECIAL_METHODS) && typeof testSuite[testName] == 'function';
}); });
}
return testNames;
} }
},
return testNames; runTest: {
} value: function(suiteName, testName) {
exports[suiteName][testName]();
}
},
}); });

9
tests/react-test-app/ios/ReactTests/RealmReactTests.m
View File

@ -79,7 +79,7 @@ extern NSMutableArray *RCTGetModuleClasses(void);
} }
NSError *error; NSError *error;
NSDictionary *testCaseNames = [self invokeMethod:@"getTestNames" inModule:@"index" error:&error]; NSDictionary *testCaseNames = [self invokeMethod:@"getTestNames" arguments:nil error:&error];
if (error || !testCaseNames.count) { if (error || !testCaseNames.count) {
NSLog(@"Error from calling getTestNames() - %@", error ?: @"None returned"); NSLog(@"Error from calling getTestNames() - %@", error ?: @"None returned");
@ -128,14 +128,13 @@ extern NSMutableArray *RCTGetModuleClasses(void);
} }
} }
+ (id)invokeMethod:(NSString *)method inModule:(NSString *)module error:(NSError * __strong *)outError { + (id)invokeMethod:(NSString *)method arguments:(NSArray *)arguments error:(NSError * __strong *)outError {
id<RCTJavaScriptExecutor> executor = [self currentExecutor]; id<RCTJavaScriptExecutor> executor = [self currentExecutor];
module = [NSString stringWithFormat:@"realm-tests/%@.js", module];
__block BOOL condition = NO; __block BOOL condition = NO;
__block id result; __block id result;
[executor executeJSCall:module method:method arguments:@[] callback:^(id json, NSError *error) { [executor executeJSCall:@"realm-tests/index.js" method:method arguments:(arguments ?: @[]) callback:^(id json, NSError *error) {
// The React Native debuggerWorker.js very bizarrely returns an array five empty arrays to signify an error. // The React Native debuggerWorker.js very bizarrely returns an array five empty arrays to signify an error.
if ([json isKindOfClass:[NSArray class]] && [json isEqualToArray:@[@[], @[], @[], @[], @[]]]) { if ([json isKindOfClass:[NSArray class]] && [json isEqualToArray:@[@[], @[], @[], @[], @[]]]) {
json = nil; json = nil;
@ -169,7 +168,7 @@ extern NSMutableArray *RCTGetModuleClasses(void);
} }
NSError *error; NSError *error;
[self.class invokeMethod:method inModule:module error:&error]; [self.class invokeMethod:@"runTest" arguments:@[module, method] error:&error];
if (error) { if (error) {
// TODO: Parse and use localizedFailureReason info once we can source map the failure location in JS. // TODO: Parse and use localizedFailureReason info once we can source map the failure location in JS.