Merge fc1a64b into c8f785c

zopefoundation · Dec 15, 2018 · 124b666 · 124b666
2 parents c8f785c + fc1a64b
commit 124b666
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,16 @@
+*.egg-info/
+*.eggs
+*.py[co]
+.coverage
+.coverage.*
+.installed.cfg
+.tox/
+__pycache__/
+bin/
+build/
+coverage.xml
+develop-eggs/
+dist/
+eggs/
+htmlcov/
+parts/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: python
+python:
+    - 2.7
+install:
+    - pip install -U pip setuptools
+    - pip install -U coverage coveralls zope.testrunner
+    - pip install -U -e .[test]
+script:
+    - coverage run -m zope.testrunner --test-path=src
+after_success:
+    - coveralls
+notifications:
+    email: false
+cache: pip
diff --git a/CHANGES.txt → CHANGES.rst b/CHANGES.txt → CHANGES.rst
@@ -5,7 +5,7 @@ Changes
 0.6 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Update tests to `zope.testbrowser >= 5`.
 
 
 0.5 (2013-03-09)

diff --git a/README.txt → README.rst b/README.txt → README.rst
diff --git a/TODO.txt → TODO.rst b/TODO.txt → TODO.rst
diff --git a/setup.py b/setup.py
@@ -27,12 +27,12 @@ def read(path):
     author_email = "zope-dev@zope.org",
     description = "UI for zope.preference using z3c.pagelet and z3c.form.",
     long_description='\n\n'.join([
-            read('README.txt'),
+            read('README.rst'),
             '.. contents::',
-            read('CHANGES.txt'),
-            read('src/z3c/preference/README.txt'),
-            read('src/z3c/preference/categories.txt'),
-            read('TODO.txt'),
+            read('CHANGES.rst'),
+            read('src/z3c/preference/README.rst'),
+            read('src/z3c/preference/categories.rst'),
+            read('TODO.rst'),
         ]),
     license = "ZPL 2.1",
     keywords = "zope3 bluebream z3c preference ui",
@@ -61,7 +61,7 @@ def read(path):
             'zope.principalregistry',
             'zope.app.principalannotation',
             'zope.securitypolicy',
-            'zope.testbrowser',
+            'zope.testbrowser >= 5',
             'zope.testing',
             ],
         ),

diff --git a/src/z3c/preference/README.txt → src/z3c/preference/README.rst b/src/z3c/preference/README.txt → src/z3c/preference/README.rst
@@ -71,7 +71,7 @@ The interface must be registered for preferences:
 To access the forms a browser is needed, the user must be authorized as
 the preferences are stored in the principal annotations:
 
->>> from zope.app.wsgi.testlayer import Browser
+>>> from zope.testbrowser.wsgi import Browser
 >>> browser = Browser()
 >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
 

diff --git a/src/z3c/preference/categories.txt → src/z3c/preference/categories.rst b/src/z3c/preference/categories.txt → src/z3c/preference/categories.rst
@@ -86,7 +86,7 @@ The interfaces must be registered for preferences:
 To access the forms a browser is needed, the user must be authorized as
 the preferences are stored in the principal annotations:
 
->>> from zope.app.wsgi.testlayer import Browser
+>>> from zope.testbrowser.wsgi import Browser
 >>> browser = Browser()
 >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
 

diff --git a/src/z3c/preference/testing.py b/src/z3c/preference/testing.py
@@ -14,5 +14,22 @@
 
 import z3c.preference
 import zope.app.wsgi.testlayer
+import zope.testbrowser.wsgi
 
-Layer = zope.app.wsgi.testlayer.BrowserLayer(z3c.preference)
+
+class BrowserLayer(zope.testbrowser.wsgi.Layer,
+                   zope.app.wsgi.testlayer.BrowserLayer):
+    """BrowserLayer which is compatible with zope.testbrowser."""
+
+    def testSetUp(self):
+        super(BrowserLayer, self).testSetUp()
+        self._application.requestFactory._db = self.db
+
+    def testTearDown(self):
+        self._application.requestFactory._publication_cache.clear()
+        super(BrowserLayer, self).testTearDown()
+
+    make_wsgi_app = zope.app.wsgi.testlayer.BrowserLayer.make_wsgi_app
+
+
+Layer = BrowserLayer(z3c.preference)
diff --git a/src/z3c/preference/tests.py b/src/z3c/preference/tests.py
@@ -29,8 +29,8 @@ def tearDown(test):
 
 def test_suite():
     suite = doctest.DocFileSuite(
-        'README.txt',
-        'categories.txt',
+        'README.rst',
+        'categories.rst',
         setUp=setUp,
         tearDown=tearDown,
         optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,21 @@
+[tox]
+envlist =
+    py27,
+    coverage,
+
+[testenv]
+usedevelop = true
+commands =
+    zope-testrunner --test-path=src []
+extras = test
+deps =
+    zope.testrunner
+
+[testenv:coverage]
+basepython = python2.7
+commands =
+    coverage run -m zope.testrunner --test-path=src []
+    coverage report --fail-under=86
+deps =
+    zope.testrunner
+    coverage