Permalink
Browse files

Report all errors from running tests

Reviewed By: jingc

Differential Revision: D6526057

fbshipit-source-id: 00ebbb42aab17295350a24b92773c04593452608
  • Loading branch information...
sahrens authored and facebook-github-bot committed Dec 9, 2017
1 parent 8f9b291 commit 3bcb9127866ef60b3697553e98a3ae279d02290a
Showing with 8 additions and 5 deletions.
  1. +8 −5 Libraries/RCTTest/RCTTestRunner.m
@@ -117,12 +117,15 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
__weak RCTBridge *batchedBridge;
@autoreleasepool {
__block NSString *error = nil;
__block NSMutableArray<NSString *> *errors = nil;
RCTLogFunction defaultLogFunction = RCTGetLogFunction();
RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
defaultLogFunction(level, source, fileName, lineNumber, message);
if (level >= RCTLogLevelError) {
error = message;
if (errors == nil) {
errors = [NSMutableArray new];
}
[errors addObject:message];
}
});
@@ -155,7 +158,7 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
}
NSDate *date = [NSDate dateWithTimeIntervalSinceNow:kTestTimeoutSeconds];
while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && error == nil) {
while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && errors == nil) {
[[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
[[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
}
@@ -173,9 +176,9 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
#endif
if (expectErrorBlock) {
RCTAssert(expectErrorBlock(error), @"Expected an error but nothing matched.");
RCTAssert(expectErrorBlock(errors[0]), @"Expected an error but the first one was missing or did not match.");
} else {
RCTAssert(error == nil, @"RedBox error: %@", error);
RCTAssert(errors == nil, @"RedBox errors: %@", errors);
RCTAssert(testModule.status != RCTTestStatusPending, @"Test didn't finish within %0.f seconds", kTestTimeoutSeconds);
RCTAssert(testModule.status == RCTTestStatusPassed, @"Test failed");
}

0 comments on commit 3bcb912

Please sign in to comment.