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

Fix e2e tests

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-02-18 12:05:53 +04:00
parent b49747f3ba
commit ab5fe8e5e2
30 changed files with 874 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
e2e/internal/testutil/client.go
View File

@@ -20,6 +20,7 @@ import (
"fmt"
"net/http"
"net/http/cookiejar"
"net/url"
"testing"
"time"
@@ -46,9 +47,9 @@ type Client struct {
T testing.TB
httpClient *http.Client
baseURL string
mailpitBaseURL string
role TestRole
userID gid.GID
profileID gid.GID
organizationID gid.GID
}
@@ -59,9 +60,10 @@ func NewClient(t testing.TB, role TestRole) *Client {
require.NoError(t, err, "cannot create cookie jar")
client := &Client{
T: t,
baseURL: GetBaseURL(),
role: role,
T: t,
baseURL: GetBaseURL(),
mailpitBaseURL: GetMailpitBaseURL(),
role: role,
httpClient: &http.Client{
Jar: jar,
Timeout: 30 * time.Second,
@@ -82,6 +84,7 @@ func NewClientInOrg(t testing.TB, role TestRole, ownerClient *Client) *Client {
client := &Client{
T: t,
baseURL: GetBaseURL(),
mailpitBaseURL: GetMailpitBaseURL(),
role: role,
organizationID: ownerClient.organizationID,
httpClient: &http.Client{
@@ -106,7 +109,7 @@ func (c *Client) setupTestUser() {
// Create organization (this makes the user an OWNER)
orgName := fmt.Sprintf("Test Org %s", uniqueID)
c.organizationID, c.profileID = c.createOrganization(orgName)
c.organizationID = c.createOrganization(orgName)
// Assume organization session to use console API
c.assumeOrganizationSession()
@@ -127,10 +130,12 @@ func (c *Client) SetupTestUserInOrg(ownerClient *Client) {
c.userID = c.signUp(email, password, fullName)
// Owner invites user to organization
invitationID := ownerClient.inviteMember(email, fullName, coredata.MembershipRole(c.role))
profileID := ownerClient.createUser(email, fullName, coredata.MembershipRole(c.role))
ownerClient.inviteUser(profileID)
// New user accepts invitation
c.profileID = c.acceptInvitation(invitationID)
token := c.getActivationToken(email)
c.activateUser(token)
// Assume organization session to use console API
c.assumeOrganizationSession()
@@ -168,16 +173,12 @@ func (c *Client) signUp(email, password, fullName string) gid.GID {
return userID
}
func (c *Client) createOrganization(name string) (gid.GID, gid.GID) {
func (c *Client) createOrganization(name string) gid.GID {
const query = `
mutation($input: CreateOrganizationInput!) {
createOrganization(input: $input) {
organization { id }
membershipEdge {
node {
profile { id }
}
}
profile { id }
}
}
`
@@ -187,14 +188,6 @@ func (c *Client) createOrganization(name string) (gid.GID, gid.GID) {
Organization struct {
ID string `json:"id"`
} `json:"organization"`
MembershipEdge struct {
Node struct {
ID string `json:"id"`
Profile struct {
ID string `json:"id"`
} `json:"profile"`
} `json:"node"`
} `json:"membershipEdge"`
} `json:"createOrganization"`
}
@@ -206,10 +199,7 @@ func (c *Client) createOrganization(name string) (gid.GID, gid.GID) {
orgID, err := gid.ParseGID(result.CreateOrganization.Organization.ID)
require.NoError(c.T, err, "cannot parse organization ID")
profileID, err := gid.ParseGID(result.CreateOrganization.MembershipEdge.Node.Profile.ID)
require.NoError(c.T, err, "cannot parse profile ID")
return orgID, profileID
return orgID
}
func (c *Client) updateOwnMembershipRole(role coredata.MembershipRole) {
@@ -284,10 +274,49 @@ func (c *Client) updateOwnMembershipRole(role coredata.MembershipRole) {
require.NoError(c.T, err, "updateMembership mutation failed")
}
func (c *Client) inviteMember(email, fullName string, role coredata.MembershipRole) gid.GID {
func (c *Client) createUser(email, fullName string, role coredata.MembershipRole) gid.GID {
const query = `
mutation($input: InviteMemberInput!) {
inviteMember(input: $input) {
mutation($input: CreateUserInput!) {
createUser(input: $input) {
profileEdge {
node { id }
}
}
}
`
var result struct {
CreateUser struct {
ProfileEdge struct {
Node struct {
ID string `json:"id"`
} `json:"node"`
} `json:"profileEdge"`
} `json:"createUser"`
}
err := c.ExecuteConnect(query, map[string]any{
"input": map[string]any{
"organizationId": c.organizationID.String(),
"emailAddress": email,
"fullName": fullName,
"role": string(role),
"kind": coredata.MembershipProfileKindEmployee,
"additionalEmailAddresses": []string{},
},
}, &result)
require.NoError(c.T, err, "createUser mutation failed")
profileID, err := gid.ParseGID(result.CreateUser.ProfileEdge.Node.ID)
require.NoError(c.T, err, "cannot parse profile ID")
return profileID
}
func (c *Client) inviteUser(profileID gid.GID) {
const query = `
mutation($input: InviteUserInput!) {
inviteUser(input: $input) {
invitationEdge {
node { id }
}
@@ -296,67 +325,79 @@ func (c *Client) inviteMember(email, fullName string, role coredata.MembershipRo
`
var result struct {
InviteMember struct {
InviteUser struct {
InvitationEdge struct {
Node struct {
ID string `json:"id"`
} `json:"node"`
} `json:"invitationEdge"`
} `json:"inviteMember"`
} `json:"inviteUser"`
}
err := c.ExecuteConnect(query, map[string]any{
"input": map[string]any{
"organizationId": c.organizationID.String(),
"email": email,
"fullName": fullName,
"role": string(role),
"profileId": profileID.String(),
},
}, &result)
require.NoError(c.T, err, "inviteMember mutation failed")
invitationID, err := gid.ParseGID(result.InviteMember.InvitationEdge.Node.ID)
require.NoError(c.T, err, "cannot parse invitation ID")
return invitationID
require.NoError(c.T, err, "inviteUser mutation failed")
}
func (c *Client) acceptInvitation(invitationID gid.GID) gid.GID {
func (c *Client) getActivationToken(email string) string {
deadline := time.Now().Add(5 * time.Second)
for time.Now().Before(deadline) {
searchMails, err := c.SearchMails(fmt.Sprintf("to:%s subject:\"Invitation to join\"", email))
require.NoError(c.T, err, "mailpit messages search failed")
for _, msg := range searchMails.Messages {
linksCheck, err := c.CheckMessageLinks(msg.ID)
require.NoError(c.T, err, "mailpit link check failed")
for _, link := range linksCheck.Links {
linkURL, err := url.Parse(link.URL)
require.NoError(c.T, err, "mailpit link invalid URL")
query := linkURL.Query()
if query.Get("token") != "" {
return query.Get("token")
}
}
}
time.Sleep(100 * time.Millisecond)
}
c.T.Logf("activation token not found")
c.T.FailNow()
return ""
}
func (c *Client) activateUser(token string) {
const query = `
mutation($input: AcceptInvitationInput!) {
acceptInvitation(input: $input) {
membershipEdge {
node {
profile { id }
}
mutation($input: ActivateAccountInput!) {
activateAccount(input: $input) {
profile {
id
}
}
}
`
var result struct {
AcceptInvitation struct {
MembershipEdge struct {
Node struct {
Profile struct {
ID string `json:"id"`
} `json:"profile"`
} `json:"node"`
} `json:"membershipEdge"`
} `json:"acceptInvitation"`
ActivateAccount struct {
Profile struct {
ID string `json:"id"`
} `json:"profile"`
} `json:"activateAccount"`
}
err := c.ExecuteConnect(query, map[string]any{
"input": map[string]any{
"invitationId": invitationID.String(),
"token": token,
},
}, &result)
require.NoError(c.T, err, "acceptInvitation mutation failed")
profileID, err := gid.ParseGID(result.AcceptInvitation.MembershipEdge.Node.Profile.ID)
require.NoError(c.T, err, "cannot parse profile ID")
return profileID
require.NoError(c.T, err, "activateAccount mutation failed")
}
func (c *Client) assumeOrganizationSession() {
@@ -385,10 +426,6 @@ func (c *Client) GetUserID() gid.GID {
return c.userID
}
func (c *Client) GetProfileID() gid.GID {
return c.profileID
}
func (c *Client) GetOrganizationID() gid.GID {
return c.organizationID
}

101
e2e/internal/testutil/mailpit.go Normal file
View File

@@ -0,0 +1,101 @@
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
package testutil
import (
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
)
type (
MailpitMessage struct {
ID string `json:"id"`
}
MailpitSearchResponse struct {
Messages []MailpitMessage `json:"messages"`
}
MailpitLink struct {
URL string `json:"url"`
}
MailpitLinkCheckResponse struct {
Links []MailpitLink `json:"links"`
}
)
func (c *Client) SearchMails(query string) (*MailpitSearchResponse, error) {
req, err := http.NewRequest("GET", c.mailpitBaseURL+"/api/v1/search?query="+url.QueryEscape(query), nil)
if err != nil {
return nil, fmt.Errorf("cannot create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
resp, err := c.httpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("request failed: %w", err)
}
defer func() { _ = resp.Body.Close() }()
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("cannot read response: %w", err)
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("unexpected status %d: %s", resp.StatusCode, string(respBody))
}
var searchResp MailpitSearchResponse
if err := json.Unmarshal(respBody, &searchResp); err != nil {
return nil, fmt.Errorf("cannot decode response: %w", err)
}
return &searchResp, nil
}
func (c *Client) CheckMessageLinks(messageID string) (*MailpitLinkCheckResponse, error) {
req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/message/%s/link-check", c.mailpitBaseURL, messageID), nil)
if err != nil {
return nil, fmt.Errorf("cannot create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
resp, err := c.httpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("request failed: %w", err)
}
defer func() { _ = resp.Body.Close() }()
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("cannot read response: %w", err)
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("unexpected status %d: %s", resp.StatusCode, string(respBody))
}
var linkCheckResp MailpitLinkCheckResponse
if err := json.Unmarshal(respBody, &linkCheckResp); err != nil {
return nil, fmt.Errorf("cannot decode response: %w", err)
}
return &linkCheckResp, nil
}

28
e2e/internal/testutil/testutil.go
View File

@@ -34,9 +34,10 @@ var (
)
type TestEnv struct {
BaseURL string
cmd *exec.Cmd
done chan error
MailpitBaseURL string
BaseURL string
cmd *exec.Cmd
done chan error
}
func Setup() {
@@ -94,18 +95,24 @@ func Setup() {
}()
testEnv.BaseURL = "http://localhost:18080"
testEnv.MailpitBaseURL = "http://localhost:8025"
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
if err := waitForServer(ctx, testEnv.BaseURL, 30*time.Second); err != nil {
fmt.Fprintf(os.Stderr, "e2etest: server failed to start: %v\n", err)
if err := waitForServer(ctx, testEnv.BaseURL+"/api/console/v1/graphql", 30*time.Second); err != nil {
fmt.Fprintf(os.Stderr, "e2etest: API server failed to start: %v\n", err)
_ = testEnv.cmd.Process.Kill()
os.Exit(1)
}
if err := waitForServer(ctx, testEnv.MailpitBaseURL+"/api/v1/messages", 30*time.Second); err != nil {
fmt.Fprintf(os.Stderr, "e2etest: MailPit server failed to start: %v\n", err)
_ = testEnv.cmd.Process.Kill()
os.Exit(1)
}
})
}
func waitForServer(ctx context.Context, baseURL string, timeout time.Duration) error {
func waitForServer(ctx context.Context, url string, timeout time.Duration) error {
deadline := time.Now().Add(timeout)
client := &http.Client{Timeout: 2 * time.Second}
@@ -116,7 +123,7 @@ func waitForServer(ctx context.Context, baseURL string, timeout time.Duration) e
default:
}
req, err := http.NewRequestWithContext(ctx, "GET", baseURL+"/api/console/v1/graphql", nil)
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if err != nil {
return err
}
@@ -157,3 +164,10 @@ func GetBaseURL() string {
}
return testEnv.BaseURL
}
func GetMailpitBaseURL() string {
if testEnv == nil {
return "http://localhost:8025"
}
return testEnv.MailpitBaseURL
}