Fix helper tests.

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -117,6 +117,7 @@ class HtmlHelperTest extends TestCase
     public function testLink()
     {
         Router::reload();
+        Router::connect('/:controller', ['action' => 'index']);
         Router::connect('/:controller/:action/*');
 
         $this->View->setRequest($this->View->getRequest()->withAttribute('webroot', ''));
@@ -125,18 +126,14 @@ class HtmlHelperTest extends TestCase
         $expected = ['a' => ['href' => '/home'], 'preg:/\/home/', '/a'];
         $this->assertHtml($expected, $result);
 
-        $result = $this->Html->link(['action' => 'login', '<[You]>']);
+        $result = $this->Html->link(['controller' => 'users',  'action' => 'login', '<[You]>']);
         $expected = [
-            'a' => ['href' => '/login/%3C%5BYou%5D%3E'],
-            'preg:/\/login\/&lt;\[You\]&gt;/',
+            'a' => ['href' => '/users/login/%3C%5BYou%5D%3E'],
+            'preg:/\/users\/login\/&lt;\[You\]&gt;/',
             '/a',
         ];
         $this->assertHtml($expected, $result);
 
-        Router::reload();
-        Router::connect('/:controller', ['action' => 'index']);
-        Router::connect('/:controller/:action/*');
-
         $result = $this->Html->link('Posts', ['controller' => 'posts', 'action' => 'index', '_full' => true]);
         $expected = ['a' => ['href' => Router::fullBaseUrl() . '/posts'], 'Posts', '/a'];
         $this->assertHtml($expected, $result);

tests/TestCase/View/Helper/PaginatorHelperTest.php

@@ -55,6 +55,9 @@ class PaginatorHelperTest extends TestCase
         $request = new ServerRequest([
             'url' => '/',
             'params' => [
+                'plugin' => null,
+                'controller' => '',
+                'action' => 'index',
                 'paging' => [
                     'Article' => [
                         'page' => 1,
@@ -76,6 +79,7 @@ class PaginatorHelperTest extends TestCase
         Router::reload();
         Router::connect('/:controller/:action/*');
         Router::connect('/:plugin/:controller/:action/*');
+        Router::pushRequest($request);
 
         $this->locale = I18n::getLocale();
     }