diff --git a/pkg/db/fixtures/projects.yml b/pkg/db/fixtures/projects.yml index b8e178687..cd1f4a7a4 100644 --- a/pkg/db/fixtures/projects.yml +++ b/pkg/db/fixtures/projects.yml @@ -114,6 +114,7 @@ identifier: test13 owner_id: 6 position: 13 + parent_project_id: 28 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - @@ -123,6 +124,7 @@ identifier: test14 owner_id: 6 position: 14 + parent_project_id: 29 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - @@ -132,7 +134,7 @@ identifier: test15 owner_id: 6 position: 15 - parent_project_id: 28 + parent_project_id: 32 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - @@ -142,6 +144,7 @@ identifier: test16 owner_id: 6 position: 16 + parent_project_id: 33 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - @@ -151,6 +154,7 @@ identifier: test17 owner_id: 6 position: 17 + parent_project_id: 34 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 # This project is owned by user 7, and several other users have access to it via different methods. @@ -256,3 +260,33 @@ owner_id: 6 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 +- + id: 30 + title: Test30 + owner_id: 6 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- + id: 31 + title: Test31 + owner_id: 6 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- + id: 32 + title: Test32 + owner_id: 6 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- + id: 33 + title: Test33 + owner_id: 6 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- + id: 34 + title: Test34 + owner_id: 6 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 diff --git a/pkg/db/fixtures/team_projects.yml b/pkg/db/fixtures/team_projects.yml index cbe0a6e57..c1c6c7b48 100644 --- a/pkg/db/fixtures/team_projects.yml +++ b/pkg/db/fixtures/team_projects.yml @@ -76,3 +76,21 @@ right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 +- id: 13 + team_id: 1 + project_id: 32 + right: 0 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- id: 14 + team_id: 1 + project_id: 33 + right: 1 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- id: 15 + team_id: 1 + project_id: 34 + right: 2 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 diff --git a/pkg/db/fixtures/users_projects.yml b/pkg/db/fixtures/users_projects.yml index 9e0ba347c..3f2e0bf2b 100644 --- a/pkg/db/fixtures/users_projects.yml +++ b/pkg/db/fixtures/users_projects.yml @@ -70,3 +70,27 @@ right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 +- id: 13 + user_id: 1 + project_id: 30 + right: 1 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- id: 14 + user_id: 1 + project_id: 31 + right: 2 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- id: 15 + user_id: 1 + project_id: 28 + right: 1 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 +- id: 16 + user_id: 1 + project_id: 29 + right: 2 + updated: 2018-12-02 15:13:12 + created: 2018-12-01 15:13:12 diff --git a/pkg/integrations/kanban_test.go b/pkg/integrations/kanban_test.go index 13c0c1f9d..74747ff74 100644 --- a/pkg/integrations/kanban_test.go +++ b/pkg/integrations/kanban_test.go @@ -115,33 +115,33 @@ func TestBucket(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 User readonly", func(t *testing.T) { _, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "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 User write", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "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 User admin", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "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 Team readonly", func(t *testing.T) { _, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "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 Team write", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "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 Team admin", func(t *testing.T) { rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "17"}, `{"title":"TestLoremIpsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`) @@ -198,33 +198,33 @@ func TestBucket(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", "bucket": "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) { rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "13", "bucket": "13"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`) }) - 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", "bucket": "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", "bucket": "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) { rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "16", "bucket": "16"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`) }) - 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", "bucket": "17"}) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`) @@ -281,33 +281,33 @@ func TestBucket(t *testing.T) { assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`) }) - t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) { _, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "12"}, `{"title":"Lorem Ipsum"}`) 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.testCreateWithUser(nil, map[string]string{"project": "13"}, `{"title":"Lorem Ipsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`) }) - 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.testCreateWithUser(nil, map[string]string{"project": "14"}, `{"title":"Lorem Ipsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`) }) - t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) { + t.Run("Shared Via Parent Project User readonly", func(t *testing.T) { _, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "15"}, `{"title":"Lorem Ipsum"}`) 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.testCreateWithUser(nil, map[string]string{"project": "16"}, `{"title":"Lorem Ipsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`) }) - 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.testCreateWithUser(nil, map[string]string{"project": "17"}, `{"title":"Lorem Ipsum"}`) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)