From 48f0396094eec32a95b64eef54810d3bdd042682 Mon Sep 17 00:00:00 2001 From: luanfreitasdev Date: Wed, 6 Dec 2023 15:51:12 -0300 Subject: [PATCH] wip --- .github/workflows/sqlite.yml | 4 ++-- tests/Feature/SetUpTest.php | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml index b30a1f59..d6133198 100644 --- a/.github/workflows/sqlite.yml +++ b/.github/workflows/sqlite.yml @@ -54,9 +54,9 @@ jobs: rm composer.lock composer install - - name: Install openspout/openspout + - name: Install openspout/openspout 4.20 if: matrix.php == '8.2' - run: composer require openspout/openspout + run: composer require openspout/openspout 4.20 - name: SQLite run: composer test:sqlite diff --git a/tests/Feature/SetUpTest.php b/tests/Feature/SetUpTest.php index 96e65dd1..29f16074 100644 --- a/tests/Feature/SetUpTest.php +++ b/tests/Feature/SetUpTest.php @@ -50,7 +50,7 @@ ->ttl->toBe(300); $tag = 'test-powergrid-dishes-default'; - $cacheKey = '{"page":1}-{"perPage":15}-{"search":""}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}'; + $cacheKey = '{"page":1}-{"perPage":15}-{"search":""}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}-{"sortArray":[]}'; $tags = \Illuminate\Support\Facades\Cache::tags($tag); @@ -64,10 +64,10 @@ $storage = Livewire\invade($tags->getStore())->storage; expect(json_encode($storage)) - ->toContain('{\"page\":1}-{\"perPage\":15}-{\"search\":\"\"}-{\"sortDirection\":\"asc\"}-{\"sortField\":\"id\"}-{\"filters\":[]}'); + ->toContain('{\"page\":1}-{\"perPage\":15}-{\"search\":\"\"}-{\"sortDirection\":\"asc\"}-{\"sortField\":\"id\"}-{\"filters\":[]}-{\"sortArray\":[]}'); $component->set('search', 'New search'); - $cacheKeySearch = '{"page":1}-{"perPage":15}-{"search":"New search"}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}'; + $cacheKeySearch = '{"page":1}-{"perPage":15}-{"search":"New search"}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}-{"sortArray":[]}'; /** @var LengthAwarePaginator $items */ $items = $tags->get($cacheKeySearch); @@ -98,7 +98,7 @@ ->ttl->toBe(360); $tag = 'powergrid-dishes-default'; - $cacheKey = '{"page":1}-{"perPage":15}-{"search":""}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}'; + $cacheKey = '{"page":1}-{"perPage":15}-{"search":""}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}-{"sortArray":[]}'; $tags = \Illuminate\Support\Facades\Cache::tags($tag); @@ -112,10 +112,10 @@ $storage = Livewire\invade($tags->getStore())->storage; expect(json_encode($storage)) - ->toContain('{\"page\":1}-{\"perPage\":15}-{\"search\":\"\"}-{\"sortDirection\":\"asc\"}-{\"sortField\":\"id\"}-{\"filters\":[]}'); + ->toContain('{\"page\":1}-{\"perPage\":15}-{\"search\":\"\"}-{\"sortDirection\":\"asc\"}-{\"sortField\":\"id\"}-{\"filters\":[]}-{\"sortArray\":[]}'); $component->set('search', 'New search'); - $cacheKeySearch = '{"page":1}-{"perPage":15}-{"search":"New search"}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}'; + $cacheKeySearch = '{"page":1}-{"perPage":15}-{"search":"New search"}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}-{"sortArray":[]}'; /** @var LengthAwarePaginator $items */ $items = $tags->get($cacheKeySearch); @@ -147,7 +147,7 @@ ->ttl->toBe(360); $tag = 'my-custom-tag'; - $cacheKey = '{"page":1}-{"perPage":15}-{"search":""}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}'; + $cacheKey = '{"page":1}-{"perPage":15}-{"search":""}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}-{"sortArray":[]}'; $tags = \Illuminate\Support\Facades\Cache::tags($tag); @@ -161,10 +161,10 @@ $storage = Livewire\invade($tags->getStore())->storage; expect(json_encode($storage)) - ->toContain('{\"page\":1}-{\"perPage\":15}-{\"search\":\"\"}-{\"sortDirection\":\"asc\"}-{\"sortField\":\"id\"}-{\"filters\":[]}'); + ->toContain('{\"page\":1}-{\"perPage\":15}-{\"search\":\"\"}-{\"sortDirection\":\"asc\"}-{\"sortField\":\"id\"}-{\"filters\":[]}-{\"sortArray\":[]}'); $component->set('search', 'New search'); - $cacheKeySearch = '{"page":1}-{"perPage":15}-{"search":"New search"}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}'; + $cacheKeySearch = '{"page":1}-{"perPage":15}-{"search":"New search"}-{"sortDirection":"asc"}-{"sortField":"id"}-{"filters":[]}-{"sortArray":[]}'; /** @var LengthAwarePaginator $items */ $items = $tags->get($cacheKeySearch);