From 2f157af10087097afdc4e5673cb63369cc446e1b Mon Sep 17 00:00:00 2001 From: offline Date: Tue, 16 Aug 2016 18:29:24 +0200 Subject: [PATCH] fix failing tests for previous commit --- .../View/Helper/PaginatorHelperTest.php | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php index 0741076336b..d1ea9968cd4 100644 --- a/tests/TestCase/View/Helper/PaginatorHelperTest.php +++ b/tests/TestCase/View/Helper/PaginatorHelperTest.php @@ -1255,7 +1255,7 @@ public function testNumbers() $result = $this->Paginator->numbers(['first' => 'first', 'last' => 'last']); $expected = [ ['li' => ['class' => 'first']], ['a' => ['href' => '/index']], 'first', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=5']], '5', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li', @@ -1265,7 +1265,7 @@ public function testNumbers() ['li' => []], ['a' => ['href' => '/index?page=10']], '10', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=11']], '11', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=12']], '12', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => ['class' => 'last']], ['a' => ['href' => '/index?page=15']], 'last', '/a', '/li', ]; $this->assertHtml($expected, $result); @@ -1273,7 +1273,7 @@ public function testNumbers() $result = $this->Paginator->numbers(['first' => '2', 'last' => '8']); $expected = [ ['li' => ['class' => 'first']], ['a' => ['href' => '/index']], '2', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=5']], '5', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li', @@ -1283,7 +1283,7 @@ public function testNumbers() ['li' => []], ['a' => ['href' => '/index?page=10']], '10', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=11']], '11', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=12']], '12', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => ['class' => 'last']], ['a' => ['href' => '/index?page=15']], '8', '/a', '/li', ]; $this->assertHtml($expected, $result); @@ -1291,7 +1291,7 @@ public function testNumbers() $result = $this->Paginator->numbers(['first' => '8', 'last' => '8']); $expected = [ ['li' => ['class' => 'first']], ['a' => ['href' => '/index']], '8', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=5']], '5', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li', @@ -1301,7 +1301,7 @@ public function testNumbers() ['li' => []], ['a' => ['href' => '/index?page=10']], '10', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=11']], '11', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=12']], '12', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => ['class' => 'last']], ['a' => ['href' => '/index?page=15']], '8', '/a', '/li', ]; $this->assertHtml($expected, $result); @@ -1407,7 +1407,7 @@ public function testNumbers() $result = $this->Paginator->numbers(['first' => 1]); $expected = [ ['li' => []], ['a' => ['href' => '/index']], '1', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=7']], '7', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=8']], '8', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=9']], '9', '/a', '/li', @@ -1434,7 +1434,7 @@ public function testNumbers() $result = $this->Paginator->numbers(['first' => 1, 'last' => 1]); $expected = [ ['li' => []], ['a' => ['href' => '/index']], '1', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=7']], '7', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=8']], '8', '/a', '/li', @@ -1471,7 +1471,7 @@ public function testNumbers() ['li' => []], ['a' => ['href' => '/index?page=8']], '8', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=9']], '9', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=10']], '10', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=42']], '42', '/a', '/li', ]; $this->assertHtml($expected, $result); @@ -1490,7 +1490,7 @@ public function testNumbers() $result = $this->Paginator->numbers(['first' => 1, 'last' => 1]); $expected = [ ['li' => []], ['a' => ['href' => '/index']], '1', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=33']], '33', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=34']], '34', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=35']], '35', '/a', '/li', @@ -1594,7 +1594,7 @@ public function testNumbersModulus() $expected = [ ['li' => []], ['a' => ['href' => '/index']], '1', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4894']], '4894', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li', @@ -1610,7 +1610,7 @@ public function testNumbersModulus() ['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li', ]; @@ -1622,7 +1622,7 @@ public function testNumbersModulus() ['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li', ]; @@ -1636,7 +1636,7 @@ public function testNumbersModulus() ['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=5']], '5', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4893']], '4893', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4894']], '4894', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4895']], '4895', '/a', '/li', @@ -1653,7 +1653,7 @@ public function testNumbersModulus() ['li' => []], ['a' => ['href' => '/index?page=3']], '3', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=5']], '5', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4891']], '4891', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4892']], '4892', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=3']], '3', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=5']], '5', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=56']], '56', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=57']], '57', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=59']], '59', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=60']], '60', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4893']], '4893', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4894']], '4894', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4895']], '4895', '/a', '/li', @@ -1697,7 +1697,7 @@ public function testNumbersModulus() ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=7']], '7', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4893']], '4893', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4894']], '4894', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4895']], '4895', '/a', '/li', @@ -1713,7 +1713,7 @@ public function testNumbersModulus() ['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li', ]; @@ -1725,7 +1725,7 @@ public function testNumbersModulus() ['li' => []], ['a' => ['href' => '/index']], '1', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li', ['li' => ['class' => 'active']], ' ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li', ]; @@ -1813,7 +1813,7 @@ public function testNumbersWithUrlOptions() ['li' => []], ['a' => ['href' => '/index?page=2&foo=bar']], '2', '/a', '/li', ['li' => ['class' => 'active']], ' []], ['a' => ['href' => '/index?page=4&foo=bar']], '4', '/a', '/li', - ['li' => ['class' => 'ellipsis']], '...', '/li', + ['li' => ['class' => 'ellipsis']], '…', '/li', ['li' => []], ['a' => ['href' => '/index?page=4896&foo=bar']], '4896', '/a', '/li', ['li' => []], ['a' => ['href' => '/index?page=4897&foo=bar']], '4897', '/a', '/li', ];