# HG changeset patch
# User Filip de Waard <fmw@vix.io>
# Date 1293144965 -3600
# Node ID eb4d0f9a09a4236bbb8630acd7d333d0f528a4fa
# Parent  85f8efefde3df65ae1bd8411e72f0174f3abe82e
removed obsolete format parameter from Feed create requests in unit tests

diff -r 85f8efefde3df65ae1bd8411e72f0174f3abe82e -r eb4d0f9a09a4236bbb8630acd7d333d0f528a4fa vix/config/routing.py
--- a/vix/config/routing.py	Thu Dec 23 23:01:05 2010 +0100
+++ b/vix/config/routing.py	Thu Dec 23 23:56:05 2010 +0100
@@ -21,6 +21,9 @@
     map.connect('create_feed', '/feeds', controller='feeds', 
         action='create', conditions=dict(method='POST'))
 
+    map.connect('list_feeds', '/feeds', controller='feeds', 
+        action='list', conditions=dict(method='GET'))
+
     # Routes for 'api' controller
     map.connect('/api/:(action)', controller='api')
 
diff -r 85f8efefde3df65ae1bd8411e72f0174f3abe82e -r eb4d0f9a09a4236bbb8630acd7d333d0f528a4fa vix/tests/functional/test_feeds.py
--- a/vix/tests/functional/test_feeds.py	Thu Dec 23 23:01:05 2010 +0100
+++ b/vix/tests/functional/test_feeds.py	Thu Dec 23 23:56:05 2010 +0100
@@ -92,7 +92,7 @@
         
         new_feed = {'title': u'Vix weblog', 'subtitle': u'The Vix Weblog...'}
 
-        response = self.app.post(url('create_feed', format='json'),
+        response = self.app.post(url('create_feed'),
             content_type='application/json',
             params=json.dumps(new_feed),
             headers=headers,
@@ -122,7 +122,7 @@
             u'tag:vix.io,%s:/feeds/weblog' % (date_str))
 
         #try sending a request with invalid JSON input
-        response = self.app.post(url('create_feed', format='json'),
+        response = self.app.post(url('create_feed'), 
             content_type='application/json',
             params=u'foobar$ "',
             headers=headers,
@@ -130,7 +130,7 @@
         
         #test w/o slug
         del headers['Slug']
-        response = self.app.post(url('create_feed', format='json'),
+        response = self.app.post(url('create_feed'), 
             content_type='application/json',
             params=json.dumps(new_feed),
             headers=headers,