summaryrefslogtreecommitdiff
path: root/repoze/bfg/tests
diff options
context:
space:
mode:
Diffstat (limited to 'repoze/bfg/tests')
-rw-r--r--repoze/bfg/tests/fixtureapp/another.zcml6
-rw-r--r--repoze/bfg/tests/fixtureapp/configure.zcml11
-rw-r--r--repoze/bfg/tests/test_chameleon_genshi.py17
-rw-r--r--repoze/bfg/tests/test_chameleon_text.py5
-rw-r--r--repoze/bfg/tests/test_chameleon_zpt.py17
-rw-r--r--repoze/bfg/tests/test_push.py8
-rw-r--r--repoze/bfg/tests/test_template.py11
-rw-r--r--repoze/bfg/tests/test_xslt.py5
8 files changed, 46 insertions, 34 deletions
diff --git a/repoze/bfg/tests/fixtureapp/another.zcml b/repoze/bfg/tests/fixtureapp/another.zcml
index f29e7e59e..c01245656 100644
--- a/repoze/bfg/tests/fixtureapp/another.zcml
+++ b/repoze/bfg/tests/fixtureapp/another.zcml
@@ -1,8 +1,6 @@
-<configure xmlns="http://namespaces.zope.org/zope"
- xmlns:bfg="http://namespaces.repoze.org/bfg"
- i18n_domain="repoze.bfg">
+<configure xmlns="http://namespaces.repoze.org/bfg">
- <bfg:view
+ <view
view=".views.fixture_view"
for="*"
name="another.html"
diff --git a/repoze/bfg/tests/fixtureapp/configure.zcml b/repoze/bfg/tests/fixtureapp/configure.zcml
index a56c1cbdf..29d7a7329 100644
--- a/repoze/bfg/tests/fixtureapp/configure.zcml
+++ b/repoze/bfg/tests/fixtureapp/configure.zcml
@@ -1,16 +1,14 @@
-<configure xmlns="http://namespaces.zope.org/zope"
- xmlns:bfg="http://namespaces.repoze.org/bfg"
- i18n_domain="repoze.bfg">
+<configure xmlns="http://namespaces.repoze.org/bfg">
- <include package="repoze.bfg" />
+ <include package="repoze.bfg.includes" />
- <bfg:view
+ <view
view=".views.fixture_view"
for=".models.IFixture"
permission="repoze.view"
/>
- <bfg:view
+ <view
view=".views.fixture_view"
for=".models.IFixture"
name="dummyskin.html"
@@ -20,5 +18,4 @@
<include file="another.zcml"/>
-
</configure>
diff --git a/repoze/bfg/tests/test_chameleon_genshi.py b/repoze/bfg/tests/test_chameleon_genshi.py
index 8012101f5..3b0c05b34 100644
--- a/repoze/bfg/tests/test_chameleon_genshi.py
+++ b/repoze/bfg/tests/test_chameleon_genshi.py
@@ -10,9 +10,10 @@ class Base(PlacelessSetup):
PlacelessSetup.tearDown(self)
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTemplatePath(self, name):
import os
@@ -51,7 +52,8 @@ class GenshiTemplateRendererTests(unittest.TestCase, Base):
instance = self._makeOne(minimal)
result = instance()
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
def test_implementation(self):
self._zcmlConfigure()
@@ -59,7 +61,8 @@ class GenshiTemplateRendererTests(unittest.TestCase, Base):
instance = self._makeOne(minimal)
result = instance.implementation()()
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateTests(unittest.TestCase, Base):
def setUp(self):
@@ -77,7 +80,8 @@ class RenderTemplateTests(unittest.TestCase, Base):
render = self._getFUT()
result = render(minimal)
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateToResponseTests(unittest.TestCase, Base):
def setUp(self):
@@ -96,7 +100,8 @@ class RenderTemplateToResponseTests(unittest.TestCase, Base):
result = render(minimal)
from webob import Response
self.failUnless(isinstance(result, Response))
- self.assertEqual(result.app_iter, ['<div>\n</div>\n'])
+ self.assertEqual(result.app_iter,
+ ['<div xmlns="http://www.w3.org/1999/xhtml">\n</div>'])
self.assertEqual(result.status, '200 OK')
self.assertEqual(len(result.headerlist), 2)
diff --git a/repoze/bfg/tests/test_chameleon_text.py b/repoze/bfg/tests/test_chameleon_text.py
index 594c2806f..f61cfe963 100644
--- a/repoze/bfg/tests/test_chameleon_text.py
+++ b/repoze/bfg/tests/test_chameleon_text.py
@@ -10,9 +10,10 @@ class Base:
cleanUp()
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTemplatePath(self, name):
import os
diff --git a/repoze/bfg/tests/test_chameleon_zpt.py b/repoze/bfg/tests/test_chameleon_zpt.py
index d2ee1704f..995dd92e1 100644
--- a/repoze/bfg/tests/test_chameleon_zpt.py
+++ b/repoze/bfg/tests/test_chameleon_zpt.py
@@ -10,9 +10,10 @@ class Base(PlacelessSetup):
PlacelessSetup.tearDown(self)
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTemplatePath(self, name):
import os
@@ -51,7 +52,8 @@ class ZPTTemplateRendererTests(unittest.TestCase, Base):
instance = self._makeOne(minimal)
result = instance()
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
def test_implementation(self):
self._zcmlConfigure()
@@ -59,7 +61,8 @@ class ZPTTemplateRendererTests(unittest.TestCase, Base):
instance = self._makeOne(minimal)
result = instance.implementation()()
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateTests(unittest.TestCase, Base):
@@ -79,7 +82,8 @@ class RenderTemplateTests(unittest.TestCase, Base):
render = self._getFUT()
result = render(minimal)
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateToResponseTests(unittest.TestCase, Base):
def setUp(self):
@@ -99,7 +103,8 @@ class RenderTemplateToResponseTests(unittest.TestCase, Base):
result = render(minimal)
from webob import Response
self.failUnless(isinstance(result, Response))
- self.assertEqual(result.app_iter, ['<div>\n</div>\n'])
+ self.assertEqual(result.app_iter,
+ ['<div xmlns="http://www.w3.org/1999/xhtml">\n</div>'])
self.assertEqual(result.status, '200 OK')
self.assertEqual(len(result.headerlist), 2)
diff --git a/repoze/bfg/tests/test_push.py b/repoze/bfg/tests/test_push.py
index e8d257c03..83f02850b 100644
--- a/repoze/bfg/tests/test_push.py
+++ b/repoze/bfg/tests/test_push.py
@@ -10,9 +10,10 @@ class Test_pushpage(unittest.TestCase, PlacelessSetup):
PlacelessSetup.tearDown(self)
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTargetClass(self):
from repoze.bfg.push import pushpage
@@ -32,7 +33,8 @@ class Test_pushpage(unittest.TestCase, PlacelessSetup):
pp = self._makeOne('pp.pt')
wrapped = pp(to_wrap)
response = wrapped(object(), object())
- self.assertEqual(response.body, '<p>WRAPPED</p>\n')
+ self.assertEqual(response.body,
+ '<p xmlns="http://www.w3.org/1999/xhtml">WRAPPED</p>')
def to_wrap(context, request):
return {'wrapped': 'WRAPPED'}
diff --git a/repoze/bfg/tests/test_template.py b/repoze/bfg/tests/test_template.py
index f66d045cd..31aa074d8 100644
--- a/repoze/bfg/tests/test_template.py
+++ b/repoze/bfg/tests/test_template.py
@@ -14,9 +14,10 @@ class Base(PlacelessSetup):
PlacelessSetup.tearDown(self)
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTemplatePath(self, name):
import os
@@ -40,7 +41,8 @@ class RenderTemplateTests(unittest.TestCase, Base):
render = self._getFUT()
result = render(minimal)
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateToResponseTests(unittest.TestCase, Base):
def setUp(self):
@@ -60,7 +62,8 @@ class RenderTemplateToResponseTests(unittest.TestCase, Base):
result = render(minimal)
from webob import Response
self.failUnless(isinstance(result, Response))
- self.assertEqual(result.app_iter, ['<div>\n</div>\n'])
+ self.assertEqual(result.app_iter,
+ ['<div xmlns="http://www.w3.org/1999/xhtml">\n</div>'])
self.assertEqual(result.status, '200 OK')
self.assertEqual(len(result.headerlist), 2)
diff --git a/repoze/bfg/tests/test_xslt.py b/repoze/bfg/tests/test_xslt.py
index 66e268331..cff33457a 100644
--- a/repoze/bfg/tests/test_xslt.py
+++ b/repoze/bfg/tests/test_xslt.py
@@ -10,9 +10,10 @@ class Base(PlacelessSetup):
PlacelessSetup.tearDown(self)
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTemplatePath(self, name):
import os
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-10 17:37:58 +0000