Skip to content

Commit 0bd072f

Browse files
mikebronnermikebronner
authored
Merge pull request #298 from Hornet-Wing/feature/fixing-test-typos
Fixed string template syntax in CachedBuilderTest
2 parents 01f91ba + 6e900ad commit 0bd072f

File tree

3 files changed

+17
-73
lines changed

3 files changed

+17
-73
lines changed

‎tests/Feature/PaginationTest.php‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,19 @@
22

33
use GeneaLabs\LaravelModelCaching\Tests\FeatureTestCase;
44
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
5-
use Illuminate\Support\Str;
65

76
class PaginationTest extends FeatureTestCase
87
{
98
public function testPaginationProvidesDifferentLinksOnDifferentPages()
109
{
11-
if (Str::startsWith(app()->version(), "5.6")
12-
|| Str::startsWith(app()->version(), "5.7")
13-
|| Str::startsWith(app()->version(), "5.8")
14-
|| Str::startsWith(app()->version(), "6.0")
15-
) {
10+
// Checking the version start with 5.6, 5.7, 5.8 or 6.
11+
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
1612
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
1713
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
1814
}
1915

20-
if (Str::startsWith(app()->version(), "5.5")) {
21-
$page1ActiveLink = '<li class="active"><span>1</span></li>';
22-
$page2ActiveLink = '<li class="active"><span>2</span></li>';
23-
}
24-
25-
if (Str::startsWith(app()->version(), "5.4")) {
16+
// Checking the version 5.4 and 5.5
17+
if (preg_match("/^5\.[4-5]/", app()->version())) {
2618
$page1ActiveLink = '<li class="active"><span>1</span></li>';
2719
$page2ActiveLink = '<li class="active"><span>2</span></li>';
2820
}
@@ -41,21 +33,12 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
4133

4234
public function testAdvancedPagination()
4335
{
44-
if (Str::startsWith(app()->version(), "5.6")
45-
|| Str::startsWith(app()->version(), "5.7")
46-
|| Str::startsWith(app()->version(), "5.8")
47-
|| Str::startsWith(app()->version(), "6.0")
48-
) {
36+
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
4937
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
5038
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
5139
}
5240

53-
if (Str::startsWith(app()->version(), "5.5")) {
54-
$page1ActiveLink = '<li class="active"><span>1</span></li>';
55-
$page2ActiveLink = '<li class="active"><span>2</span></li>';
56-
}
57-
58-
if (Str::startsWith(app()->version(), "5.4")) {
41+
if (preg_match("/^5\.[4-5]/", app()->version())) {
5942
$page1ActiveLink = '<li class="active"><span>1</span></li>';
6043
$page2ActiveLink = '<li class="active"><span>2</span></li>';
6144
}
@@ -67,21 +50,12 @@ public function testAdvancedPagination()
6750

6851
public function testCustomPagination()
6952
{
70-
if (Str::startsWith(app()->version(), "5.6")
71-
|| Str::startsWith(app()->version(), "5.7")
72-
|| Str::startsWith(app()->version(), "5.8")
73-
|| Str::startsWith(app()->version(), "6.0")
74-
) {
53+
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
7554
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
7655
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
7756
}
7857

79-
if (Str::startsWith(app()->version(), "5.5")) {
80-
$page1ActiveLink = '<li class="active"><span>1</span></li>';
81-
$page2ActiveLink = '<li class="active"><span>2</span></li>';
82-
}
83-
84-
if (Str::startsWith(app()->version(), "5.4")) {
58+
if (preg_match("/^5\.[4-5]/", app()->version())) {
8559
$page1ActiveLink = '<li class="active"><span>1</span></li>';
8660
$page2ActiveLink = '<li class="active"><span>2</span></li>';
8761
}

‎tests/Integration/CachedBuilder/PaginateTest.php‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,13 @@ public function testPaginationIsCached()
3636

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

49-
if (Str::startsWith(app()->version(), "5.5")) {
50-
$page1ActiveLink = '<li class="active"><span>1</span></li>';
51-
$page2ActiveLink = '<li class="active"><span>2</span></li>';
52-
$page24ActiveLink = '<li class="active"><span>24</span></li>';
53-
}
54-
55-
if (Str::startsWith(app()->version(), "5.4")) {
45+
if (preg_match("/^5\.[4-5]/", app()->version())) {
5646
$page1ActiveLink = '<li class="active"><span>1</span></li>';
5747
$page2ActiveLink = '<li class="active"><span>2</span></li>';
5848
$page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -75,23 +65,13 @@ public function testPaginationReturnsCorrectLinks()
7565

7666
public function testPaginationWithOptionsReturnsCorrectLinks()
7767
{
78-
if (Str::startsWith(app()->version(), "5.6")
79-
|| Str::startsWith(app()->version(), "5.7")
80-
|| Str::startsWith(app()->version(), "5.8")
81-
|| Str::startsWith(app()->version(), "6.0")
82-
) {
68+
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
8369
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
8470
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
8571
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
8672
}
8773

88-
if (Str::startsWith(app()->version(), "5.5")) {
89-
$page1ActiveLink = '<li class="active"><span>1</span></li>';
90-
$page2ActiveLink = '<li class="active"><span>2</span></li>';
91-
$page24ActiveLink = '<li class="active"><span>24</span></li>';
92-
}
93-
94-
if (Str::startsWith(app()->version(), "5.4")) {
74+
if (preg_match("/^5\.[4-5]/", app()->version())) {
9575
$page1ActiveLink = '<li class="active"><span>1</span></li>';
9676
$page2ActiveLink = '<li class="active"><span>2</span></li>';
9777
$page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -114,23 +94,13 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
11494

11595
public function testPaginationWithCustomOptionsReturnsCorrectLinks()
11696
{
117-
if (Str::startsWith(app()->version(), "5.6")
118-
|| Str::startsWith(app()->version(), "5.7")
119-
|| Str::startsWith(app()->version(), "5.8")
120-
|| Str::startsWith(app()->version(), "6.0")
121-
) {
97+
if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
12298
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
12399
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
124100
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
125101
}
126102

127-
if (Str::startsWith(app()->version(), "5.5")) {
128-
$page1ActiveLink = '<li class="active"><span>1</span></li>';
129-
$page2ActiveLink = '<li class="active"><span>2</span></li>';
130-
$page24ActiveLink = '<li class="active"><span>24</span></li>';
131-
}
132-
133-
if (Str::startsWith(app()->version(), "5.4")) {
103+
if (preg_match("/^5\.[4-5]/", app()->version())) {
134104
$page1ActiveLink = '<li class="active"><span>1</span></li>';
135105
$page2ActiveLink = '<li class="active"><span>2</span></li>';
136106
$page24ActiveLink = '<li class="active"><span>24</span></li>';

‎tests/Integration/CachedBuilderTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testCreatingModelClearsCache()
4949
])
5050
->get(sha1(
5151
"genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_" .
52-
'7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks'
52+
"7_8_9_10-genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbooks"
5353
));
5454

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

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

9090
$this->assertNull($results);

0 commit comments

Comments
 (0)