Send 404 response code

PhpGt · Aug 16, 2014 · a880f1e · a880f1e
1 parent 8bd3286
commit a880f1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Dispatcher/PageDispatcher.php b/src/Dispatcher/PageDispatcher.php
@@ -21,9 +21,14 @@ public function getPath($uri, &$fixedUri) {
 	if(!is_dir($pageViewDir)) {
 		$pageViewDir_container = dirname($pageViewDir);
 
-		if(!is_dir($pageViewDir_container)) {
+		if(is_dir($pageViewDir_container)) {
+			if(!file_exists($pageViewPath . $fixedUri)) {
+				throw new NotFoundException($fixedUri);
+			}
+		}
+		else {
 			throw new NotFoundException(
-				$pageViewDir
+				$fixedUri
 			);
 		}
 

diff --git a/test/Acceptance/SinglePage/test/Acceptance/Features/render.feature b/test/Acceptance/SinglePage/test/Acceptance/Features/render.feature
@@ -5,4 +5,8 @@ Feature: Test that users see the page
 
 	Scenario: Open homepage
 		Given I go to the homepage
-		Then I should see "Test Page (Single Page Application)"
+		Then I should see "Test Page (Single Page Application)"
+
+	Scenario: Access invalid page
+		Given I go to "/invalid-page"
+		Then the response status code should be 404