fix undesired 404 in develoment mode due to undefined default site

vilicvane · Dec 19, 2015 · cbda2ae · cbda2ae
1 parent a28a5d3
commit cbda2ae
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/router.ts b/src/router.ts
@@ -260,9 +260,11 @@ export class Router {
         let firstPathPart = pathParts[0];
 
         if (
-            !firstPathPart || (
-                firstPathPart !== this.defaultSubsite &&
-                !FS.existsSync(Path.join(this.routesRoot, firstPathPart))
+            this.defaultSubsite && (
+                !firstPathPart || (
+                    firstPathPart !== this.defaultSubsite &&
+                    !FS.existsSync(Path.join(this.routesRoot, firstPathPart))
+                )
             )
         ) {
             pathParts.unshift(this.defaultSubsite);
@@ -571,7 +573,7 @@ ${route.handler.toString()}`);
     }
 
     private handleNotFound(req: ExpressRequest, res: ExpressResponse): void {
-        this.renderErrorPage(req, res, new APIError(APIErrorCode.none, 'Page not Found.', 404));
+        this.renderErrorPage(req, res, new APIError(APIErrorCode.none, 'Page not Found', 404));
     }
 
     private handleServerError(req: ExpressRequest, res: ExpressResponse, error: Error, hasView: boolean): void {

diff --git a/src/test/site-single-routes/hello.ts b/src/test/site-single-routes/hello.ts
@@ -0,0 +1,8 @@
+import { Controller, Request, get, post } from '../../';
+
+export default class DefaultController extends Controller {
+    @get()
+    world() {
+        return 'abc';
+    }
+}
diff --git a/test/site-single/test-config.json b/test/site-single/test-config.json
@@ -115,6 +115,20 @@
                 }
             }
         },
+        {
+            "method": "get",
+            "path": "/hello/world",
+            "description": "should get 200",
+            "expected": {
+                "all": {
+                    "status": 200,
+                    "contentType": "application/json",
+                    "content": {
+                        "data": "abc"
+                    }
+                }
+            }
+        },
         {
             "method": "get",
             "path": "/oops",