Skip to content

Fixed string template syntax in CachedBuilderTest #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2019
Merged

Fixed string template syntax in CachedBuilderTest #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ea2fd
Fixed string template syntax in CachedBuilderTest
Hornet-Wing Oct 12, 2019
6e900ad
Adapting pagination testing to allow for new Laravel versioning
Hornet-Wing Oct 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 8 additions & 34 deletions tests/Feature/PaginationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,19 @@

use GeneaLabs\LaravelModelCaching\Tests\FeatureTestCase;
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
use Illuminate\Support\Str;

class PaginationTest extends FeatureTestCase
{
public function testPaginationProvidesDifferentLinksOnDifferentPages()
{
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
// Checking the version start with 5.6, 5.7, 5.8 or 6.
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
}

if (Str::startsWith(app()->version(), "5.5")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}

if (Str::startsWith(app()->version(), "5.4")) {
// Checking the version 5.4 and 5.5
if (preg_match("/^5\.[4-5]/", app()->version())) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}
Expand All @@ -41,21 +33,12 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()

public function testAdvancedPagination()
{
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
}

if (Str::startsWith(app()->version(), "5.5")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}

if (Str::startsWith(app()->version(), "5.4")) {
if (preg_match("/^5\.[4-5]/", app()->version())) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}
Expand All @@ -67,21 +50,12 @@ public function testAdvancedPagination()

public function testCustomPagination()
{
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
}

if (Str::startsWith(app()->version(), "5.5")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}

if (Str::startsWith(app()->version(), "5.4")) {
if (preg_match("/^5\.[4-5]/", app()->version())) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}
Expand Down
42 changes: 6 additions & 36 deletions tests/Integration/CachedBuilder/PaginateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,13 @@ public function testPaginationIsCached()

public function testPaginationReturnsCorrectLinks()
{
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
}

if (Str::startsWith(app()->version(), "5.5")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
}

if (Str::startsWith(app()->version(), "5.4")) {
if (preg_match("/^5\.[4-5]/", app()->version())) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
Expand All @@ -75,23 +65,13 @@ public function testPaginationReturnsCorrectLinks()

public function testPaginationWithOptionsReturnsCorrectLinks()
{
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
}

if (Str::startsWith(app()->version(), "5.5")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
}

if (Str::startsWith(app()->version(), "5.4")) {
if (preg_match("/^5\.[4-5]/", app()->version())) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
Expand All @@ -114,23 +94,13 @@ public function testPaginationWithOptionsReturnsCorrectLinks()

public function testPaginationWithCustomOptionsReturnsCorrectLinks()
{
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
}

if (Str::startsWith(app()->version(), "5.5")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
}

if (Str::startsWith(app()->version(), "5.4")) {
if (preg_match("/^5\.[4-5]/", app()->version())) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
Expand Down
6 changes: 3 additions & 3 deletions tests/Integration/CachedBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function testCreatingModelClearsCache()
])
->get(sha1(
"genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_" .
'7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks'
"7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks"
));

$this->assertNull($results);
Expand All @@ -67,7 +67,7 @@ public function testUpdatingModelClearsCache()
])
->get(sha1(
"genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_" .
'7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks'
"7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks"
));

$this->assertNull($results);
Expand All @@ -84,7 +84,7 @@ public function testDeletingModelClearsCache()
])
->get(sha1(
"genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_" .
'7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks'
"7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks"
));

$this->assertNull($results);
Expand Down