Fix aliased contexts and add regression test

Author: Cito

webware/Tests/TestEndToEnd/AppTest.py

@@ -30,23 +30,23 @@ def setUpClass(cls):
             app = Application(settings=cls.settings, development=True)
             cls.app = app
             cls.testApp = TestApp(app)
-        except Exception:
-            error = True
+        except Exception as e:
+            error = str(e) or 'Could not create application'
         else:
-            error = False
+            error = None
         finally:
             output = sys.stdout.getvalue().rstrip()
             sys.stdout, sys.stderr = stdout, stderr
         if error:
             raise RuntimeError(
-                'Error setting up application. Output was:\n'
-                + output)
+                'Error setting up application:\n' + error +
+                '\nOutput was:\n' + output)
         if (not output.startswith('Webware for Python')
                 or 'Running in development mode' not in output
                 or 'Loading context' not in output):
             raise AssertionError(
-                'Application was not properly started. Output was:\n'
-                + output)
+                'Application was not properly started.'
+                ' Output was:\n' + output)
 
     @classmethod
     def tearDownClass(cls):

webware/Tests/TestEndToEnd/TestContextMap.py

@@ -0,0 +1,86 @@
+"""Test Webware Testing context"""
+
+import unittest
+
+from .AppTest import AppTest
+
+
+class TestContextMap(AppTest, unittest.TestCase):
+
+    settings = dict(
+        PrintConfigAtStartUp=False,
+        ExtraPathInfo=False,
+        Contexts={'Testing': 'Testing', 'default': 'Testing'}
+    )
+
+    def testStartPage(self):
+        r = self.testApp.get('/')
+        self.assertEqual(r.status, '200 OK')
+        self.assertEqual(r.request.path, '/')
+        r.mustcontain('<title>Testing</title>')
+
+    def testContextPage(self):
+        r = self.testApp.get('/Testing/')
+        self.assertEqual(r.status, '200 OK')
+        self.assertEqual(r.request.path, '/Testing/')
+        r.mustcontain('<title>Testing</title>')
+
+    def testBadContextPage(self):
+        r = self.testApp.get('/default/', expect_errors=True)
+        self.assertEqual(r.status, '404 Not Found', r.status)
+        r = self.testApp.get('/TestAlias/', expect_errors=True)
+        self.assertEqual(r.status, '404 Not Found', r.status)
+
+
+class TestAliasedContext(AppTest, unittest.TestCase):
+
+    settings = dict(
+        PrintConfigAtStartUp=False,
+        ExtraPathInfo=False,
+        Contexts={'TestAlias': 'Testing', 'default': 'TestAlias'}
+    )
+
+    def testStartPage(self):
+        r = self.testApp.get('/')
+        self.assertEqual(r.status, '200 OK')
+        self.assertEqual(r.request.path, '/')
+        r.mustcontain('<title>Testing</title>')
+
+    def testContextPage(self):
+        r = self.testApp.get('/TestAlias/')
+        self.assertEqual(r.status, '200 OK')
+        self.assertEqual(r.request.path, '/TestAlias/')
+        r.mustcontain('<title>Testing</title>')
+
+    def testBadContextPage(self):
+        r = self.testApp.get('/default/', expect_errors=True)
+        self.assertEqual(r.status, '404 Not Found', r.status)
+        r = self.testApp.get('/Testing/', expect_errors=True)
+        self.assertEqual(r.status, '404 Not Found', r.status)
+
+
+class TestOnlyDefaultContext(AppTest, unittest.TestCase):
+
+    settings = dict(
+        PrintConfigAtStartUp=False,
+        ExtraPathInfo=False,
+        Contexts={'default': 'Testing'}
+    )
+
+    def testStartPage(self):
+        r = self.testApp.get('/')
+        self.assertEqual(r.status, '200 OK')
+        self.assertEqual(r.request.path, '/')
+        r.mustcontain('<title>Testing</title>')
+
+    def testContextPage(self):
+        r = self.testApp.get('/default/')
+        self.assertEqual(r.status, '200 OK')
+        self.assertEqual(r.request.path, '/default/')
+        r.mustcontain('<title>Testing</title>')
+
+    def testBadContextPage(self):
+        r = self.testApp.get('/Testing/', expect_errors=True)
+        self.assertEqual(r.status, '404 Not Found', r.status)
+        r = self.testApp.get('/TestAlias/', expect_errors=True)
+        self.assertEqual(r.status, '404 Not Found', r.status)

webware/URLParser.py

@@ -184,7 +184,6 @@ def addContext(self, name, path):
             try:
                 localDir, packageName = os.path.split(path)
                 spec = self._imp.findSpec(packageName, localDir or '.')
-                spec.name = name.rpartition('/')[2]
                 try:
                     module = self._imp.moduleFromSpec(spec)
                 except ImportError as e: