vikunja
/
vikunja
6
43
Fork 72
Code Issues 151 Pull Requests 19 Packages Releases 32 Activity

fix(tests): make filter tests work again

This commit is contained in:
kolaente 2023-11-22 10:33:27 +01:00
parent eebfee73d3
commit 65e1357705
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/integrations/task_collection_test.go
View File

@ -184,9 +184,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("start and end date", func(t *testing.T) { t.Run("start and end date", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"start_date", "end_date", "due_date"}, "filter": []string{"start_date > '2018-12-11T03:46:40+00:00' || end_date < '2018-12-13T11:20:01+00:00' || due_date > '2018-11-29T14:00:00+00:00'"},
"filter_value": []string{"2018-12-11T03:46:40+00:00", "2018-12-13T11:20:01+00:00", "2018-11-29T14:00:00+00:00"},
"filter_comparator": []string{"greater", "less", "greater"},
}, },
urlParams, urlParams,
) )
@ -209,9 +207,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("start date only", func(t *testing.T) { t.Run("start date only", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"start_date"}, "filter": []string{"start_date > '2018-10-20T01:46:40+00:00'"},
"filter_value": []string{"2018-10-20T01:46:40+00:00"},
"filter_comparator": []string{"greater"},
}, },
urlParams, urlParams,
) )
@ -234,9 +230,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("end date only", func(t *testing.T) { t.Run("end date only", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"end_date"}, "filter": []string{"end_date > '2018-12-13T11:20:01+00:00'"},
"filter_value": []string{"2018-12-13T11:20:01+00:00"},
"filter_comparator": []string{"greater"},
}, },
urlParams, urlParams,
) )
@ -249,9 +243,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("unix timestamps", func(t *testing.T) { t.Run("unix timestamps", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"start_date", "end_date", "due_date"}, "filter": []string{"start_date > 1544500000 || end_date < 1513164001 || due_date > 1543500000"},
"filter_value": []string{"1544500000", "1513164001", "1543500000"},
"filter_comparator": []string{"greater", "less", "greater"},
}, },
urlParams, urlParams,
) )
@ -275,9 +267,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("invalid date", func(t *testing.T) { t.Run("invalid date", func(t *testing.T) {
_, err := testHandler.testReadAllWithUser( _, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"due_date"}, "filter": []string{"due_date > invalid"},
"filter_value": []string{"invalid"},
"filter_comparator": []string{"greater"},
}, },
nil, nil,
) )
@ -411,9 +401,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("start and end date", func(t *testing.T) { t.Run("start and end date", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"start_date", "end_date", "due_date"}, "filter": []string{"start_date > '2018-12-11T03:46:40+00:00' || end_date < '2018-12-13T11:20:01+00:00' || due_date > '2018-11-29T14:00:00+00:00'"},
"filter_value": []string{"2018-12-11T03:46:40+00:00", "2018-12-13T11:20:01+00:00", "2018-11-29T14:00:00+00:00"},
"filter_comparator": []string{"greater", "less", "greater"},
}, },
nil, nil,
) )
@ -436,9 +424,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("start date only", func(t *testing.T) { t.Run("start date only", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"start_date"}, "filter": []string{"start_date > '2018-10-20T01:46:40+00:00'"},
"filter_value": []string{"2018-10-20T01:46:40+00:00"},
"filter_comparator": []string{"greater"},
}, },
nil, nil,
) )
@ -461,9 +447,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("end date only", func(t *testing.T) { t.Run("end date only", func(t *testing.T) {
rec, err := testHandler.testReadAllWithUser( rec, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"end_date"}, "filter": []string{"end_date > '2018-12-13T11:20:01+00:00'"},
"filter_value": []string{"2018-12-13T11:20:01+00:00"},
"filter_comparator": []string{"greater"},
}, },
nil, nil,
) )
@ -477,9 +461,7 @@ func TestTaskCollection(t *testing.T) {
t.Run("invalid date", func(t *testing.T) { t.Run("invalid date", func(t *testing.T) {
_, err := testHandler.testReadAllWithUser( _, err := testHandler.testReadAllWithUser(
url.Values{ url.Values{
"filter_by": []string{"due_date"}, "filter": []string{"due_date > invalid"},
"filter_value": []string{"invalid"},
"filter_comparator": []string{"greater"},
}, },
nil, nil,
) )

2
pkg/models/saved_filters_test.go
View File

@ -65,7 +65,7 @@ func TestSavedFilter_Create(t *testing.T) {
vals := map[string]interface{}{ vals := map[string]interface{}{
"title": "'test'", "title": "'test'",
"description": "'Lorem Ipsum dolor sit amet'", "description": "'Lorem Ipsum dolor sit amet'",
"filters": "'{\"sort_by\":null,\"order_by\":null,\"filter_by\":null,\"filter_value\":null,\"filter_comparator\":null,\"filter_concat\":\"\",\"filter_include_nulls\":false}'", "filters": "'{\"sort_by\":null,\"order_by\":null,\"filter\":\"\",\"filter_include_nulls\":false}'",
"owner_id": 1, "owner_id": 1,
} }
// Postgres can't compare json values directly, see https://dba.stackexchange.com/a/106290/210721 // Postgres can't compare json values directly, see https://dba.stackexchange.com/a/106290/210721