Add tests for Uri object being correct.

cakephp · Sep 13, 2016 · 1dae2c1 · 1dae2c1
1 parent 81fc2f8
commit 1dae2c1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/tests/TestCase/Network/RequestTest.php b/tests/TestCase/Network/RequestTest.php
@@ -2198,9 +2198,17 @@ public function testEnvironmentDetection($name, $env, $expected)
         $this->_loadEnvironment($env);
 
         $request = Request::createFromGlobals();
-        $this->assertEquals($expected['url'], $request->url, "url error");
-        $this->assertEquals($expected['base'], $request->base, "base error");
+        $uri = $request->getUri();
+
+        $this->assertEquals($expected['url'], $request->url, "URL is incorrect");
+        $this->assertEquals('/' . $expected['url'], $uri->getPath(), 'Uri->getPath() is incorrect');
+
+        $this->assertEquals($expected['base'], $request->base, "base is incorrect");
+        $this->assertEquals($expected['base'], $request->getAttribute('base'), "base is incorrect");
+
         $this->assertEquals($expected['webroot'], $request->webroot, "webroot error");
+        $this->assertEquals($expected['webroot'], $request->getAttribute('webroot'), "webroot is incorrect");
+
         if (isset($expected['urlParams'])) {
             $this->assertEquals($expected['urlParams'], $request->query, "GET param mismatch");
         }