From 337df30b51d2c1bdddcb7fbd05f0ccf46a7a31b3 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 2 Jul 2012 17:39:56 +0200 Subject: expectRequest and respond{JSON,XML} functions to simplify the tests --- javascript/spec/login.js | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'javascript/spec/login.js') diff --git a/javascript/spec/login.js b/javascript/spec/login.js index 8d25246..55cfa16 100644 --- a/javascript/spec/login.js +++ b/javascript/spec/login.js @@ -30,15 +30,12 @@ describe("Login", function() { it("works with XML responses", function(){ this.srp.identify(); - expect(this.requests.length).toBe(1); - expect(this.requests[0].url).toBe("handshake/"); - expect(this.requests[0].requestBody).toBe("I=user&A=" + A); - specHelper.respondXML(this.requests[0], ""); - expect(this.requests.length).toBe(2); - expect(this.requests[1].url).toBe("authenticate/"); - expect(this.requests[1].requestBody).toBe("M=" + M); - specHelper.respondXML(this.requests[1], ""+M2+""); - + + this.expectRequest('handshake/', 'I=user&A='+A); + this.respondXML(""); + this.expectRequest('authenticate/', 'M='+M); + this.respondXML(""+M2+""); + expect(this.srp.success).toHaveBeenCalled(); expect(window.location.hash).toBe("#logged_in") }); @@ -46,14 +43,10 @@ describe("Login", function() { it("works with JSON responses", function(){ this.srp.identify(); - expect(this.requests.length).toBe(1); - expect(this.requests[0].url).toBe("handshake/"); - expect(this.requests[0].requestBody).toBe("I=user&A=" + A); - specHelper.respondJSON(this.requests[0], {s: salt, B: B}); - expect(this.requests.length).toBe(2); - expect(this.requests[1].url).toBe("authenticate/"); - expect(this.requests[1].requestBody).toBe("M=" + M); - specHelper.respondJSON(this.requests[1], {M: M2}); + this.expectRequest('handshake/', 'I=user&A='+A); + this.respondJSON({s: salt, B: B}); + this.expectRequest('authenticate/', 'M='+M); + this.respondJSON({M: M2}); expect(this.srp.success).toHaveBeenCalled(); expect(window.location.hash).toBe("#logged_in") -- cgit v1.2.3