Fix failing tests

* Call _registerUserFinished set from OSStateSynchronizer
* Reset _registerUserFinished after each test

Author: Jeasmine

iOS_SDK/OneSignalSDK/Source/OSObservable.m

@@ -69,7 +69,6 @@ - (BOOL)notifyChange:(id)state {
 
     @synchronized(observers) {
         NSArray *obs = [observers copy];
-        
         for (id observer in obs) {
             fired = true;
             if (changeSelector) {

iOS_SDK/OneSignalSDK/Source/OSStateSynchronizer.m

@@ -43,6 +43,7 @@ + (void)emailChangedWithNewEmailPlayerId:(NSString * _Nullable)emailPlayerId;
 + (void)setUserId:(NSString *)userId;
 + (void)setEmailUserId:(NSString *)emailUserId;
 + (void)saveExternalIdAuthToken:(NSString *)hashToken;
++ (void)registerUserFinished;
 
 @end
 
@@ -108,6 +109,7 @@ - (void)registerUserWithState:(OSUserState *)registrationState withSuccess:(OSMu
 
     [OneSignalClient.sharedClient executeSimultaneousRequests:requests withSuccess:^(NSDictionary<NSString *, NSDictionary *> *results) {
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"on_session result: %@", results]];
+        [OneSignal registerUserFinished];
 
         // If the external user ID was sent as part of this request, we need to save it
         // Cache the external id if it exists within the registration payload
@@ -152,6 +154,7 @@ - (void)registerUserWithState:(OSUserState *)registrationState withSuccess:(OSMu
         for (NSString *key in @[OS_PUSH, OS_EMAIL])
             [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat: @"Encountered error during %@ registration with OneSignal: %@", key, errors[key]]];
 
+        [OneSignal registerUserFinished];
         if (failureBlock)
             failureBlock(errors);
     }];

iOS_SDK/OneSignalSDK/Source/OSSubscription.m

@@ -127,6 +127,7 @@ - (void)setPushToken:(NSString*)pushToken {
 - (void)setIsPushDisabled:(BOOL)isPushDisabled {
     BOOL changed = isPushDisabled != _isPushDisabled;
     _isPushDisabled = isPushDisabled;
+
     if (self.observable && changed)
         [self.observable notifyChange:self];
 }

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -425,6 +425,10 @@ + (void)setUserId:(NSString *)userId {
     self.currentSubscriptionState.userId = userId;
 }
 
++ (void)registerUserFinished {
+    _registerUserFinished = true;
+}
+
 + (NSString *)mEmailAuthToken {
     return self.currentEmailSubscriptionState.emailAuthCode;
 }
@@ -1717,7 +1721,6 @@ + (void)registerUserInternal {
 
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Calling OneSignal create/on_session"];
     [self.stateSynchronizer registerUserWithState:userState withSuccess:^(NSDictionary<NSString *, NSDictionary *> *results) {
-        _registerUserFinished = true;
         immediateOnSessionRetry = NO;
         waitingForOneSReg = false;
         isOnSessionSuccessfulForCurrentState = true;
@@ -1770,7 +1773,6 @@ + (void)registerUserInternal {
             [self receivedInAppMessageJson:results[@"push"][@"in_app_messages"]];
         }
     } onFailure:^(NSDictionary<NSString *, NSError *> *errors) {
-        _registerUserFinished = true;
         waitingForOneSReg = false;
 
         // If the failed registration is priority, force the next one to be a high priority
@@ -2473,7 +2475,7 @@ + (void)setExternalUserId:(NSString *)externalId withExternalIdAuthHashToken:(NS
         delayedExternalIdParameters = [OneSignalSetExternalIdParameters withExternalId:externalId withAuthToken:hashToken withSuccess:successBlock withFailure:failureBlock];
         return;
     } else if (!appId) {
-        [OneSignal onesignal_Log:ONE_S_LL_WARN message:@"Attempted to set external user id, butapp_id is not set"];
+        [OneSignal onesignal_Log:ONE_S_LL_WARN message:@"Attempted to set external user id, but app_id is not set"];
         if (failureBlock)
             failureBlock([NSError errorWithDomain:@"com.onesignal" code:0 userInfo:@{@"error" : [NSString stringWithFormat:@"%@ is not set", appId == nil ? @"app_id" : @"user_id"]}]);
         return;

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -602,6 +602,7 @@ - (void)testSubscriptionChangeObserverBasic {
 
     XCTAssertEqual(observer->last.from.isSubscribed, true);
     XCTAssertEqual(observer->last.to.isSubscribed, false);
+    XCTAssertEqual(observer->fireCount, 2);
 }
 
 - (void)testSubscriptionChangeObserverWhenPromptNotShown {