[Checkins] SVN: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/ Adapt wsgi and grok layers to the naming convetions of the other modules, i.e. just `Layer`
Wolfgang Schnerring
wosc at wosc.de
Sat Dec 4 03:56:48 EST 2010
Log message for revision 118694:
Adapt wsgi and grok layers to the naming convetions of the other modules, i.e. just `Layer`
Changed:
U gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/__init__.py
U gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/tests.py
U gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/__init__.py
U gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/tests.py
-=-
Modified: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/__init__.py
===================================================================
--- gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/__init__.py 2010-12-03 17:21:23 UTC (rev 118693)
+++ gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/__init__.py 2010-12-04 08:56:47 UTC (rev 118694)
@@ -18,19 +18,19 @@
from zope.app.publication.httpfactory import HTTPPublicationRequestFactory
import gocept.selenium.selenese
-from gocept.selenium.wsgi import WSGILayer
+import gocept.selenium.wsgi
-class GrokLayer(ZODBLayer, WSGILayer):
+class Layer(ZODBLayer, gocept.selenium.wsgi.Layer):
application = WSGIPublisherApplication()
def setUp(self):
ZODBLayer.setUp(self)
- WSGILayer.setUp(self)
+ gocept.selenium.wsgi.Layer.setUp(self)
def tearDown(self):
- WSGILayer.tearDown(self)
+ gocept.selenium.wsgi.Layer.tearDown(self)
ZODBLayer.tearDown(self)
def testSetUp(self):
Modified: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/tests.py
===================================================================
--- gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/tests.py 2010-12-03 17:21:23 UTC (rev 118693)
+++ gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/grok/tests.py 2010-12-04 08:56:47 UTC (rev 118694)
@@ -14,10 +14,12 @@
import transaction
import gocept.selenium.grok
-from gocept.selenium.grok.fixtures import App
+import gocept.selenium.grok.fixtures
-test_layer = gocept.selenium.grok.GrokLayer(gocept.selenium.grok)
+test_layer = gocept.selenium.grok.Layer(gocept.selenium.grok)
+
+
class TestGrokTestCase(gocept.selenium.grok.TestCase):
layer = test_layer
@@ -25,7 +27,7 @@
def setUp(self):
super(TestGrokTestCase, self).setUp()
root = self.getRootFolder()
- root['app'] = App()
+ root['app'] = gocept.selenium.grok.fixtures.App()
transaction.commit()
def test_grok_layer(self):
Modified: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/__init__.py
===================================================================
--- gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/__init__.py 2010-12-03 17:21:23 UTC (rev 118693)
+++ gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/__init__.py 2010-12-04 08:56:47 UTC (rev 118694)
@@ -29,7 +29,7 @@
WSGIRequestHandler.log_request(self, *args)
-class WSGILayer(gocept.selenium.base.SaneLayer):
+class Layer(gocept.selenium.base.SaneLayer):
application = None
Modified: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/tests.py
===================================================================
--- gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/tests.py 2010-12-03 17:21:23 UTC (rev 118693)
+++ gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/wsgi/tests.py 2010-12-04 08:56:47 UTC (rev 118694)
@@ -15,11 +15,15 @@
import gocept.selenium.wsgi
from gocept.selenium.wsgi.testing import SimpleApp
-class TestLayer(gocept.selenium.wsgi.WSGILayer):
+
+class TestLayer(gocept.selenium.wsgi.Layer):
+
application = SimpleApp()
+
test_layer = TestLayer()
+
class TestWSGITestCase(gocept.selenium.wsgi.TestCase):
layer = test_layer
More information about the checkins
mailing list