Fix global filter segment in test utils

Author: dvlpp

src/Utils/Links/LinkToEntityList.php

@@ -54,7 +54,10 @@ public function renderAsUrl(): string
     {
         return route('code16.sharp.list',
             array_merge(
-                ['entityKey' => $this->entityKey],
+                [
+                    'filterKey' => sharp()->context()->globalFilterUrlSegmentValue(),
+                    'entityKey' => $this->entityKey,
+                ],
                 $this->generateQuerystring(),
             ),
         );

src/Utils/Links/LinkToSingleShowPage.php

@@ -11,6 +11,9 @@ public static function make(string $entityKey): self
 
     public function renderAsUrl(): string
     {
-        return route('code16.sharp.single-show', $this->entityKey);
+        return route('code16.sharp.single-show', [
+            'filterKey' => sharp()->context()->globalFilterUrlSegmentValue(),
+            'entityKey' => $this->entityKey,
+        ]);
     }
 }

src/Utils/Testing/SharpAssertions.php

@@ -3,9 +3,11 @@
 namespace Code16\Sharp\Utils\Testing;
 
 use Closure;
+use Code16\Sharp\Filters\GlobalFilters\GlobalFilters;
 use Code16\Sharp\Http\Context\SharpBreadcrumb;
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Links\BreadcrumbBuilder;
+use Illuminate\Support\Facades\URL;
 
 trait SharpAssertions
 {
@@ -42,6 +44,8 @@ public function withSharpBreadcrumb(Closure $callback): self
 
     public function deleteFromSharpShow(string $entityClassNameOrKey, $instanceId)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -59,6 +63,8 @@ public function deleteFromSharpShow(string $entityClassNameOrKey, $instanceId)
 
     public function deleteFromSharpList(string $entityClassNameOrKey, $instanceId)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -73,6 +79,8 @@ public function deleteFromSharpList(string $entityClassNameOrKey, $instanceId)
 
     public function getSharpForm(string $entityClassNameOrKey, $instanceId = null)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -100,6 +108,8 @@ public function getSharpForm(string $entityClassNameOrKey, $instanceId = null)
 
     public function getSharpSingleForm(string $entityClassNameOrKey)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -117,6 +127,8 @@ public function getSharpSingleForm(string $entityClassNameOrKey)
 
     public function updateSharpForm(string $entityClassNameOrKey, $instanceId, array $data)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -135,6 +147,8 @@ public function updateSharpForm(string $entityClassNameOrKey, $instanceId, array
 
     public function updateSharpSingleForm(string $entityClassNameOrKey, array $data)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -152,6 +166,8 @@ public function updateSharpSingleForm(string $entityClassNameOrKey, array $data)
 
     public function getSharpShow(string $entityClassNameOrKey, $instanceId)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -170,6 +186,8 @@ public function getSharpShow(string $entityClassNameOrKey, $instanceId)
 
     public function storeSharpForm(string $entityClassNameOrKey, array $data)
     {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         return $this
@@ -193,6 +211,8 @@ public function callSharpInstanceCommandFromList(
         array $data = [],
         ?string $commandStep = null
     ) {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         $commandKey = class_exists($commandKeyOrClassName)
@@ -222,6 +242,8 @@ public function callSharpInstanceCommandFromShow(
         array $data = [],
         ?string $commandStep = null
     ) {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         $commandKey = class_exists($commandKeyOrClassName)
@@ -250,6 +272,8 @@ public function callSharpEntityCommandFromList(
         array $data = [],
         ?string $commandStep = null
     ) {
+        URL::defaults(['filterKey' => GlobalFilters::$defaultKey]);
+
         $entityKey = $this->resolveEntityKey($entityClassNameOrKey);
 
         $commandKey = class_exists($commandKeyOrClassName)