Unwrap pagination array in test fixtures

hydephp · Jan 8, 2023 · 34a9f1f · 34a9f1f
1 parent be5bc1f
commit 34a9f1f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 30 deletions.
diff --git a/packages/framework/tests/Feature/Commands/MakePublicationCommandTest.php b/packages/framework/tests/Feature/Commands/MakePublicationCommandTest.php
@@ -75,11 +75,9 @@ public function test_command_selects_the_right_publication_using_the_names()
                 'canonicalField' => '__createdAt',
                 'detailTemplate' => 'detail',
                 'listTemplate'   => 'list',
-                'pagination' => [
-                    'pageSize'       => 10,
-                    'sortField'      => '__createdAt',
-                    'sortAscending'  => true,
-                ],
+                'pageSize'       => 10,
+                'sortField'      => '__createdAt',
+                'sortAscending'  => true,
                 'fields'         =>  [],
             ])
         );
@@ -581,11 +579,9 @@ protected function makeSchemaFile(array $merge = []): void
                 'canonicalField' => 'title',
                 'detailTemplate' => 'detail',
                 'listTemplate'   => 'list',
-                'pagination' => [
-                    'pageSize'       => 10,
-                    'sortField'      => '__createdAt',
-                    'sortAscending'  => true,
-                ],
+                'pageSize'       => 10,
+                'sortField'      => '__createdAt',
+                'sortAscending'  => true,
                 'fields'         =>  [
                     [
                         'name' => 'title',

diff --git a/packages/framework/tests/Feature/Commands/MakePublicationTypeCommandTest.php b/packages/framework/tests/Feature/Commands/MakePublicationTypeCommandTest.php
@@ -77,11 +77,9 @@ public function test_command_creates_publication_type()
                 "canonicalField": "publication-title",
                 "detailTemplate": "detail.blade.php",
                 "listTemplate": "list.blade.php",
-                "pagination": {
-                    "sortField": "__createdAt",
-                    "sortAscending": true,
-                    "pageSize": 10
-                },
+                "sortField": "__createdAt",
+                "sortAscending": true,
+                "pageSize": 10,
                 "fields": [
                     {
                         "type": "datetime",
@@ -183,11 +181,9 @@ public function testWithTagFieldInput()
                 "canonicalField": "__createdAt",
                 "detailTemplate": "detail.blade.php",
                 "listTemplate": "list.blade.php",
-                "pagination": {
-                    "sortField": "__createdAt",
-                    "sortAscending": true,
-                    "pageSize": 25
-                },
+                "sortField": "__createdAt",
+                "sortAscending": true,
+                "pageSize": 25,
                 "fields": [
                     {
                         "type": "datetime",

diff --git a/packages/framework/tests/Feature/PublicationListPageTest.php b/packages/framework/tests/Feature/PublicationListPageTest.php
@@ -70,11 +70,9 @@ protected function getTestData(): array
             'canonicalField' => 'canonical',
             'detailTemplate' => 'detail.blade.php',
             'listTemplate'   => 'list.blade.php',
-            'pagination' => [
-                'sortField'      => 'sort',
-                'sortAscending'  => true,
-                'pageSize'       => 10,
-            ],
+            'sortField'      => 'sort',
+            'sortAscending'  => true,
+            'pageSize'       => 10,
             'fields'         => [
                 [
                     'type' => 'string',

diff --git a/packages/framework/tests/Feature/PublicationPageTest.php b/packages/framework/tests/Feature/PublicationPageTest.php
@@ -118,11 +118,9 @@ protected function createRealPublicationFiles(): void
   "canonicalField": "slug",
   "detailTemplate": "test_detail.blade.php",
   "listTemplate": "test_list.blade.php",
-  "pagination": {
-      "sortField": "__createdAt",
-      "sortAscending": true,
-      "pageSize": 0
-  },
+  "sortField": "__createdAt",
+  "sortAscending": true,
+  "pageSize": 0,
   "fields": [
     {
       "name": "slug",