diff options
author | James Lal <james@lightsofapollo.com> | 2012-10-02 23:27:19 -0700 |
---|---|---|
committer | James Lal <james@lightsofapollo.com> | 2012-10-02 23:27:19 -0700 |
commit | 13966ebe577c18436332923fb367a3f6ab7b288e (patch) | |
tree | 2e92f1083cfc7ce43c95ff207d7ea79944a98081 /test | |
parent | da93e0810d194a2b484f89e0bb4b121e41ad5c0c (diff) | |
download | jsCalDAV-13966ebe577c18436332923fb367a3f6ab7b288e.tar.gz |
replace templates with much improved query/filter interface. Update CalendarQuery to reflect these changes
Diffstat (limited to 'test')
-rw-r--r-- | test/caldav/index_test.js | 14 | ||||
-rw-r--r-- | test/caldav/request/calendar_query_test.js | 22 | ||||
-rw-r--r-- | test/caldav/templates/calendar_data_test.js | 70 | ||||
-rw-r--r-- | test/caldav/templates/calendar_filter_test.js | 53 |
4 files changed, 20 insertions, 139 deletions
diff --git a/test/caldav/index_test.js b/test/caldav/index_test.js index 969c3a1..59012a4 100644 --- a/test/caldav/index_test.js +++ b/test/caldav/index_test.js @@ -24,13 +24,13 @@ suite('caldav', function() { }); test('namespaces', function() { - assert.ok(root); - assert.ok(root.Request); - assert.ok(root.Templates); - assert.ok(root.Xhr); - assert.ok(root.Connection); - assert.ok(root.Resources); - assert.ok(root.Resources.Calendar); + assert.ok(root, 'Caldav'); + assert.ok(root.Request, 'Caldav.Request'); + assert.ok(root.QueryBuilder, 'Caldav.QueryBuilder'); + assert.ok(root.Xhr, 'Caldav.Xhr'); + assert.ok(root.Connection, 'Caldav.Connection'); + assert.ok(root.Resources, 'Caldav.Resources'); + assert.ok(root.Resources.Calendar, 'Calendar.Resources.Calendar'); }); }); diff --git a/test/caldav/request/calendar_query_test.js b/test/caldav/request/calendar_query_test.js index e28940f..e1824b4 100644 --- a/test/caldav/request/calendar_query_test.js +++ b/test/caldav/request/calendar_query_test.js @@ -1,13 +1,13 @@ requireRequest(); +testSupport.lib('query_builder'); testSupport.lib('request/propfind'); testSupport.lib('request/calendar_query'); suite('caldav/request/calendar_query', function() { var Propfind, FakeXhr, - CalendarData, + Builder, CalendarQuery, - CalendarFilter, Connection, con, Xhr, @@ -21,8 +21,7 @@ suite('caldav/request/calendar_query', function() { suiteSetup(function() { // this is way to much stuff Propfind = Caldav.require('request/propfind'); - CalendarData = Caldav.require('templates/calendar_data'); - CalendarFilter = Caldav.require('templates/calendar_filter'); + Builder = Caldav.require('query_builder'); CalendarQuery = Caldav.require('request/calendar_query'); SaxResponse = Caldav.require('sax/dav_response'); Connection = Caldav.require('connection'); @@ -50,15 +49,21 @@ suite('caldav/request/calendar_query', function() { assert.equal(subject.xhr.headers['Depth'], 1); assert.equal(subject.xhr.method, 'REPORT'); - assert.instanceOf(subject.fields, CalendarData); - assert.instanceOf(subject.filters, CalendarFilter); + assert.instanceOf(subject.data, Builder); + assert.instanceOf(subject.filter, Builder); }); test('#_createPayload', function() { subject.prop('getetag'); - subject.fields.select('VEVENT', ['NAME']); - subject.filters.add('VEVENT', true); + var cal = subject.data. + setComp('VCALENDAR'). + comp('VEVENT'). + prop('NAME'); + + var filter = subject.filter. + setComp('VCALENDAR'). + comp('VEVENT'); var props = [ '<N0:getetag />', '<N1:calendar-data>', @@ -89,7 +94,6 @@ suite('caldav/request/calendar_query', function() { }); suite('integration', function() { - return; var xml, data, result, diff --git a/test/caldav/templates/calendar_data_test.js b/test/caldav/templates/calendar_data_test.js deleted file mode 100644 index 9a21926..0000000 --- a/test/caldav/templates/calendar_data_test.js +++ /dev/null @@ -1,70 +0,0 @@ -requireRequest(); -testSupport.lib('templates/calendar_data'); - -suite('caldav/templates/calendar_data', function() { - var CalendarData; - var Template; - - var subject; - var template; - - function select() { - subject.select('VTODO', ['DTIME']); - subject.select('VTODO', ['NAME', { VTIMEZONE: true }]); - subject.select('VEVENT', ['NAME', { - 'VALARM': ['NAME'] - }]); - } - - suiteSetup(function() { - CalendarData = Caldav.require('templates/calendar_data'); - Template = Caldav.require('template'); - }); - - setup(function() { - subject = new CalendarData(); - template = new Template('root'); - }); - - test('initialization', function() { - assert.deepEqual(subject.struct, {}); - }); - - suite('#render', function() { - var output; - var expected; - - expected = [ - '<N0:calendar-data>', - '<N0:comp name="VCALENDAR">', - '<N0:comp name="VTODO">', - '<N0:prop name="DTIME" />', - '<N0:prop name="NAME" />', - '<N0:comp name="VTIMEZONE" />', - '</N0:comp>', - '<N0:comp name="VEVENT">', - '<N0:prop name="NAME" />', - '<N0:comp name="VALARM">', - '<N0:prop name="NAME" />', - '</N0:comp>', - '</N0:comp>', - '</N0:comp>', - '</N0:calendar-data>' - ].join(''); - - test('without items', function() { - var output = subject.render(template); - assert.equal( - output, - '<N0:calendar-data />' - ); - }); - - test('output', function() { - select(); - var output = subject.render(template); - assert.equal(output, expected); - }); - }); - -}); diff --git a/test/caldav/templates/calendar_filter_test.js b/test/caldav/templates/calendar_filter_test.js deleted file mode 100644 index d9ce2ab..0000000 --- a/test/caldav/templates/calendar_filter_test.js +++ /dev/null @@ -1,53 +0,0 @@ -requireRequest(); -testSupport.lib('templates/calendar_data'); -testSupport.lib('templates/calendar_filter'); - -suite('caldav/templates/calendar_filter', function() { - var CalendarFilter; - var Template; - - var subject; - var template; - - function filter() { - subject.add('VEVENT', true); - } - - suiteSetup(function() { - CalendarFilter = Caldav.require('templates/calendar_filter'); - Template = Caldav.require('template'); - }); - - setup(function() { - subject = new CalendarFilter(); - template = new Template('root'); - }); - - test('initialization', function() { - assert.deepEqual(subject.struct, {}); - }); - - suite('#render', function() { - var output; - var expected; - - expected = [ - '<N0:filter>', - '<N0:comp-filter name="VCALENDAR">', - '<N0:comp-filter name="VEVENT" />', - '</N0:comp-filter>', - '</N0:filter>' - ].join(''); - - setup(function() { - filter(); - }); - - test('output', function() { - var output = subject.render(template); - assert.equal(output, expected); - }); - }); - -}); - |