From 1dae2c13947cd226d896eaa889ee7ee7b8cc4463 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 12 Sep 2016 23:14:08 -0400
Subject: [PATCH] Add tests for Uri object being correct.

---
 tests/TestCase/Network/RequestTest.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/TestCase/Network/RequestTest.php b/tests/TestCase/Network/RequestTest.php
index 4d7031314fd..af5257cf33f 100644
--- 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");
         }