From d5e30a95e09bab18a55f9aad1572b6ae3e16e482 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 21 Aug 2012 17:14:06 +0200
Subject: moved on with refactoring

* srp_register now is part of srp.js
* moved server specific stuff into plainXHR (such as fetching the seed from the server)
* fixed tests
---
 spec/DjangoSpecRunner.html  |  1 -
 spec/RestfulSpecRunner.html |  2 +-
 spec/django/signup.js       | 13 ++-----------
 3 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'spec')

diff --git a/spec/DjangoSpecRunner.html b/spec/DjangoSpecRunner.html
index 5d8c95a..93696f0 100644
--- a/spec/DjangoSpecRunner.html
+++ b/spec/DjangoSpecRunner.html
@@ -22,7 +22,6 @@
   <script type="text/javascript" src="../lib/srp.js"></script>
   <script type="text/javascript" src="../lib/plainXHR.js"></script>
   <script type="text/javascript" src="../lib/srp_session.js"></script>
-  <script type="text/javascript" src="../lib/srp_register.js"></script>
   
   <!-- include spec files here... -->
   <script type="text/javascript" src="specHelper.js"></script>
diff --git a/spec/RestfulSpecRunner.html b/spec/RestfulSpecRunner.html
index bc4715f..11858e8 100644
--- a/spec/RestfulSpecRunner.html
+++ b/spec/RestfulSpecRunner.html
@@ -21,7 +21,7 @@
   <script type="text/javascript" src="../lib/jsbn2.js"></script>
   <script type="text/javascript" src="../lib/srp.js"></script>
   <script type="text/javascript" src="../lib/jqueryRest.js"></script>
-  <script type="text/javascript" src="../lib/srp_register.js"></script>
+  <script type="text/javascript" src="../lib/srp_session.js"></script>
   
   <!-- include spec files here... -->
   <script type="text/javascript" src="specHelper.js"></script>
diff --git a/spec/django/signup.js b/spec/django/signup.js
index 08a9b64..383dd14 100644
--- a/spec/django/signup.js
+++ b/spec/django/signup.js
@@ -13,22 +13,13 @@ describe("Signup", function() {
     expect(typeof this.srp.register).toBe('function');
   });
 
-  it("fetches a salt from /register/salt", function(){
-    var callback = sinon.spy();
-    this.srp.register_receive_salt = callback;
-    this.srp.register();
-    this.expectRequest('register/salt/', "I=user")
-    this.respondXML("<salt>5d3055e0acd3ddcfc15</salt>");
-    expect(callback.called).toBeTruthy();
-  });
-
   it("receives the salt from /register/salt", function(){
     var callback = sinon.spy();
-    this.srp.remote.register_send_verifier = callback;
+    this.srp.remote.sendVerifier = callback;
     this.srp.register();
     this.expectRequest('register/salt/', "I=user")
     this.respondXML("<salt>5d3055e0acd3ddcfc15</salt>");
-    expect(callback).toHaveBeenCalledWith(this.srp, this.srp.registered_user);
+    expect(callback).toHaveBeenCalledWith(this.srp.session, this.srp.registered_user);
   });
 
   it("identifies after successful registration (INTEGRATION)", function(){
-- 
cgit v1.2.3