Skip to content

fixed updateCurrentUser test failure on IE11/10 #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2018
Merged

fixed updateCurrentUser test failure on IE11/10 #971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions packages/auth/test/auth_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3261,7 +3261,7 @@ function testAuth_syncAuthChanges_newSignOut() {

function testAuth_updateCurrentUser_sameApiKey() {
fireauth.AuthEventManager.ENABLED = true;
asyncTestCase.waitForSignals(6);
asyncTestCase.waitForSignals(5);
app1 = firebase.initializeApp(config3, appId1);
auth1 = app1.auth();
var user1 = new fireauth.AuthUser(
Expand Down Expand Up @@ -3291,7 +3291,7 @@ function testAuth_updateCurrentUser_sameApiKey() {
});
} else {
// Verifies listener is triggered initiallly.
assertEquals(0, userChanges);
assertEquals(0, tokenChanges);
asyncTestCase.signal();
}
tokenChanges++;
Expand All @@ -3306,21 +3306,21 @@ function testAuth_updateCurrentUser_sameApiKey() {
} else {
// Verifies listener is triggered initiallly.
assertEquals(0, userChanges);
asyncTestCase.signal();
// Calls updateCurrentUser after Auth listener being triggered first time.
auth1.updateCurrentUser(user1).then(function() {
assertUserEquals(user1, auth1['currentUser']);
assertArrayEquals(['firebaseui'], auth1['currentUser'].getFramework());
auth1.logFramework('angularfire');
assertArrayEquals(
['firebaseui', 'angularfire'], auth1['currentUser'].getFramework());
assertEquals('fr', auth1['currentUser'].getLanguageCode());
auth1.languageCode = 'de';
assertEquals('de', auth1['currentUser'].getLanguageCode());
asyncTestCase.signal();
});
}
userChanges++;
});
auth1.updateCurrentUser(user1).then(function() {
assertUserEquals(user1, auth1['currentUser']);
assertArrayEquals(['firebaseui'], auth1['currentUser'].getFramework());
auth1.logFramework('angularfire');
assertArrayEquals(
['firebaseui', 'angularfire'], auth1['currentUser'].getFramework());
assertEquals('fr', auth1['currentUser'].getLanguageCode());
auth1.languageCode = 'de';
assertEquals('de', auth1['currentUser'].getLanguageCode());
asyncTestCase.signal();
});
}


Expand Down Expand Up @@ -3420,7 +3420,7 @@ function testAuth_updateCurrentUser_differentApiKey() {
return goog.Promise.resolve();
}));
fireauth.AuthEventManager.ENABLED = true;
asyncTestCase.waitForSignals(6);
asyncTestCase.waitForSignals(5);
app1 = firebase.initializeApp(config3, appId1);
auth1 = app1.auth();
currentUserStorageManager = new fireauth.storage.UserManager(
Expand Down Expand Up @@ -3457,7 +3457,7 @@ function testAuth_updateCurrentUser_differentApiKey() {
});
} else {
// Verifies listener is triggered initiallly.
assertEquals(0, userChanges);
assertEquals(0, tokenChanges);
asyncTestCase.signal();
}
tokenChanges++;
Expand All @@ -3473,24 +3473,24 @@ function testAuth_updateCurrentUser_differentApiKey() {
} else {
// Verifies listener is triggered initiallly.
assertEquals(0, userChanges);
asyncTestCase.signal();
// Calls updateCurrentUser after Auth listener being triggered first time.
auth1.updateCurrentUser(user1).then(function() {
// If ApiKey is differnt, user needs to be reloaded.
assertEquals(1, fireauth.AuthUser.prototype.reload.getCallCount());
fireauth.common.testHelper.assertUserEqualsInWithDiffApikey(
user1, auth1['currentUser'], 'API_KEY2', 'API_KEY');
assertArrayEquals(['firebaseui'], auth1['currentUser'].getFramework());
auth1.logFramework('angularfire');
assertArrayEquals(
['firebaseui', 'angularfire'], auth1['currentUser'].getFramework());
assertEquals('fr', auth1['currentUser'].getLanguageCode());
auth1.languageCode = 'de';
assertEquals('de', auth1['currentUser'].getLanguageCode());
asyncTestCase.signal();
});
}
userChanges++;
});
auth1.updateCurrentUser(user1).then(function() {
// If ApiKey is differnt, user needs to be reloaded.
assertEquals(1, fireauth.AuthUser.prototype.reload.getCallCount());
fireauth.common.testHelper.assertUserEqualsInWithDiffApikey(
user1, auth1['currentUser'], 'API_KEY2', 'API_KEY');
assertArrayEquals(['firebaseui'], auth1['currentUser'].getFramework());
auth1.logFramework('angularfire');
assertArrayEquals(
['firebaseui', 'angularfire'], auth1['currentUser'].getFramework());
assertEquals('fr', auth1['currentUser'].getLanguageCode());
auth1.languageCode = 'de';
assertEquals('de', auth1['currentUser'].getLanguageCode());
asyncTestCase.signal();
});
}


Expand Down