[z3-checkins] r33988 - in z3/deliverance/branches/packaged/deliverance: . test-data test-data/ajax

Wed Nov 1 00:08:16 CET 2006

Author: cabraham
Date: Wed Nov  1 00:08:12 2006
New Revision: 33988

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/content.html
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/theme.html
Removed:
   z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml
Modified:
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
made ajax test wsgi

Added: z3/deliverance/branches/packaged/deliverance/test-data/ajax/content.html
==============================================================================

--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/ajax/content.html	Wed Nov  1 00:08:12 2006
@@ -0,0 +1 @@
+<ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>

Added: z3/deliverance/branches/packaged/deliverance/test-data/ajax/rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/ajax/rules.xml	Wed Nov  1 00:08:12 2006
@@ -0,0 +1 @@
+<copy theme=".//div[@id='foo']" content=".//span[@class='bar']" />

Added: z3/deliverance/branches/packaged/deliverance/test-data/ajax/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/ajax/theme.html	Wed Nov  1 00:08:12 2006
@@ -0,0 +1 @@
+<html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml	Wed Nov  1 00:08:12 2006
+++ (empty file)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deliverance-test-suite>
-
-<!-- tests that deliverance does not theme content that is not bound in <html> tags 
- such as in AJAX requests --> 
-<deliverance-test>
-  <rules xmlns="http://www.plone.org/deliverance">
-    <copy theme=".//div[@id='foo']" content=".//span[@class='bar']" />
-  </rules>
-
-  <theme base="http://example.com"> 
-     <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>
-  </theme>
-
-  <content> 
-     <ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>
-  </content>
- 
-  <output>
-     <ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>
-  </output> 
-</deliverance-test>
-
-
-
-</deliverance-test-suite>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Wed Nov  1 00:08:12 2006
@@ -12,12 +12,14 @@
 nycsr_data = os.path.join(os.path.dirname(__file__), 'test-data', 'nycsr')
 necoro_data = os.path.join(os.path.dirname(__file__), 'test-data', 'necoro')
 guidesearch_data = os.path.join(os.path.dirname(__file__), 'test-data', 'guidesearch')
+ajax_data = os.path.join(os.path.dirname(__file__), 'test-data', 'ajax')
 
 static_app = StaticURLParser(static_data)
 tasktracker_app = StaticURLParser(tasktracker_data)
 nycsr_app = StaticURLParser(nycsr_data)
 necoro_app = StaticURLParser(necoro_data)
 guidesearch_app = StaticURLParser(guidesearch_data)
+ajax_app = StaticURLParser(ajax_data)
 
 
 def html_string_compare(astr, bstr):
@@ -103,6 +105,13 @@
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
+def do_ajax(renderer_type, name):
+    wsgi_app = DeliveranceMiddleware(ajax_app, 'theme.html','rules.xml', renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/content.html')
+    res2 = app.get('/content.html?notheme')
+    html_string_compare(res.body, res2.body)
+
 
 RENDERER_TYPES = ['py', 'xslt']
 TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch ] 
