Add tests for RoutingFilter.

src/Routing/Filter/RoutingFilter.php

@@ -6,9 +6,23 @@ use Cake\Event\Event;
 use Cake\Routing\DispatcherFilter;
 use Cake\Routing\Router;
 
+/**
+ * A dispatcher filter that applies routing rules to the request.
+ *
+ * This filter will call Router::parse() when the request has no controller
+ * parameter defined.
+ */
 class RoutingFilter extends DispatcherFilter {
 
-	public $priority = -10;
+/**
+ * Priority setting.
+ *
+ * This filter is normally fired last just before the request
+ * is dispatched.
+ *
+ * @var int
+ */
+	protected $_priority = -10;
 
 /**
  * Applies Routing and additionalParameters to the request to be dispatched.

tests/TestCase/Routing/Filter/RoutingFilterTest.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         3.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Cake\Test\TestCase\Routing;
+
+use Cake\Event\Event;
+use Cake\Network\Request;
+use Cake\Routing\Router;
+use Cake\Routing\Filter\RoutingFilter;
+use Cake\TestSuite\TestCase;
+
+/**
+ * Routing filter test.
+ */
+class RoutingFilterTest extends TestCase {
+
+/**
+ * test setting parameters in beforeDispatch method
+ *
+ * @return void
+ */
+	public function testBeforeDispatchSkipWhenControllerSet() {
+		$filter = new RoutingFilter();
+
+		$request = new Request("/testcontroller/testaction/params1/params2/params3");
+		$request->addParams(['controller' => 'articles']);
+		$event = new Event(__CLASS__, $this, compact('request'));
+		$filter->beforeDispatch($event);
+
+		$this->assertSame($request->params['controller'], 'articles');
+		$this->assertEmpty($request->params['action']);
+	}
+
+/**
+ * test setting parameters in beforeDispatch method
+ *
+ * @return void
+ */
+	public function testBeforeDispatchSetsParameters() {
+		Router::connect('/:controller/:action/*');
+		$filter = new RoutingFilter();
+
+		$request = new Request("/testcontroller/testaction/params1/params2/params3");
+		$event = new Event(__CLASS__, $this, compact('request'));
+		$filter->beforeDispatch($event);
+
+		$this->assertSame($request->params['controller'], 'testcontroller');
+		$this->assertSame($request->params['action'], 'testaction');
+		$this->assertSame($request->params['pass'][0], 'params1');
+		$this->assertSame($request->params['pass'][1], 'params2');
+		$this->assertSame($request->params['pass'][2], 'params3');
+		$this->assertFalse(!empty($request['form']));
+	}
+
+/**
+ * test setting parameters in beforeDispatch method
+ *
+ * @return void
+ */
+	public function testQueryStringOnRoot() {
+		Router::reload();
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+		Router::connect('/:controller/:action/*');
+
+		$_GET = array('coffee' => 'life', 'sleep' => 'sissies');
+		$filter = new RoutingFilter();
+		$request = new Request('posts/home/?coffee=life&sleep=sissies');
+
+		$event = new Event(__CLASS__, $this, compact('request'));
+		$filter->beforeDispatch($event);
+
+		$this->assertRegExp('/posts/', $request['controller']);
+		$this->assertRegExp('/home/', $request['action']);
+		$this->assertTrue(isset($request['url']['sleep']));
+		$this->assertTrue(isset($request['url']['coffee']));
+
+		$request = new Request('/?coffee=life&sleep=sissy');
+
+		$event = new Event(__CLASS__, $this, compact('request'));
+		$filter->beforeDispatch($event);
+
+		$this->assertRegExp('/pages/', $request['controller']);
+		$this->assertRegExp('/display/', $request['action']);
+		$this->assertTrue(isset($request['url']['sleep']));
+		$this->assertTrue(isset($request['url']['coffee']));
+		$this->assertEquals('life', $request['url']['coffee']);
+	}
+
+}