From 50c1a9aceba4d19ee991e1f769b36ec2fac1956e Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Tue, 3 Jul 2012 15:08:59 +0100
Subject: [PATCH] Updating checkEmailReverify to use
"/wsapi/email_addition_status", updating XHR mock for this.
---
resources/static/common/js/network.js | 3 +--
resources/static/test/mocks/xhr.js | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/resources/static/common/js/network.js b/resources/static/common/js/network.js
index ba622476c..5a0683077 100644
--- a/resources/static/common/js/network.js
+++ b/resources/static/common/js/network.js
@@ -434,8 +434,7 @@ BrowserID.Network = (function() {
*/
checkEmailReverify: function(email, onComplete, onFailure) {
get({
- // XXX the URL is going to have to change
- url: "/wsapi/email_addition_status?email=" + encodeURIComponent(email),
+ url: "/wsapi/email_reverify_status?email=" + encodeURIComponent(email),
success: handleAddressVerifyCheckResponse.curry(onComplete),
error: onFailure
});
diff --git a/resources/static/test/mocks/xhr.js b/resources/static/test/mocks/xhr.js
index e91e378ed..ecb7c6b88 100644
--- a/resources/static/test/mocks/xhr.js
+++ b/resources/static/test/mocks/xhr.js
@@ -91,6 +91,12 @@ BrowserID.Mocks.xhr = (function() {
"post /wsapi/complete_reverify invalid": { success: false },
"post /wsapi/complete_reverify ajaxError": undefined,
+ "get /wsapi/email_reverify_status?email=registered%40testuser.com pending": { status: "pending" },
+ "get /wsapi/email_reverify_status?email=registered%40testuser.com complete": { status: "complete", userid: 4 },
+ "get /wsapi/email_reverify_status?email=registered%40testuser.com mustAuth": { status: "mustAuth" },
+ "get /wsapi/email_reverify_status?email=registered%40testuser.com noRegistration": { status: "noRegistration" },
+ "get /wsapi/email_reverify_status?email=registered%40testuser.com ajaxError": undefined,
+
"get /wsapi/user_creation_status?email=registered%40testuser.com pending": { status: "pending" },
"get /wsapi/user_creation_status?email=registered%40testuser.com complete": { status: "complete", userid: 4 },
"get /wsapi/user_creation_status?email=registered%40testuser.com mustAuth": { status: "mustAuth" },
--
GitLab