Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

issue 1464 ie exception check registration #1490

Merged
merged 1 commit into from

2 participants

Shane Tomlinson Ben Adida
Shane Tomlinson
Collaborator

Fix the broken test in check_registration. It was starting the registration check twice, meaning there were two concurrent polls happening.

I am submitting this pull request against the current beta because that is where @jrgm reported the problem. A hotfix is not needed because this is not a user facing problem.

issue #1464

Shane Tomlinson shane-tomlinson Fix the broken test in check_registration. It was starting the regist…
…ration check twice, meaning there were two concurrent polls happening.

issue #1464
1172a5b
Ben Adida

@shane-tomlinson if this is not a user-facing problem, maybe it's worth rebasing this against dev and waiting 2 weeks to release? No need to increase risk on this week's production release, I think.

Shane Tomlinson
Collaborator

@benadida - I created this patch against the 2012.04.11 train because @jrgm has been checking out the code and running the tests in a local environment. Doing so with the 2012.04.11 train will continue to throw the exceptions. The merge can wait for the next train, but I think this is a low risk merge because it modifies the unit tests and none of the user facing code.

Ben Adida

oh, I should have looked at the diff first. r+.

Ben Adida benadida merged commit a2eea06 into from
Shane Tomlinson
Collaborator

Thanks @benadida. This does not need backported to dev as dev took a different approach to this test that already had it fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 24, 2012
  1. Shane Tomlinson

    Fix the broken test in check_registration. It was starting the regist…

    shane-tomlinson authored
    …ration check twice, meaning there were two concurrent polls happening.
    
    issue #1464
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 3 deletions.
  1. +3 −3 resources/static/test/cases/controllers/check_registration.js
6 resources/static/test/cases/controllers/check_registration.js
View
@@ -47,18 +47,18 @@
controller.startCheck();
}
- asyncTest("user validation with mustAuth result", function() {
+ asyncTest("user validation with mustAuth result - callback with email, type and known set to true", function() {
xhr.useResult("mustAuth");
createController("waitForUserValidation");
register("authenticate", function(msg, info) {
+ // we want the email, type and known all sent back to the caller so that
+ // this information does not need to be queried again.
equal(info.email, "registered@testuser.com", "correct email");
ok(info.type, "type sent with info");
ok(info.known, "email is known");
start();
});
controller.startCheck();
-
- testVerifiedUserEvent("authenticate", "User Must Auth");
});
asyncTest("user validation with pending->complete result ~3 seconds", function() {
Something went wrong with that request. Please try again.