Browse Source

Fix tests.

mscherer 6 years ago
parent
commit
62ec1b9332

+ 3 - 3
tests/TestCase/Controller/Component/UrlComponentTest.php

@@ -113,7 +113,7 @@ class UrlComponentTest extends TestCase {
 
 		$request = $this->Controller->getRequest();
 		$request = $request->withAttribute('here', '/admin/foo/bar/baz/test')
-			->withParam('prefix', 'admin')
+			->withParam('prefix', 'Admin')
 			->withParam('plugin', 'Foo');
 		$this->Controller->setRequest($request);
 		Router::reload();
@@ -121,12 +121,12 @@ class UrlComponentTest extends TestCase {
 		Router::plugin('Foo', function (RouteBuilder $routes) {
 			$routes->fallbacks();
 		});
-		Router::prefix('admin', function (RouteBuilder $routes) {
+		Router::prefix('Admin', function (RouteBuilder $routes) {
 			$routes->plugin('Foo', function (RouteBuilder $routes) {
 				$routes->fallbacks();
 			});
 		});
-		Router::pushRequest($this->Controller->getRequest());
+		Router::setRequest($this->Controller->getRequest());
 
 		$result = $this->Controller->Url->build(['controller' => 'bar', 'action' => 'baz', 'x']);
 		$expected = '/admin/foo/bar/baz/x';

+ 6 - 2
tests/test_app/Controller/RefererRedirectComponentTestController.php

@@ -12,8 +12,12 @@ use Tools\Controller\Controller;
 class RefererRedirectComponentTestController extends Controller {
 
 	/**
-	 * @var array
+	 * @return void
 	 */
-	public $components = ['Tools.RefererRedirect'];
+	public function initialize(): void {
+		parent::initialize();
+
+		$this->loadComponent('Tools.RefererRedirect');
+	}
 
 }