diff options
| author | James Lal <james@lightsofapollo.com> | 2013-01-07 18:39:12 +0100 |
|---|---|---|
| committer | James Lal <james@lightsofapollo.com> | 2013-01-07 18:39:12 +0100 |
| commit | 843b96d1822a28cee8eed1776aa37b6322432249 (patch) | |
| tree | d39a4be437ce1d0042bca92517ae674d219611b4 /test | |
| parent | 3170505852bbb6379a712ff816e1715f512516ad (diff) | |
| download | jsCalDAV-843b96d1822a28cee8eed1776aa37b6322432249.tar.gz | |
don't hold onto .xhr in request
Diffstat (limited to 'test')
| -rw-r--r-- | test/caldav/request/abstract_test.js | 4 | ||||
| -rw-r--r-- | test/caldav/xhr_test.js | 101 | ||||
| -rw-r--r-- | test/helper.js | 1 |
3 files changed, 3 insertions, 103 deletions
diff --git a/test/caldav/request/abstract_test.js b/test/caldav/request/abstract_test.js index ee70b67..21bde48 100644 --- a/test/caldav/request/abstract_test.js +++ b/test/caldav/request/abstract_test.js @@ -79,11 +79,10 @@ suite('caldav/request/abstract.js', function() { done(); }); - xhr = getXhr(); xhr.respond('NOT XML <div>', 500); }); - + test('on response', function() { assert.equal(calledWith[0].code, 500); }); @@ -110,7 +109,6 @@ suite('caldav/request/abstract.js', function() { item: { value: 'value' } } }); - assert.equal(calledWith[2].xhr, xhr); }); }); }); diff --git a/test/caldav/xhr_test.js b/test/caldav/xhr_test.js index fdcbe37..aa9b4f2 100644 --- a/test/caldav/xhr_test.js +++ b/test/caldav/xhr_test.js @@ -36,16 +36,6 @@ suite('webacls/xhr', function() { teardown(function() { Xhr.prototype.globalXhrOptions = old; }); - - test('constructed xhr', function() { - var subject = new Xhr({ - method: 'POST', - xhrClass: FakeXhr - }); - subject.send(function() {}); - assert.ok(subject.xhr); - assert.equal(subject.xhr.constructorArgs[0], opts); - }); }); }); @@ -64,33 +54,6 @@ suite('webacls/xhr', function() { ); }); - suite('.abort', function() { - suite('when there is an xhr object', function() { - var aborted; - - setup(function() { - aborted = false; - subject.xhr = { - abort: function() { - aborted = true; - } - }; - subject.abort(); - }); - - test('should call abort on the xhr object', function() { - assert.equal(aborted, true); - }); - }); - - suite('when there is no xhr object', function() { - test('should not fail', function() { - subject.xhr = null; - subject.abort(); - }); - }); - }); - suite('.send', function() { var data = '<html></html>', @@ -108,65 +71,10 @@ suite('webacls/xhr', function() { subject = new Xhr(options); } - function opensXHR() { - test('should create xhr', function() { - assert.instanceOf(subject.xhr, FakeXhr); - }); - - test('should set headers', function() { - assert.deepEqual(subject.xhr.headers, subject.headers); - }); - - test('should parse and send data', function() { - assert.deepEqual(subject.xhr.sendArgs[0], data); - }); - - test('should open xhr', function() { - assert.deepEqual(subject.xhr.openArgs, [ - subject.method, - subject.url, - subject.async, - subject.user, - subject.password - ]); - }); - } - setup(function() { responseXhr = null; }); - test('with mozSystem', function() { - if (typeof(window) === 'undefined') - return; - - var user = 'user'; - var password = 'pass'; - var url = '/foo'; - - request({ - globalXhrOptions: { mozSystem: true }, - user: user, - password: password, - method: 'GET', - url: url - }); - - - subject.send(function() {}); - var args = subject.xhr.openArgs; - - assert.deepEqual( - args, - ['GET', url, true] - ); - - assert.equal( - subject.xhr.headers['Authorization'], - subject._credentials(user, password) - ); - }); - suite('when xhr is a success and responds /w data', function() { var response = '<html></html>', cb; @@ -178,12 +86,11 @@ suite('webacls/xhr', function() { method: 'PUT' }); cb = callback.bind(this, done); - subject.send(cb); + xhr = subject.send(cb); //should be waiting inbetween requests assert.equal(subject.waiting, true); - xhr = subject.xhr; xhr.readyState = 4; xhr.responseText = response; xhr.onreadystatechange(); @@ -192,12 +99,6 @@ suite('webacls/xhr', function() { test('should not be waiting after response', function() { assert.equal(subject.waiting, false); }); - - test('should send callback parsed data and xhr', function() { - assert.equal(responseXhr, subject.xhr); - }); - - opensXHR(); }); }); diff --git a/test/helper.js b/test/helper.js index 64346bd..df0c6d9 100644 --- a/test/helper.js +++ b/test/helper.js @@ -173,6 +173,7 @@ testSupport.lib('sax'); testSupport.lib('sax/base'); testSupport.lib('sax/dav_response'); + testSupport.lib('request/errors'); testSupport.lib('request/abstract'); testSupport.lib('template'); testSupport.helper('fake_xhr'); |