Skip to content

Commit 7210db8

Browse files
authored
fixed updateCurrentUser test failure on IE11/10 (#971)
1 parent cd4b9af commit 7210db8

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

packages/auth/test/auth_test.js

+31-31
Original file line numberDiff line numberDiff line change
@@ -3261,7 +3261,7 @@ function testAuth_syncAuthChanges_newSignOut() {
32613261

32623262
function testAuth_updateCurrentUser_sameApiKey() {
32633263
fireauth.AuthEventManager.ENABLED = true;
3264-
asyncTestCase.waitForSignals(6);
3264+
asyncTestCase.waitForSignals(5);
32653265
app1 = firebase.initializeApp(config3, appId1);
32663266
auth1 = app1.auth();
32673267
var user1 = new fireauth.AuthUser(
@@ -3291,7 +3291,7 @@ function testAuth_updateCurrentUser_sameApiKey() {
32913291
});
32923292
} else {
32933293
// Verifies listener is triggered initiallly.
3294-
assertEquals(0, userChanges);
3294+
assertEquals(0, tokenChanges);
32953295
asyncTestCase.signal();
32963296
}
32973297
tokenChanges++;
@@ -3306,21 +3306,21 @@ function testAuth_updateCurrentUser_sameApiKey() {
33063306
} else {
33073307
// Verifies listener is triggered initiallly.
33083308
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+
});
33103321
}
33113322
userChanges++;
33123323
});
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-
});
33243324
}
33253325

33263326

@@ -3420,7 +3420,7 @@ function testAuth_updateCurrentUser_differentApiKey() {
34203420
return goog.Promise.resolve();
34213421
}));
34223422
fireauth.AuthEventManager.ENABLED = true;
3423-
asyncTestCase.waitForSignals(6);
3423+
asyncTestCase.waitForSignals(5);
34243424
app1 = firebase.initializeApp(config3, appId1);
34253425
auth1 = app1.auth();
34263426
currentUserStorageManager = new fireauth.storage.UserManager(
@@ -3457,7 +3457,7 @@ function testAuth_updateCurrentUser_differentApiKey() {
34573457
});
34583458
} else {
34593459
// Verifies listener is triggered initiallly.
3460-
assertEquals(0, userChanges);
3460+
assertEquals(0, tokenChanges);
34613461
asyncTestCase.signal();
34623462
}
34633463
tokenChanges++;
@@ -3473,24 +3473,24 @@ function testAuth_updateCurrentUser_differentApiKey() {
34733473
} else {
34743474
// Verifies listener is triggered initiallly.
34753475
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+
});
34773491
}
34783492
userChanges++;
34793493
});
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-
});
34943494
}
34953495

34963496

0 commit comments

Comments
 (0)