Skip to content

Commit

Permalink
fix failing tests for previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
offline committed Aug 16, 2016
1 parent d991ded commit 2f157af
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions tests/TestCase/View/Helper/PaginatorHelperTest.php
View file
Expand Up @@ -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',
Expand All @@ -1265,15 +1265,15 @@ 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);

$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',
Expand All @@ -1283,15 +1283,15 @@ 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);

$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',
Expand All @@ -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);
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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);
Expand All @@ -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',
Expand Down Expand Up @@ -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=""', '4895', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li',
Expand All @@ -1610,7 +1610,7 @@ public function testNumbersModulus()
['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li',
['li' => ['class' => 'active']], '<a href=""', '3', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li',
];
Expand All @@ -1622,7 +1622,7 @@ public function testNumbersModulus()
['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li',
['li' => ['class' => 'active']], '<a href=""', '3', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li',
];
Expand All @@ -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']], '&hellip;', '/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',
Expand All @@ -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']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=4891']], '4891', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4892']], '4892', '/a', '/li',
['li' => ['class' => 'active']], '<a href=""', '4893', '/a', '/li',
Expand All @@ -1672,13 +1672,13 @@ 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']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=56']], '56', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=57']], '57', '/a', '/li',
['li' => ['class' => 'active']], '<a href=""', '58', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=59']], '59', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=60']], '60', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/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',
Expand All @@ -1697,7 +1697,7 @@ public function testNumbersModulus()
['li' => ['class' => 'active']], '<a href=""', '5', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=6']], '6', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=7']], '7', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/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',
Expand All @@ -1713,7 +1713,7 @@ public function testNumbersModulus()
['li' => []], ['a' => ['href' => '/index?page=2']], '2', '/a', '/li',
['li' => ['class' => 'active']], '<a href=""', '3', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4']], '4', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li',
];
Expand All @@ -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']], '<a href=""', '3', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=4896']], '4896', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4897']], '4897', '/a', '/li',
];
Expand Down Expand Up @@ -1813,7 +1813,7 @@ public function testNumbersWithUrlOptions()
['li' => []], ['a' => ['href' => '/index?page=2&amp;foo=bar']], '2', '/a', '/li',
['li' => ['class' => 'active']], '<a href=""', '3', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4&amp;foo=bar']], '4', '/a', '/li',
['li' => ['class' => 'ellipsis']], '...', '/li',
['li' => ['class' => 'ellipsis']], '&hellip;', '/li',
['li' => []], ['a' => ['href' => '/index?page=4896&amp;foo=bar']], '4896', '/a', '/li',
['li' => []], ['a' => ['href' => '/index?page=4897&amp;foo=bar']], '4897', '/a', '/li',
];
Expand Down

0 comments on commit 2f157af

Please sign in to comment.