diff options
author | Azul <azul@riseup.net> | 2012-11-14 12:21:00 +0100 |
---|---|---|
committer | Azul <azul@riseup.net> | 2012-11-14 12:21:00 +0100 |
commit | 0bf072f0e5d26016e61fbe68a5c0fec60e13e5e3 (patch) | |
tree | 6e0ed4b49d20df7c5f5c26ea678bed6eff34ec89 /spec | |
parent | 7b73cbd591aa9ac3f46400c040ae14ec26e2d839 (diff) |
removed outdated django remote and all related files
Also cleaned up the specs a bit
Diffstat (limited to 'spec')
-rw-r--r-- | spec/DjangoSpecRunner.html | 75 | ||||
-rw-r--r-- | spec/django/login.js | 69 | ||||
-rw-r--r-- | spec/django/signup.js | 50 | ||||
-rw-r--r-- | spec/helper.js (renamed from spec/specHelper.js) | 0 | ||||
-rw-r--r-- | spec/login_spec.js (renamed from spec/restful/login.js) | 0 | ||||
-rw-r--r-- | spec/runner.html (renamed from spec/RestfulSpecRunner.html) | 8 | ||||
-rw-r--r-- | spec/session_spec.js (renamed from spec/restful/session.js) | 0 | ||||
-rw-r--r-- | spec/signup_spec.js (renamed from spec/restful/signup.js) | 0 |
8 files changed, 4 insertions, 198 deletions
diff --git a/spec/DjangoSpecRunner.html b/spec/DjangoSpecRunner.html deleted file mode 100644 index 5920745..0000000 --- a/spec/DjangoSpecRunner.html +++ /dev/null @@ -1,75 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> - <title>Jasmine Spec Runner</title> - - <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.1.0.rc1/jasmine_favicon.png"> - - <link rel="stylesheet" type="text/css" href="lib/jasmine/jasmine.css"> - <script type="text/javascript" src="lib/jasmine/jasmine.js"></script> - <script type="text/javascript" src="lib/jasmine/jasmine-html.js"></script> - - <script type="text/javascript" src="lib/sinon/sinon-1.3.4.js"></script> - <script type="text/javascript" src="lib/jasmine-sinon.js"></script> - - <!-- the files we are testing... --> - <script type="text/javascript" src="../lib/SHA256.js"></script> - <script type="text/javascript" src="../lib/prng4.js"></script> - <script type="text/javascript" src="../lib/rng.js"></script> - <script type="text/javascript" src="../lib/jsbn.js"></script> - <script type="text/javascript" src="../lib/jsbn2.js"></script> - <script type="text/javascript" src="../src/srp.js"></script> - <script type="text/javascript" src="../src/plainXHR.js"></script> - <script type="text/javascript" src="../src/srp_session.js"></script> - - <!-- include spec files here... --> - <script type="text/javascript" src="specHelper.js"></script> - <script type="text/javascript" src="django/signup.js"></script> - <script type="text/javascript" src="django/login.js"></script> - - <script type="text/javascript"> - - (function() { - var jasmineEnv = jasmine.getEnv(); - jasmineEnv.updateInterval = 1000; - - var htmlReporter = new jasmine.HtmlReporter(); - - jasmineEnv.addReporter(htmlReporter); - - jasmineEnv.specFilter = function(spec) { - return htmlReporter.specFilter(spec); - }; - - var currentWindowOnload = window.onload; - window.onload = function() { - if (currentWindowOnload) { - currentWindowOnload(); - } - - execJasmine(); - }; - - function execJasmine() { - jasmineEnv.execute(); - } - })(); - - </script> - -</head> - -<body> - <form action="." onsubmit="return register()"> - <table> - <tr><td>Username:</td><td><input type="text" id="srp_username" value="user" /></td></tr> - <tr><td>Password:</td><td><input type="password" id="srp_password" value="opensesami"/></td></tr> - <input type="hidden" id="srp_url" value=""/> - <input type="hidden" id="srp_forward" value="#logged_in"/> - <input type="hidden" id="srp_server" value="django"/> - </table> - <input type="submit"/> - </form> -</body> -</html> diff --git a/spec/django/login.js b/spec/django/login.js deleted file mode 100644 index d13f695..0000000 --- a/spec/django/login.js +++ /dev/null @@ -1,69 +0,0 @@ -describe("Login", function() { - - it("has an identify function", function() { - var srp = new SRP(); - expect(typeof srp.identify).toBe('function'); - }); - - describe("(INTEGRATION)", function (){ - // a valid auth attempt for the user / password given in the spec runner: - var a = 'af141ae6'; - var B = '887005895b1f5528b4e4dfdce914f73e763b96d3c901d2f41d8b8cd26255a75'; - var salt = '5d3055e0acd3ddcfc15'; - var M = 'be6d7db2186d5f6a2c55788479b6eaf75229a7ca0d9e7dc1f886f1970a0e8065' - var M2 = '2547cf26318519090f506ab73a68995a2626b1c948e6f603ef9e1b0b78bf0f7b'; - var A, callback; - - - beforeEach(function() { - var srp = new SRP(); - var session = new srp.Session(); - this.srp = new SRP(null, session) - A = session.calculateAndSetA(a); - - specHelper.setupFakeXHR.apply(this); - - this.srp.success = sinon.spy(); - }); - - afterEach(function() { - this.xhr.restore(); - }); - - it("works with XML responses", function(){ - this.srp.identify(); - - this.expectRequest('handshake/', 'I=user&A='+A); - this.respondXML("<r s='"+salt+"' B='"+B+"' />"); - this.expectRequest('authenticate/', 'M='+M); - this.respondXML("<M>"+M2+"</M>"); - - expect(this.srp.success).toHaveBeenCalled(); - }); - - it("works with JSON responses", function(){ - this.srp.identify(); - - 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(); - }); - - it("rejects B = 0", function(){ - this.srp.error = sinon.spy(); - this.srp.identify(); - - this.expectRequest('handshake/', 'I=user&A='+A); - this.respondJSON({s: salt, B: 0}); - // aborting if B=0 - expect(this.requests).toEqual([]); - expect(this.srp.error).toHaveBeenCalled(); - }); - }); - - -}); - diff --git a/spec/django/signup.js b/spec/django/signup.js deleted file mode 100644 index 383dd14..0000000 --- a/spec/django/signup.js +++ /dev/null @@ -1,50 +0,0 @@ -describe("Signup", function() { - - beforeEach(function() { - this.srp = new SRP(); - specHelper.setupFakeXHR.apply(this); - }); - - afterEach(function() { - this.xhr.restore(); - }); - - it("has a register function", function() { - expect(typeof this.srp.register).toBe('function'); - }); - - it("receives the salt from /register/salt", function(){ - var callback = sinon.spy(); - this.srp.remote.sendVerifier = callback; - this.srp.register(); - this.expectRequest('register/salt/', "I=user") - this.respondXML("<salt>5d3055e0acd3ddcfc15</salt>"); - expect(callback).toHaveBeenCalledWith(this.srp.session, this.srp.registered_user); - }); - - it("identifies after successful registration (INTEGRATION)", function(){ - var callback = sinon.spy(); - this.srp.identify = callback; - this.srp.register(); - this.expectRequest('register/salt/', "I=user") - this.respondXML("<salt>5d3055e0acd3ddcfc15</salt>"); - this.expectRequest('register/user/', "v=adcd57b4a4a05c2e205b0b7b30014d9ff635d8d8db2f502f08e9b9c132800c44"); - this.respondXML("<ok />"); - expect(callback).toHaveBeenCalled(); - }); - - it("identifies after successful registration with JSON (INTEGRATION)", function(){ - var callback = sinon.spy(); - this.srp.identify = callback; - this.srp.register(); - this.expectRequest('register/salt/', "I=user") - this.respondJSON({salt: "5d3055e0acd3ddcfc15"}); - this.expectRequest('register/user/', "v=adcd57b4a4a05c2e205b0b7b30014d9ff635d8d8db2f502f08e9b9c132800c44"); - this.respondJSON({ok: true}); - expect(callback).toHaveBeenCalled(); - }); - - -}); - - diff --git a/spec/specHelper.js b/spec/helper.js index 11327af..11327af 100644 --- a/spec/specHelper.js +++ b/spec/helper.js diff --git a/spec/restful/login.js b/spec/login_spec.js index 4df62a8..4df62a8 100644 --- a/spec/restful/login.js +++ b/spec/login_spec.js diff --git a/spec/RestfulSpecRunner.html b/spec/runner.html index f880720..5f4727c 100644 --- a/spec/RestfulSpecRunner.html +++ b/spec/runner.html @@ -26,10 +26,10 @@ <script type="text/javascript" src="../src/srp_session.js"></script> <!-- include spec files here... --> - <script type="text/javascript" src="specHelper.js"></script> - <script type="text/javascript" src="restful/signup.js"></script> - <script type="text/javascript" src="restful/login.js"></script> - <script type="text/javascript" src="restful/session.js"></script> + <script type="text/javascript" src="helper.js"></script> + <script type="text/javascript" src="signup_spec.js"></script> + <script type="text/javascript" src="login_spec.js"></script> + <script type="text/javascript" src="session_spec.js"></script> <script type="text/javascript"> diff --git a/spec/restful/session.js b/spec/session_spec.js index b7f16f0..b7f16f0 100644 --- a/spec/restful/session.js +++ b/spec/session_spec.js diff --git a/spec/restful/signup.js b/spec/signup_spec.js index e4d70df..e4d70df 100644 --- a/spec/restful/signup.js +++ b/spec/signup_spec.js |