rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix e2e tests

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2026-01-05 18:15:11 +01:00
parent bbd6e63588
commit ff2c2a5974
6 changed files with 178 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
e2e/console/member_test.go
View File

@@ -36,12 +36,11 @@ func TestMember_UpdateMembership(t *testing.T) {
query($id: ID!) {
node(id: $id) {
... on Organization {
memberships(first: 10) {
members(first: 10) {
edges {
node {
id
role
userID
}
}
}
@@ -52,26 +51,25 @@ func TestMember_UpdateMembership(t *testing.T) {
var result struct {
Node struct {
Memberships struct {
Members struct {
Edges []struct {
Node struct {
ID string `json:"id"`
Role string `json:"role"`
UserID string `json:"userID"`
ID string `json:"id"`
Role string `json:"role"`
} `json:"node"`
} `json:"edges"`
} `json:"memberships"`
} `json:"members"`
} `json:"node"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"id": owner.GetOrganizationID().String(),
}, &result)
require.NoError(t, err)
// Find the admin member
var adminMemberID string
for _, edge := range result.Node.Memberships.Edges {
for _, edge := range result.Node.Members.Edges {
if edge.Node.Role == "ADMIN" {
adminMemberID = edge.Node.ID
break
@@ -100,10 +98,10 @@ func TestMember_UpdateMembership(t *testing.T) {
} `json:"updateMembership"`
}
err = owner.Execute(mutation, map[string]any{
err = owner.ExecuteConnect(mutation, map[string]any{
"input": map[string]any{
"organizationId": owner.GetOrganizationID().String(),
"memberId": adminMemberID,
"membershipId": adminMemberID,
"role": "VIEWER",
},
}, &mutationResult)
@@ -125,7 +123,7 @@ func TestMember_RemoveMember(t *testing.T) {
query($id: ID!) {
node(id: $id) {
... on Organization {
memberships(first: 50) {
members(first: 50) {
edges {
node {
id
@@ -140,25 +138,25 @@ func TestMember_RemoveMember(t *testing.T) {
var result struct {
Node struct {
Memberships struct {
Members struct {
Edges []struct {
Node struct {
ID string `json:"id"`
Role string `json:"role"`
} `json:"node"`
} `json:"edges"`
} `json:"memberships"`
} `json:"members"`
} `json:"node"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"id": owner.GetOrganizationID().String(),
}, &result)
require.NoError(t, err)
// Find a viewer member to remove
var memberID string
for _, edge := range result.Node.Memberships.Edges {
for _, edge := range result.Node.Members.Edges {
if edge.Node.Role == "VIEWER" {
memberID = edge.Node.ID
break
@@ -170,26 +168,26 @@ func TestMember_RemoveMember(t *testing.T) {
mutation := `
mutation($input: RemoveMemberInput!) {
removeMember(input: $input) {
deletedMemberId
deletedMembershipId
}
}
`
var mutationResult struct {
RemoveMember struct {
DeletedMemberID string `json:"deletedMemberId"`
DeletedMembershipID string `json:"deletedMembershipId"`
} `json:"removeMember"`
}
err = owner.Execute(mutation, map[string]any{
err = owner.ExecuteConnect(mutation, map[string]any{
"input": map[string]any{
"organizationId": owner.GetOrganizationID().String(),
"memberId": memberID,
"membershipId": memberID,
},
}, &mutationResult)
require.NoError(t, err)
assert.Equal(t, memberID, mutationResult.RemoveMember.DeletedMemberID)
assert.Equal(t, memberID, mutationResult.RemoveMember.DeletedMembershipID)
}
func TestInvitation_Delete(t *testing.T) {
@@ -198,8 +196,8 @@ func TestInvitation_Delete(t *testing.T) {
// Create an invitation
inviteMutation := `
mutation($input: InviteUserInput!) {
inviteUser(input: $input) {
mutation($input: InviteMemberInput!) {
inviteMember(input: $input) {
invitationEdge {
node {
id
@@ -212,7 +210,7 @@ func TestInvitation_Delete(t *testing.T) {
`
var inviteResult struct {
InviteUser struct {
InviteMember struct {
InvitationEdge struct {
Node struct {
ID string `json:"id"`
@@ -220,21 +218,20 @@ func TestInvitation_Delete(t *testing.T) {
Status string `json:"status"`
} `json:"node"`
} `json:"invitationEdge"`
} `json:"inviteUser"`
} `json:"inviteMember"`
}
err := owner.Execute(inviteMutation, map[string]any{
err := owner.ExecuteConnect(inviteMutation, map[string]any{
"input": map[string]any{
"organizationId": owner.GetOrganizationID().String(),
"email": fmt.Sprintf("invite.delete.%d@example.com", time.Now().UnixNano()),
"fullName": "Test User",
"role": "VIEWER",
"createPeople": false,
},
}, &inviteResult)
require.NoError(t, err)
invitationID := inviteResult.InviteUser.InvitationEdge.Node.ID
invitationID := inviteResult.InviteMember.InvitationEdge.Node.ID
assert.NotEmpty(t, invitationID)
// Delete the invitation
@@ -252,9 +249,10 @@ func TestInvitation_Delete(t *testing.T) {
} `json:"deleteInvitation"`
}
err = owner.Execute(deleteMutation, map[string]any{
err = owner.ExecuteConnect(deleteMutation, map[string]any{
"input": map[string]any{
"invitationId": invitationID,
"organizationId": owner.GetOrganizationID().String(),
"invitationId": invitationID,
},
}, &deleteResult)
require.NoError(t, err)
@@ -274,13 +272,11 @@ func TestMember_List(t *testing.T) {
query($id: ID!) {
node(id: $id) {
... on Organization {
memberships(first: 10) {
members(first: 10) {
edges {
node {
id
role
userID
emailAddress
}
}
totalCount
@@ -292,24 +288,22 @@ func TestMember_List(t *testing.T) {
var result struct {
Node struct {
Memberships struct {
Members struct {
Edges []struct {
Node struct {
ID string `json:"id"`
Role string `json:"role"`
UserID string `json:"userID"`
EmailAddress string `json:"emailAddress"`
ID string `json:"id"`
Role string `json:"role"`
} `json:"node"`
} `json:"edges"`
TotalCount int `json:"totalCount"`
} `json:"memberships"`
} `json:"members"`
} `json:"node"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"id": owner.GetOrganizationID().String(),
}, &result)
require.NoError(t, err)
assert.GreaterOrEqual(t, result.Node.Memberships.TotalCount, 3, "Should have at least 3 members")
assert.GreaterOrEqual(t, result.Node.Members.TotalCount, 3, "Should have at least 3 members")
}

14
e2e/console/organization_test.go
View File

@@ -53,7 +53,7 @@ func TestOrganization_Update(t *testing.T) {
} `json:"updateOrganization"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"input": map[string]any{
"organizationId": owner.GetOrganizationID().String(),
"name": newName,
@@ -90,7 +90,7 @@ func TestOrganization_Update(t *testing.T) {
} `json:"updateOrganization"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"input": map[string]any{
"organizationId": owner.GetOrganizationID().String(),
"websiteUrl": "https://example.com",
@@ -124,7 +124,7 @@ func TestOrganization_Update(t *testing.T) {
} `json:"updateOrganization"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"input": map[string]any{
"organizationId": owner.GetOrganizationID().String(),
"headquarterAddress": "123 Main St, Suite 100, San Francisco, CA 94102",
@@ -187,9 +187,6 @@ func TestOrganization_Get(t *testing.T) {
websiteUrl
email
headquarterAddress
context {
summary
}
}
}
}
@@ -203,13 +200,10 @@ func TestOrganization_Get(t *testing.T) {
WebsiteUrl string `json:"websiteUrl"`
Email string `json:"email"`
HeadquarterAddress string `json:"headquarterAddress"`
Context struct {
Summary string `json:"summary"`
} `json:"context"`
} `json:"node"`
}
err := owner.Execute(query, map[string]any{
err := owner.ExecuteConnect(query, map[string]any{
"id": owner.GetOrganizationID().String(),
}, &result)
require.NoError(t, err)

26
e2e/console/rbac_test.go
View File

@@ -15,6 +15,7 @@
package console_test
import (
"strings"
"testing"
"github.com/stretchr/testify/require"
@@ -254,7 +255,7 @@ const (
query GetMembers($id: ID!) {
node(id: $id) {
... on Organization {
memberships(first: 10) { totalCount }
members(first: 10) { totalCount }
}
}
}`
@@ -283,6 +284,7 @@ func TestRBAC(t *testing.T) {
query string
variables func() map[string]any
shouldAllow bool
useConnect bool // use connect API instead of console API
}{
{
name: "owner can create framework",
@@ -1158,6 +1160,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"input": map[string]any{"organizationId": owner.GetOrganizationID().String(), "description": factory.SafeName("Updated Desc")}}
},
shouldAllow: true,
useConnect: true,
},
{
name: "admin can update organization",
@@ -1168,6 +1171,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"input": map[string]any{"organizationId": owner.GetOrganizationID().String(), "description": factory.SafeName("Updated Desc")}}
},
shouldAllow: true,
useConnect: true,
},
{
name: "viewer cannot update organization",
@@ -1178,6 +1182,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"input": map[string]any{"organizationId": owner.GetOrganizationID().String(), "description": factory.SafeName("Updated Desc")}}
},
shouldAllow: false,
useConnect: true,
},
{
name: "owner can get organization",
@@ -1188,6 +1193,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"id": owner.GetOrganizationID().String()}
},
shouldAllow: true,
useConnect: true,
},
{
name: "admin can get organization",
@@ -1198,6 +1204,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"id": owner.GetOrganizationID().String()}
},
shouldAllow: true,
useConnect: true,
},
{
name: "viewer can get organization",
@@ -1208,6 +1215,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"id": owner.GetOrganizationID().String()}
},
shouldAllow: true,
useConnect: true,
},
{
name: "owner can list members",
@@ -1218,6 +1226,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"id": owner.GetOrganizationID().String()}
},
shouldAllow: true,
useConnect: true,
},
{
name: "admin can list members",
@@ -1228,6 +1237,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"id": owner.GetOrganizationID().String()}
},
shouldAllow: true,
useConnect: true,
},
{
name: "viewer can list members",
@@ -1238,6 +1248,7 @@ func TestRBAC(t *testing.T) {
return map[string]any{"id": owner.GetOrganizationID().String()}
},
shouldAllow: true,
useConnect: true,
},
}
@@ -1245,7 +1256,12 @@ func TestRBAC(t *testing.T) {
t.Run(
tt.name,
func(t *testing.T) {
_, err := tt.client.Do(tt.query, tt.variables())
var err error
if tt.useConnect {
_, err = tt.client.DoConnect(tt.query, tt.variables())
} else {
_, err = tt.client.Do(tt.query, tt.variables())
}
if tt.shouldAllow {
require.NoError(t, err, "expected request to be allowed")
@@ -1253,7 +1269,11 @@ func TestRBAC(t *testing.T) {
var gqlErrors testutil.GraphQLErrors
require.ErrorAs(t, err, &gqlErrors, "expected GraphQL error, got: %T", err)
require.Len(t, gqlErrors, 1, "expected exactly one GraphQL error, got %d errors: %v", len(gqlErrors), gqlErrors)
require.Equal(t, "FORBIDDEN", gqlErrors[0].Code(), "expected FORBIDDEN error code, got %q (message: %q)", gqlErrors[0].Code(), gqlErrors[0].Message)
// Connect API uses a different error format - check either code or message
code := gqlErrors[0].Code()
msg := gqlErrors[0].Message
isForbidden := code == "FORBIDDEN" || (code == "" && (strings.Contains(msg, "does not have sufficient permissions") || strings.Contains(msg, "insufficient permissions")))
require.True(t, isForbidden, "expected FORBIDDEN error, got code=%q message=%q", code, msg)
}
},
)