@@ -3261,7 +3261,7 @@ function testAuth_syncAuthChanges_newSignOut() {
3261
3261
3262
3262
function testAuth_updateCurrentUser_sameApiKey ( ) {
3263
3263
fireauth . AuthEventManager . ENABLED = true ;
3264
- asyncTestCase . waitForSignals ( 6 ) ;
3264
+ asyncTestCase . waitForSignals ( 5 ) ;
3265
3265
app1 = firebase . initializeApp ( config3 , appId1 ) ;
3266
3266
auth1 = app1 . auth ( ) ;
3267
3267
var user1 = new fireauth . AuthUser (
@@ -3291,7 +3291,7 @@ function testAuth_updateCurrentUser_sameApiKey() {
3291
3291
} ) ;
3292
3292
} else {
3293
3293
// Verifies listener is triggered initiallly.
3294
- assertEquals ( 0 , userChanges ) ;
3294
+ assertEquals ( 0 , tokenChanges ) ;
3295
3295
asyncTestCase . signal ( ) ;
3296
3296
}
3297
3297
tokenChanges ++ ;
@@ -3306,21 +3306,21 @@ function testAuth_updateCurrentUser_sameApiKey() {
3306
3306
} else {
3307
3307
// Verifies listener is triggered initiallly.
3308
3308
assertEquals ( 0 , userChanges ) ;
3309
- asyncTestCase . signal ( ) ;
3309
+ // Calls updateCurrentUser after Auth listener being triggered first time.
3310
+ auth1 . updateCurrentUser ( user1 ) . then ( function ( ) {
3311
+ assertUserEquals ( user1 , auth1 [ 'currentUser' ] ) ;
3312
+ assertArrayEquals ( [ 'firebaseui' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3313
+ auth1 . logFramework ( 'angularfire' ) ;
3314
+ assertArrayEquals (
3315
+ [ 'firebaseui' , 'angularfire' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3316
+ assertEquals ( 'fr' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3317
+ auth1 . languageCode = 'de' ;
3318
+ assertEquals ( 'de' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3319
+ asyncTestCase . signal ( ) ;
3320
+ } ) ;
3310
3321
}
3311
3322
userChanges ++ ;
3312
3323
} ) ;
3313
- auth1 . updateCurrentUser ( user1 ) . then ( function ( ) {
3314
- assertUserEquals ( user1 , auth1 [ 'currentUser' ] ) ;
3315
- assertArrayEquals ( [ 'firebaseui' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3316
- auth1 . logFramework ( 'angularfire' ) ;
3317
- assertArrayEquals (
3318
- [ 'firebaseui' , 'angularfire' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3319
- assertEquals ( 'fr' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3320
- auth1 . languageCode = 'de' ;
3321
- assertEquals ( 'de' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3322
- asyncTestCase . signal ( ) ;
3323
- } ) ;
3324
3324
}
3325
3325
3326
3326
@@ -3420,7 +3420,7 @@ function testAuth_updateCurrentUser_differentApiKey() {
3420
3420
return goog . Promise . resolve ( ) ;
3421
3421
} ) ) ;
3422
3422
fireauth . AuthEventManager . ENABLED = true ;
3423
- asyncTestCase . waitForSignals ( 6 ) ;
3423
+ asyncTestCase . waitForSignals ( 5 ) ;
3424
3424
app1 = firebase . initializeApp ( config3 , appId1 ) ;
3425
3425
auth1 = app1 . auth ( ) ;
3426
3426
currentUserStorageManager = new fireauth . storage . UserManager (
@@ -3457,7 +3457,7 @@ function testAuth_updateCurrentUser_differentApiKey() {
3457
3457
} ) ;
3458
3458
} else {
3459
3459
// Verifies listener is triggered initiallly.
3460
- assertEquals ( 0 , userChanges ) ;
3460
+ assertEquals ( 0 , tokenChanges ) ;
3461
3461
asyncTestCase . signal ( ) ;
3462
3462
}
3463
3463
tokenChanges ++ ;
@@ -3473,24 +3473,24 @@ function testAuth_updateCurrentUser_differentApiKey() {
3473
3473
} else {
3474
3474
// Verifies listener is triggered initiallly.
3475
3475
assertEquals ( 0 , userChanges ) ;
3476
- asyncTestCase . signal ( ) ;
3476
+ // Calls updateCurrentUser after Auth listener being triggered first time.
3477
+ auth1 . updateCurrentUser ( user1 ) . then ( function ( ) {
3478
+ // If ApiKey is differnt, user needs to be reloaded.
3479
+ assertEquals ( 1 , fireauth . AuthUser . prototype . reload . getCallCount ( ) ) ;
3480
+ fireauth . common . testHelper . assertUserEqualsInWithDiffApikey (
3481
+ user1 , auth1 [ 'currentUser' ] , 'API_KEY2' , 'API_KEY' ) ;
3482
+ assertArrayEquals ( [ 'firebaseui' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3483
+ auth1 . logFramework ( 'angularfire' ) ;
3484
+ assertArrayEquals (
3485
+ [ 'firebaseui' , 'angularfire' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3486
+ assertEquals ( 'fr' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3487
+ auth1 . languageCode = 'de' ;
3488
+ assertEquals ( 'de' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3489
+ asyncTestCase . signal ( ) ;
3490
+ } ) ;
3477
3491
}
3478
3492
userChanges ++ ;
3479
3493
} ) ;
3480
- auth1 . updateCurrentUser ( user1 ) . then ( function ( ) {
3481
- // If ApiKey is differnt, user needs to be reloaded.
3482
- assertEquals ( 1 , fireauth . AuthUser . prototype . reload . getCallCount ( ) ) ;
3483
- fireauth . common . testHelper . assertUserEqualsInWithDiffApikey (
3484
- user1 , auth1 [ 'currentUser' ] , 'API_KEY2' , 'API_KEY' ) ;
3485
- assertArrayEquals ( [ 'firebaseui' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3486
- auth1 . logFramework ( 'angularfire' ) ;
3487
- assertArrayEquals (
3488
- [ 'firebaseui' , 'angularfire' ] , auth1 [ 'currentUser' ] . getFramework ( ) ) ;
3489
- assertEquals ( 'fr' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3490
- auth1 . languageCode = 'de' ;
3491
- assertEquals ( 'de' , auth1 [ 'currentUser' ] . getLanguageCode ( ) ) ;
3492
- asyncTestCase . signal ( ) ;
3493
- } ) ;
3494
3494
}
3495
3495
3496
3496
0 commit comments