From 798d575c0596a44b1a8b027d752f8d746c4f179d Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 12 Jan 2023 17:00:40 +0100 Subject: [PATCH] fix(tests): adjust parent projects --- pkg/integrations/project_test.go | 72 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkg/integrations/project_test.go b/pkg/integrations/project_test.go index 080e1bb01..e2bcfef9e 100644 --- a/pkg/integrations/project_test.go +++ b/pkg/integrations/project_test.go @@ -40,8 +40,8 @@ func TestProject(t *testing.T) { assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `Test1`) assert.NotContains(t, rec.Body.String(), `Test2"`) - assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_project - assert.Contains(t, rec.Body.String(), `Test4`) // Shared via parent project + assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_project + assert.Contains(t, rec.Body.String(), `Test12`) // Shared via parent project assert.NotContains(t, rec.Body.String(), `Test5`) assert.NotContains(t, rec.Body.String(), `Test21`) // Archived through parent project assert.NotContains(t, rec.Body.String(), `Test22`) // Archived directly @@ -60,8 +60,8 @@ func TestProject(t *testing.T) { assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `Test1`) assert.NotContains(t, rec.Body.String(), `Test2"`) - assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_project - assert.Contains(t, rec.Body.String(), `Test4`) // Shared via project + assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_project + assert.Contains(t, rec.Body.String(), `Test12`) // Shared via parent project assert.NotContains(t, rec.Body.String(), `Test5`) assert.Contains(t, rec.Body.String(), `Test21`) // Archived through project assert.Contains(t, rec.Body.String(), `Test22`) // Archived directly @@ -76,7 +76,7 @@ func TestProject(t *testing.T) { assert.Contains(t, rec.Body.String(), `"owner":{"id":1,"name":"","username":"user1",`) assert.NotContains(t, rec.Body.String(), `"owner":{"id":2,"name":"","username":"user2",`) assert.NotContains(t, rec.Body.String(), `"tasks":`) - assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) // User 1 is owner so they should have admin rights. + assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) // User 1 is owner, so they should have admin rights. }) t.Run("Nonexisting", func(t *testing.T) { _, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "9999"}) @@ -129,38 +129,38 @@ func TestProject(t *testing.T) { assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) }) - t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) { rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "12"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Test12"`) assert.Equal(t, "0", rec.Result().Header.Get("x-max-right")) }) - t.Run("Shared Via NamespaceTeam write", func(t *testing.T) { + t.Run("Shared Via Parent Project Team write", func(t *testing.T) { rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "13"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Test13"`) assert.Equal(t, "1", rec.Result().Header.Get("x-max-right")) }) - t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) { + t.Run("Shared Via Parent Project Team admin", func(t *testing.T) { rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "14"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Test14"`) assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) }) - t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project User readonly", func(t *testing.T) { rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "15"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Test15"`) assert.Equal(t, "0", rec.Result().Header.Get("x-max-right")) }) - t.Run("Shared Via NamespaceUser write", func(t *testing.T) { + t.Run("Shared Via Parent Project User write", func(t *testing.T) { rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "16"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Test16"`) assert.Equal(t, "1", rec.Result().Header.Get("x-max-right")) }) - t.Run("Shared Via NamespaceUser admin", func(t *testing.T) { + t.Run("Shared Via Parent Project User admin", func(t *testing.T) { rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "17"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Test17"`) @@ -237,33 +237,33 @@ func TestProject(t *testing.T) { assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`) }) - t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) { _, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "12"}, `{"title":"TestLoremIpsum"}`) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceTeam write", func(t *testing.T) { + t.Run("Shared Via Parent Project Team write", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "13"}, `{"title":"TestLoremIpsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`) }) - t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) { + t.Run("Shared Via Parent Project Team admin", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "14"}, `{"title":"TestLoremIpsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`) }) - t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project User readonly", func(t *testing.T) { _, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "15"}, `{"title":"TestLoremIpsum"}`) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceUser write", func(t *testing.T) { + t.Run("Shared Via Parent Project User write", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "16"}, `{"title":"TestLoremIpsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`) }) - t.Run("Shared Via NamespaceUser admin", func(t *testing.T) { + t.Run("Shared Via Parent Project User admin", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "17"}, `{"title":"TestLoremIpsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`) @@ -320,33 +320,33 @@ func TestProject(t *testing.T) { assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`) }) - t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) { _, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "12"}) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceTeam write", func(t *testing.T) { + t.Run("Shared Via Parent Project Team write", func(t *testing.T) { _, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "13"}) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) { + t.Run("Shared Via Parent Project Team admin", func(t *testing.T) { rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "14"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`) }) - t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project User readonly", func(t *testing.T) { _, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "15"}) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceUser write", func(t *testing.T) { + t.Run("Shared Via Parent Project User write", func(t *testing.T) { _, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "16"}) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceUser admin", func(t *testing.T) { + t.Run("Shared Via Parent Project User admin", func(t *testing.T) { rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "17"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`) @@ -389,25 +389,25 @@ func TestProject(t *testing.T) { t.Run("Rights check", func(t *testing.T) { t.Run("Forbidden", func(t *testing.T) { // Owned by user13 - _, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`) + _, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":20}`) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) { - _, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`) + t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) { + _, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":32}`) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceTeam write", func(t *testing.T) { - rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`) + t.Run("Shared Via Parent Project Team write", func(t *testing.T) { + rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":33}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem"`) assert.Contains(t, rec.Body.String(), `"description":""`) assert.Contains(t, rec.Body.String(), `"owner":{"id":1`) assert.NotContains(t, rec.Body.String(), `"tasks":`) }) - t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) { - rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`) + t.Run("Shared Via Parent Project Team admin", func(t *testing.T) { + rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":34}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem"`) assert.Contains(t, rec.Body.String(), `"description":""`) @@ -415,21 +415,21 @@ func TestProject(t *testing.T) { assert.NotContains(t, rec.Body.String(), `"tasks":`) }) - t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) { - _, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`) + t.Run("Shared Via Parent Project User readonly", func(t *testing.T) { + _, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":9}`) assert.Error(t, err) assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`) }) - t.Run("Shared Via NamespaceUser write", func(t *testing.T) { - rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`) + t.Run("Shared Via Parent Project User write", func(t *testing.T) { + rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":10}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem"`) assert.Contains(t, rec.Body.String(), `"description":""`) assert.Contains(t, rec.Body.String(), `"owner":{"id":1`) assert.NotContains(t, rec.Body.String(), `"tasks":`) }) - t.Run("Shared Via NamespaceUser admin", func(t *testing.T) { - rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "12"}, `{"title":"Lorem"}`) + t.Run("Shared Via Parent Project User admin", func(t *testing.T) { + rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "12"}, `{"title":"Lorem","parent_project_id":11}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem"`) assert.Contains(t, rec.Body.String(), `"description":""`)