Fix routes not matching without trailing /

Routes connected in scopes should match both the / and non / terminated
URLs.

Refs #4218

Author: markstory

src/Routing/RouteBuilder.php

@@ -346,6 +346,8 @@ protected function _makeRoute($route, $defaults, $options) {
 			unset($options['routeClass']);
 
 			$route = str_replace('//', '/', $this->_path . $route);
+			$route = $route === '/' ? $route : rtrim($route, '/');
+
 			foreach ($this->_params as $param => $val) {
 				if (isset($defaults[$param]) && $defaults[$param] !== $val) {
 					$msg = 'You cannot define routes that conflict with the scope. ' .

tests/TestCase/Routing/RouteBuilderTest.php

@@ -112,6 +112,20 @@ public function testConnectBasic() {
 		$this->assertEquals($expected, $route->defaults);
 	}
 
+/**
+ * Test that compiling a route results in an trailing / optional pattern.
+ *
+ * @return void
+ */
+	public function testConnectTrimTrailingSlash() {
+		$routes = new RouteBuilder($this->collection, '/articles', ['controller' => 'Articles']);
+		$routes->connect('/', ['action' => 'index']);
+
+		$expected = ['plugin' => null, 'controller' => 'Articles', 'action' => 'index', 'pass' => []];
+		$this->assertEquals($expected, $this->collection->parse('/articles'));
+		$this->assertEquals($expected, $this->collection->parse('/articles/'));
+	}
+
 /**
  * Test extensions being connected to routes.
  *