From 3ea2a9819d9c01ad2690ba6d1fc4bdca212d29ff Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Sat, 20 Aug 2011 06:18:12 -0700
Subject: [PATCH] Renaming checkAuthentication to checkAuthenticationAndSync to
better reflect its purpose.
---
browserid/static/dialog/controllers/dialog_controller.js | 2 +-
browserid/static/dialog/resources/browserid-identities.js | 2 +-
.../static/dialog/test/qunit/browserid-identities_test.js | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/browserid/static/dialog/controllers/dialog_controller.js b/browserid/static/dialog/controllers/dialog_controller.js
index ea221c560..342fbc202 100644
--- a/browserid/static/dialog/controllers/dialog_controller.js
+++ b/browserid/static/dialog/controllers/dialog_controller.js
@@ -204,7 +204,7 @@ PageController.extend("Dialog", {}, {
doCheckAuth: function() {
this.doWait(BrowserIDWait.checkAuth);
var self=this;
- BrowserIDIdentities.checkAuthentication(function(authenticated) {
+ BrowserIDIdentities.checkAuthenticationAndSync(function(authenticated) {
if (authenticated) {
self.doSignIn();
} else {
diff --git a/browserid/static/dialog/resources/browserid-identities.js b/browserid/static/dialog/resources/browserid-identities.js
index e71682dbb..cd8f43cf7 100644
--- a/browserid/static/dialog/resources/browserid-identities.js
+++ b/browserid/static/dialog/resources/browserid-identities.js
@@ -139,7 +139,7 @@ var BrowserIDIdentities = (function() {
* identities.
* @method checkAuthentication
*/
- checkAuthentication: function(onSuccess, onFailure) {
+ checkAuthenticationAndSync: function(onSuccess, onFailure) {
var self=this;
BrowserIDNetwork.checkAuth(function(authenticated) {
if (authenticated) {
diff --git a/browserid/static/dialog/test/qunit/browserid-identities_test.js b/browserid/static/dialog/test/qunit/browserid-identities_test.js
index d912e093e..5f29f9cc3 100644
--- a/browserid/static/dialog/test/qunit/browserid-identities_test.js
+++ b/browserid/static/dialog/test/qunit/browserid-identities_test.js
@@ -89,7 +89,7 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid-iden
BrowserIDIdentities.authenticateAndSync("testuser@testuser.com", "testuser", function() {
}, function() {
var identities = BrowserIDIdentities.getStoredIdentities();
- ok("testuser@testuser.com" in identities, "checkAuthentication syncs email addresses");
+ ok("testuser@testuser.com" in identities, "authenticateAndSync syncs email addresses");
start();
}, failure("Authentication failure"));
@@ -97,12 +97,12 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid-iden
});
- test("checkAuthentication", function() {
+ test("checkAuthenticationAndSync", function() {
clearEmails();
BrowserIDNetwork.authenticate("testuser@testuser.com", "testuser", function() {
- BrowserIDIdentities.checkAuthentication(function() {
+ BrowserIDIdentities.checkAuthenticationAndSync(function() {
var identities = BrowserIDIdentities.getStoredIdentities();
- ok("testuser@testuser.com" in identities, "checkAuthentication syncs email addresses");
+ ok("testuser@testuser.com" in identities, "checkAuthenticationAndSync syncs email addresses");
start();
});
}, failure("Authentication failure"));
--
GitLab