fix ios tests and fix some logic issues

Author: lucas-zimerman

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm

@@ -506,13 +506,13 @@ - (void)testIgnoreErrorsDropsMatchingExceptionValue
     NSError *error = nil;
     NSDictionary *mockedOptions = @{
         @"dsn" : @"https://[email protected]/1234567",
-        @"ignoreErrors" : @[ @"IgnoreMe.*" ]
+        @"ignoreErrorsRegex" : @[ @"IgnoreMe.*" ]
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedOptions error:&error];
     XCTAssertNotNil(options);
     XCTAssertNil(error);
     SentryEvent *event = [[SentryEvent alloc] init];
-    SentryException *exception = [[SentryException alloc] init];
+    SentryException *exception = [SentryException alloc];
     exception.value = @"IgnoreMe: This should be ignored";
     event.exceptions = @[ exception ];
     SentryEvent *result = options.beforeSend(event);
@@ -525,14 +525,14 @@ - (void)testIgnoreErrorsDropsMatchingEventMessage
     NSError *error = nil;
     NSDictionary *mockedOptions = @{
         @"dsn" : @"https://[email protected]/1234567",
-        @"ignoreErrors" : @[ @"DropThisError" ]
+        @"ignoreErrorsStr" : @[ @"DropThisError" ]
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedOptions error:&error];
     XCTAssertNotNil(options);
     XCTAssertNil(error);
     SentryEvent *event = [[SentryEvent alloc] init];
-    SentryMessage *msg = [[SentryMessage alloc] init];
-    msg.formatted = @"DropThisError: should be dropped";
+    SentryMessage *msg = [SentryMessage alloc] ;
+    msg.message = @"DropThisError: should be dropped";
     event.message = msg;
     SentryEvent *result = options.beforeSend(event);
     XCTAssertNil(result, @"Event with matching event.message.formatted should be dropped");
@@ -544,17 +544,17 @@ - (void)testIgnoreErrorsDoesNotDropNonMatchingEvent
     NSError *error = nil;
     NSDictionary *mockedOptions = @{
         @"dsn" : @"https://[email protected]/1234567",
-        @"ignoreErrors" : @[ @"IgnoreMe.*" ]
+        @"ignoreErrorsRegex" : @[ @"IgnoreMe.*" ]
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedOptions error:&error];
     XCTAssertNotNil(options);
     XCTAssertNil(error);
     SentryEvent *event = [[SentryEvent alloc] init];
-    SentryException *exception = [[SentryException alloc] init];
+    SentryException *exception = [SentryException alloc];
     exception.value = @"SomeOtherError: should not be ignored";
     event.exceptions = @[ exception ];
-    SentryMessage *msg = [[SentryMessage alloc] init];
-    msg.formatted = @"SomeOtherMessage";
+    SentryMessage *msg = [SentryMessage alloc];
+    msg.message = @"SomeOtherMessage";
     event.message = msg;
     SentryEvent *result = options.beforeSend(event);
     XCTAssertNotNil(result, @"Event with non-matching error should not be dropped");
@@ -566,14 +566,14 @@ - (void)testIgnoreErrorsDropsMatchingExactString
     NSError *error = nil;
     NSDictionary *mockedOptions = @{
         @"dsn" : @"https://[email protected]/1234567",
-        @"ignoreErrors" : @[ @"ExactError" ]
+        @"ignoreErrorsStr" : @[ @"ExactError" ]
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedOptions error:&error];
     XCTAssertNotNil(options);
     XCTAssertNil(error);
     SentryEvent *event = [[SentryEvent alloc] init];
-    SentryMessage *msg = [[SentryMessage alloc] init];
-    msg.formatted = @"ExactError";
+    SentryMessage *msg = [SentryMessage alloc];
+    msg.message = @"ExactError";
     event.message = msg;
     SentryEvent *result = options.beforeSend(event);
     XCTAssertNil(result, @"Event with exactly matching string should be dropped");
@@ -585,29 +585,31 @@ - (void)testIgnoreErrorsRegexAndStringBothWork
     NSError *error = nil;
     NSDictionary *mockedOptions = @{
         @"dsn" : @"https://[email protected]/1234567",
-        @"ignoreErrors" : @[ @"ExactError", @"IgnoreMe.*" ]
+        @"ignoreErrorsStr" : @[ @"ExactError" ],
+        @"ignoreErrorsRegex" : @[ @"IgnoreMe.*" ],
+
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedOptions error:&error];
     XCTAssertNotNil(options);
     XCTAssertNil(error);
     // Test regex match
     SentryEvent *event1 = [[SentryEvent alloc] init];
-    SentryException *exception = [[SentryException alloc] init];
+    SentryException *exception = [SentryException alloc];
     exception.value = @"IgnoreMe: This should be ignored";
     event1.exceptions = @[ exception ];
     SentryEvent *result1 = options.beforeSend(event1);
     XCTAssertNil(result1, @"Event with matching regex should be dropped");
     // Test exact string match
     SentryEvent *event2 = [[SentryEvent alloc] init];
-    SentryMessage *msg = [[SentryMessage alloc] init];
-    msg.formatted = @"ExactError";
+    SentryMessage *msg = [SentryMessage alloc];
+    msg.message = @"ExactError";
     event2.message = msg;
     SentryEvent *result2 = options.beforeSend(event2);
     XCTAssertNil(result2, @"Event with exactly matching string should be dropped");
     // Test non-matching
     SentryEvent *event3 = [[SentryEvent alloc] init];
-    SentryMessage *msg3 = [[SentryMessage alloc] init];
-    msg3.formatted = @"OtherError";
+    SentryMessage *msg3 = [SentryMessage alloc];
+    msg3.message = @"OtherError";
     event3.message = msg3;
     SentryEvent *result3 = options.beforeSend(event3);
     XCTAssertNotNil(result3, @"Event with non-matching error should not be dropped");

packages/core/ios/RNSentry.mm

@@ -182,20 +182,20 @@ - (BOOL)shouldIgnoreError:(NSString *)message
     if ((!_ignoreErrorPatternsStr && !_ignoreErrorPatternsRegex) || !message) {
         return NO;
     }
-
+    
     for (NSRegularExpression *regex in _ignoreErrorPatternsRegex) {
         NSRange range = NSMakeRange(0, message.length);
         if ([regex firstMatchInString:message options:0 range:range]) {
             return YES;
         }
     }
-    return NO;
-
+    
     for (NSString *str in _ignoreErrorPatternsStr) {
         if ([message containsString:str]) {
             return YES;
         }
     }
+    return NO;
 }
 
 - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)options
@@ -207,18 +207,18 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
         // react native Because we sent it already before the app crashed.
         if (nil != event.exceptions.firstObject.type &&
             [event.exceptions.firstObject.type rangeOfString:@"Unhandled JS Exception"].location
-                != NSNotFound) {
+            != NSNotFound) {
             return nil;
         }
-
+        
         // Regex and Str are set when one of them has value so we only need to check one of them.
-        if (self->_ignoreErrorPatternsStr) {
+        if (self->_ignoreErrorPatternsStr || self->_ignoreErrorPatternsRegex) {
             for (SentryException *exception in event.exceptions) {
                 if ([self shouldIgnoreError:exception.value]) {
                     return nil;
                 }
             }
-            if ([self shouldIgnoreError:event.message.formatted]) {
+            if ([self shouldIgnoreError:event.message.message]) {
                 return nil;
             }
         }