diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/restful/login.js | 6 | ||||
| -rw-r--r-- | spec/restful/signup.js | 2 | ||||
| -rw-r--r-- | spec/specHelper.js | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/spec/restful/login.js b/spec/restful/login.js index 3bf9dda..0f6aa4f 100644 --- a/spec/restful/login.js +++ b/spec/restful/login.js @@ -49,21 +49,21 @@ describe("Login", function() { this.expectRequest('sessions', 'login=' +login+ '&A=' +A, 'POST'); this.respondJSON({s: salt, B: B}); - this.expectRequest('sessions/'+login, 'client_auth='+M); + this.expectRequest('sessions/'+login, 'client_auth='+M, 'PUT'); this.respondJSON({M: M2}); expect(this.srp.success).toHaveBeenCalled(); }); it("rejects B = 0", function(){ - this.srp.error_message = sinon.spy(); + this.srp.error = sinon.spy(); this.srp.identify(); this.expectRequest('sessions', 'login=' +login+ '&A=' +A, 'POST'); this.respondJSON({s: salt, B: 0}); // aborting if B=0 expect(this.requests).toEqual([]); - expect(this.srp.error_message).toHaveBeenCalled(); + expect(this.srp.error).toHaveBeenCalled(); }); }); diff --git a/spec/restful/signup.js b/spec/restful/signup.js index bc20b14..7b66dd7 100644 --- a/spec/restful/signup.js +++ b/spec/restful/signup.js @@ -22,7 +22,7 @@ describe("Signup", function() { this.srp.identify = callback; this.srp.session.getSalt = function() {return "4c78c3f8"}; this.srp.register(); - this.expectRequest('users', "user[login]=testuser&user[password_salt]=4c78c3f8&user[password_verifier]=474c26aa42d11f20544a00f7bf9711c4b5cf7aab95ed448df82b95521b96668e7480b16efce81c861870302560ddf6604c67df54f1d04b99d5bb9d0f02c6051ada5dc9d594f0d4314e12f876cfca3dcd99fc9c98c2e6a5e04298b11061fb8549a22cde0564e91514080df79bca1c38c682214d65d590f66b3719f954b078b83c") + this.expectRequest('users', "user[login]=testuser&user[password_salt]=4c78c3f8&user[password_verifier]=474c26aa42d11f20544a00f7bf9711c4b5cf7aab95ed448df82b95521b96668e7480b16efce81c861870302560ddf6604c67df54f1d04b99d5bb9d0f02c6051ada5dc9d594f0d4314e12f876cfca3dcd99fc9c98c2e6a5e04298b11061fb8549a22cde0564e91514080df79bca1c38c682214d65d590f66b3719f954b078b83c", 'POST') this.respondJSON({password_salt: "4c78c3f8", login: "testuser", ok: "true"}); expect(callback).toHaveBeenCalled(); }); diff --git a/spec/specHelper.js b/spec/specHelper.js index 893f8a4..11327af 100644 --- a/spec/specHelper.js +++ b/spec/specHelper.js @@ -13,10 +13,13 @@ var specHelper = (function() { } // TODO: validate http verb - function expectRequest(url, content) { + function expectRequest(url, content, verb) { expect(this.requests.length).toBe(1); expect(this.requests[0].url).toBe(url); expect(decodeURI(this.requests[0].requestBody)).toBe(content); + if (verb) { + expect(this.requests[0].method).toBe(verb); + } } function respondXML(content) { |