Test get filename from requested URI

PhpGt · Aug 12, 2014 · 8734afd · 8734afd
1 parent 55f75ca
commit 8734afd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/Dispatcher/Dispatcher.php b/src/Dispatcher/Dispatcher.php
@@ -122,15 +122,11 @@ public function process() {
 /**
  * Gets the name of the requested file in the current directory path, or returns
  * the default index filename if the directory is requested.
- * TODO: Needs test!
  */
 public function getFilename($uri, $indexFilename, $path) {
-	$filename = basename($this->request->uri);
-	if(empty($filename)
-	// TODO: Temporary solution. Needs to be robust, so nested directories of
-	// the same name are possible.
-	|| strtolower($filename) === strtolower(basename($path))) {
-		$filename = $this->request->indexFilename;
+	$filename = basename($uri);
+	if(empty($filename) || substr($uri, -1) === "/") {
+		$filename = $indexFilename;
 	}
 
 	return $filename;

diff --git a/test/Unit/Dispatcher/PageDispatcher.test.php b/test/Unit/Dispatcher/PageDispatcher.test.php
@@ -46,6 +46,7 @@ public function tearDown() {
 	"/directory/",
 	"/directory/inner-file",
 	"/directory/nested/double-inner-file",
+	"/doubleName/doubleName",
 ];
 
 public function data_uris() {
@@ -215,8 +216,26 @@ public function testCreateResponseContentThrowsTypeException() {
 	$responseContent = $this->dispatcher->createResponseContent($notHtml);
 }
 
-// public function testGetFilenameRequestedFromUri() {
-// 	// Or index filename if none set.
+/**
+ * @dataProvider data_uris
+ */
+public function testGetFilenameRequestedFromUri($uri) {
+	$path = $this->pageViewDir;
+	$filename = $this->dispatcher->getFilename($uri, "index", $path);
+
+	if(substr($uri, -1) === "/") {
+		$this->assertEquals("index", $filename);
+	}
+	else {
+		$this->assertEquals(basename($uri), $filename);
+	}
+}
+
+// /**
+//  * @dataProvider data_uris
+//  */
+// public function testDispatcherFixesUri($uri) {
+
 // }
 
 }#