From e5f3d51b93b2eccfc446042da3562ce882302469 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Mon, 2 Jul 2012 09:02:02 +0100
Subject: [PATCH] Send the email address to the "check_registration" controller
when starting.
* Check for the required fields "email" and "siteName"
issue #1893
---
resources/static/dialog/js/modules/actions.js | 3 ++-
resources/static/dialog/js/modules/check_registration.js | 2 ++
resources/static/test/cases/dialog/js/modules/actions.js | 4 ++--
.../static/test/cases/dialog/js/modules/check_registration.js | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/resources/static/dialog/js/modules/actions.js b/resources/static/dialog/js/modules/actions.js
index d77861292..aec8e96a3 100644
--- a/resources/static/dialog/js/modules/actions.js
+++ b/resources/static/dialog/js/modules/actions.js
@@ -37,7 +37,8 @@ BrowserID.Modules.Actions = (function() {
verifier: verifier,
verificationMessage: message,
password: password,
- siteName: options.siteName
+ siteName: options.siteName,
+ email: options.email
});
controller.startCheck();
}
diff --git a/resources/static/dialog/js/modules/check_registration.js b/resources/static/dialog/js/modules/check_registration.js
index 784298ac2..a6475754e 100644
--- a/resources/static/dialog/js/modules/check_registration.js
+++ b/resources/static/dialog/js/modules/check_registration.js
@@ -15,6 +15,8 @@ BrowserID.Modules.CheckRegistration = (function() {
start: function(options) {
var self=this;
options = options || {};
+
+ self.checkRequired(options, "email", "siteName");
var templateData = {
email: options.email,
required: options.required,
diff --git a/resources/static/test/cases/dialog/js/modules/actions.js b/resources/static/test/cases/dialog/js/modules/actions.js
index 27c54f781..ebc3e522f 100644
--- a/resources/static/test/cases/dialog/js/modules/actions.js
+++ b/resources/static/test/cases/dialog/js/modules/actions.js
@@ -75,12 +75,12 @@
});
asyncTest("doConfirmUser - start the check_registration service", function() {
- testActionStartsModule("doConfirmUser", {email: TEST_EMAIL},
+ testActionStartsModule("doConfirmUser", {email: TEST_EMAIL, siteName: "Unit Test Site"},
"check_registration");
});
asyncTest("doConfirmEmail - start the check_registration service", function() {
- testActionStartsModule("doConfirmEmail", {email: TEST_EMAIL},
+ testActionStartsModule("doConfirmEmail", {email: TEST_EMAIL, siteName: "Unit Test Site"},
"check_registration");
});
diff --git a/resources/static/test/cases/dialog/js/modules/check_registration.js b/resources/static/test/cases/dialog/js/modules/check_registration.js
index 03a01bf0a..a0b536b39 100644
--- a/resources/static/test/cases/dialog/js/modules/check_registration.js
+++ b/resources/static/test/cases/dialog/js/modules/check_registration.js
@@ -19,7 +19,8 @@
email: "registered@testuser.com",
verifier: verifier,
verificationMessage: message,
- required: required
+ required: required,
+ siteName: "Unit Test Site"
});
}
--
GitLab