Make pagination test compatible with L5.4

Author: mikebronner

phpunit.xml

@@ -9,7 +9,7 @@
     convertWarningsToExceptions="true"
     printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
-    stopOnFailure="true"
+    stopOnFailure="false"
     syntaxCheck="false"
 >
 <testsuites>

tests/Feature/PaginationTest.php

@@ -7,12 +7,20 @@ class PaginationTest extends FeatureTestCase
 {
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
-        $page1ActiveLink = starts_with(app()->version(), "5.5")
-            ? '<li class="active"><span>1</span></li>'
-            : '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
-        $page2ActiveLink = starts_with(app()->version(), "5.5")
-            ? '<li class="active"><span>2</span></li>'
-            : '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
+        if (starts_with(app()->version(), "5.6")) {
+            $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 (starts_with(app()->version(), "5.5")) {
+            $page1ActiveLink = '<li class="active"><span>1</span></li>';
+            $page2ActiveLink = '<li class="active"><span>2</span></li>';
+        }
+
+        if (starts_with(app()->version(), "5.4")) {
+            $page1ActiveLink = '<li class="active"><span>1</span></li>';
+            $page2ActiveLink = '<li class="active"><span>2</span></li>';
+        }
 
         $book = (new Book)
             ->take(11)

tests/Integration/CachedBuilderTest.php

@@ -20,7 +20,7 @@
  */
 class CachedBuilderTest extends IntegrationTestCase
 {
-    
+
 
     public function testCacheIsEmptyBeforeLoadingModels()
     {
@@ -673,7 +673,6 @@ public function testWhereDatesResults()
         $this->assertTrue($liveResults->diffKeys($books)->isEmpty());
     }
 
-    /** @group test */
     public function testHashCollision()
     {
         $key1 = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-id_not_in_1_2');