TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-07 07:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move gofakeit integration testing calls (#10684)

Browse Source 
# Which Problems Are Solved

Flakiness and conflicts in value from gofakeit.

# How the Problems Are Solved

Move Gofakeit calls to the integration package, to guarantee proper
usage and values for integration testing.

# Additional Changes

None

# Additional Context

None

(cherry picked from commit 492f1826ee)
This commit is contained in:
Stefan Benz
2025-09-10 08:00:31 +02:00
committed by Livio Spring
parent 78ded99017
commit b892fc9b28
70 changed files with 1404 additions and 1293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go
View File

@@ -6,7 +6,6 @@ import (
"context"
"testing"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -33,7 +32,7 @@ func TestServer_SetContactEmail(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -62,7 +61,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
},
},
wantErr: true,
@@ -82,7 +81,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
},
},
wantErr: true,
@@ -101,7 +100,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
Id: "notexisting",
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
},
},
wantErr: true,
@@ -121,7 +120,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
},
},
wantErr: true,
@@ -134,7 +133,7 @@ func TestServer_SetContactEmail(t *testing.T) {
schemaID := schemaResp.GetDetails().GetId()
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data))
req.Id = userResp.GetDetails().GetId()
email := gofakeit.Email()
email := integration.Email()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, email)
return nil
},
@@ -156,7 +155,7 @@ func TestServer_SetContactEmail(t *testing.T) {
schemaID := schemaResp.GetDetails().GetId()
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data))
req.Id = userResp.GetDetails().GetId()
email := gofakeit.Email()
email := integration.Email()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, email)
req.Email.Address = email
return nil
@@ -189,7 +188,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
req: &user.SetContactEmailRequest{
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
},
},
res: res{
@@ -217,7 +216,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_ReturnCode{},
},
},
@@ -247,7 +246,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_SendCode{SendCode: &user.SendEmailVerificationCode{UrlTemplate: gu.Ptr("{{")}},
},
},
@@ -268,7 +267,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_IsVerified{IsVerified: true},
},
},
@@ -297,7 +296,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_SendCode{SendCode: &user.SendEmailVerificationCode{UrlTemplate: gu.Ptr("https://example.com/email/verify?userID={{.UserID}}&code={{.Code}}&orgID={{.OrgID}}")}},
},
},
@@ -326,7 +325,7 @@ func TestServer_SetContactEmail(t *testing.T) {
},
},
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_SendCode{},
},
},
@@ -378,7 +377,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -397,7 +396,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
dep: func(req *user.VerifyContactEmailRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -416,7 +415,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
dep: func(req *user.VerifyContactEmailRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -452,7 +451,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
dep: func(req *user.VerifyContactEmailRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -473,7 +472,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
schemaID := schemaResp.GetDetails().GetId()
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.VerifyContactEmailRequest{
@@ -492,7 +491,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
dep: func(req *user.VerifyContactEmailRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -513,7 +512,7 @@ func TestServer_VerifyContactEmail(t *testing.T) {
dep: func(req *user.VerifyContactEmailRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -567,7 +566,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -587,7 +586,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
dep: func(req *user.ResendContactEmailCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.ResendContactEmailCodeRequest{
@@ -605,7 +604,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
dep: func(req *user.ResendContactEmailCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.ResendContactEmailCodeRequest{
@@ -639,7 +638,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
dep: func(req *user.ResendContactEmailCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.ResendContactEmailCodeRequest{
@@ -676,7 +675,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
dep: func(req *user.ResendContactEmailCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.ResendContactEmailCodeRequest{},
@@ -696,7 +695,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
dep: func(req *user.ResendContactEmailCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.ResendContactEmailCodeRequest{
@@ -724,7 +723,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) {
dep: func(req *user.ResendContactEmailCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email())
instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email())
return nil
},
req: &user.ResendContactEmailCodeRequest{

49
internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go
View File

@@ -6,7 +6,6 @@ import (
"context"
"testing"
"github.com/brianvoe/gofakeit/v6"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/timestamppb"
@@ -32,7 +31,7 @@ func TestServer_SetContactPhone(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -61,7 +60,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
},
},
wantErr: true,
@@ -81,7 +80,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
},
},
wantErr: true,
@@ -100,7 +99,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
Id: "notexisting",
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
},
},
wantErr: true,
@@ -120,7 +119,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
},
},
wantErr: true,
@@ -133,7 +132,7 @@ func TestServer_SetContactPhone(t *testing.T) {
schemaID := schemaResp.GetDetails().GetId()
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data))
req.Id = userResp.GetDetails().GetId()
number := gofakeit.Phone()
number := integration.Phone()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, number)
req.Phone.Number = number
return nil
@@ -166,7 +165,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
req: &user.SetContactPhoneRequest{
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
},
},
res: res{
@@ -194,7 +193,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
Verification: &user.SetPhone_ReturnCode{},
},
},
@@ -224,7 +223,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
Verification: &user.SetPhone_IsVerified{IsVerified: true},
},
},
@@ -253,7 +252,7 @@ func TestServer_SetContactPhone(t *testing.T) {
},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
Verification: &user.SetPhone_SendCode{},
},
},
@@ -305,7 +304,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -325,7 +324,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
dep: func(req *user.VerifyContactPhoneRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -344,7 +343,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
dep: func(req *user.VerifyContactPhoneRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -380,7 +379,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
dep: func(req *user.VerifyContactPhoneRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -401,7 +400,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
schemaID := schemaResp.GetDetails().GetId()
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.VerifyContactPhoneRequest{
@@ -420,7 +419,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
dep: func(req *user.VerifyContactPhoneRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -441,7 +440,7 @@ func TestServer_VerifyContactPhone(t *testing.T) {
dep: func(req *user.VerifyContactPhoneRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
req.VerificationCode = verifyResp.GetVerificationCode()
return nil
},
@@ -496,7 +495,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -516,7 +515,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
dep: func(req *user.ResendContactPhoneCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.ResendContactPhoneCodeRequest{
@@ -534,7 +533,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
dep: func(req *user.ResendContactPhoneCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.ResendContactPhoneCodeRequest{
@@ -568,7 +567,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
dep: func(req *user.ResendContactPhoneCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.ResendContactPhoneCodeRequest{
@@ -605,7 +604,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
dep: func(req *user.ResendContactPhoneCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.ResendContactPhoneCodeRequest{},
@@ -625,7 +624,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
dep: func(req *user.ResendContactPhoneCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.ResendContactPhoneCodeRequest{
@@ -653,7 +652,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) {
dep: func(req *user.ResendContactPhoneCodeRequest) error {
userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}"))
req.Id = userResp.GetDetails().GetId()
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone())
instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone())
return nil
},
req: &user.ResendContactPhoneCodeRequest{

27
internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go
View File

@@ -6,7 +6,6 @@ import (
"context"
"testing"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -49,7 +48,7 @@ func TestServer_CreateUser(t *testing.T) {
}
}`)
permissionSchemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, permissionSchema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -185,11 +184,11 @@ func TestServer_CreateUser(t *testing.T) {
Data: unmarshalJSON("{\"name\": \"user\"}"),
Contact: &user.SetContact{
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_ReturnCode{ReturnCode: &user.ReturnEmailVerificationCode{}},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
Verification: &user.SetPhone_ReturnCode{ReturnCode: &user.ReturnPhoneVerificationCode{}},
},
},
@@ -257,7 +256,7 @@ func TestServer_PatchUser(t *testing.T) {
}
}`)
permissionSchemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, permissionSchema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
type res struct {
want *resource_object.Details
@@ -528,7 +527,7 @@ func TestServer_PatchUser(t *testing.T) {
User: &user.PatchUser{
Contact: &user.SetContact{
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_ReturnCode{ReturnCode: &user.ReturnEmailVerificationCode{}},
},
},
@@ -562,7 +561,7 @@ func TestServer_PatchUser(t *testing.T) {
User: &user.PatchUser{
Contact: &user.SetContact{
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
Verification: &user.SetPhone_ReturnCode{ReturnCode: &user.ReturnPhoneVerificationCode{}},
},
},
@@ -597,11 +596,11 @@ func TestServer_PatchUser(t *testing.T) {
Data: unmarshalJSON("{\"name\": \"changed\"}"),
Contact: &user.SetContact{
Email: &user.SetEmail{
Address: gofakeit.Email(),
Address: integration.Email(),
Verification: &user.SetEmail_ReturnCode{ReturnCode: &user.ReturnEmailVerificationCode{}},
},
Phone: &user.SetPhone{
Number: gofakeit.Phone(),
Number: integration.Phone(),
Verification: &user.SetPhone_ReturnCode{ReturnCode: &user.ReturnPhoneVerificationCode{}},
},
},
@@ -662,7 +661,7 @@ func TestServer_DeleteUser(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
tests := []struct {
name string
@@ -878,7 +877,7 @@ func TestServer_LockUser(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
tests := []struct {
name string
@@ -1079,7 +1078,7 @@ func TestServer_UnlockUser(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
tests := []struct {
name string
@@ -1261,7 +1260,7 @@ func TestServer_DeactivateUser(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
tests := []struct {
name string
@@ -1462,7 +1461,7 @@ func TestServer_ActivateUser(t *testing.T) {
}
}`)
schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema)
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email())
orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email())
tests := []struct {
name string

9
internal/api/grpc/resources/userschema/v3alpha/integration_test/query_test.go
View File

@@ -7,7 +7,6 @@ import (
"testing"
"time"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -80,7 +79,7 @@ func TestServer_ListUserSchemas(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.SearchUserSchemasRequest{},
prepare: func(request *schema.SearchUserSchemasRequest, resp *schema.SearchUserSchemasResponse) error {
schemaType := gofakeit.Name()
schemaType := integration.UserSchemaName()
createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType)
request.Filters = []*schema.SearchFilter{
{
@@ -126,7 +125,7 @@ func TestServer_ListUserSchemas(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.SearchUserSchemasRequest{},
prepare: func(request *schema.SearchUserSchemasRequest, resp *schema.SearchUserSchemasResponse) error {
schemaType := gofakeit.Name()
schemaType := integration.UserSchemaName()
schemaType1 := schemaType + "_1"
schemaType2 := schemaType + "_2"
createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType1)
@@ -241,7 +240,7 @@ func TestServer_GetUserSchema(t *testing.T) {
ctx: instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner),
req: &schema.GetUserSchemaRequest{},
prepare: func(request *schema.GetUserSchemaRequest, resp *schema.GetUserSchemaResponse) error {
schemaType := gofakeit.Name()
schemaType := integration.UserSchemaName()
createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType)
request.Id = createResp.GetDetails().GetId()
return nil
@@ -265,7 +264,7 @@ func TestServer_GetUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.GetUserSchemaRequest{},
prepare: func(request *schema.GetUserSchemaRequest, resp *schema.GetUserSchemaResponse) error {
schemaType := gofakeit.Name()
schemaType := integration.UserSchemaName()
createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType)
request.Id = createResp.GetDetails().GetId()

23
internal/api/grpc/resources/userschema/v3alpha/integration_test/userschema_test.go
View File

@@ -6,7 +6,6 @@ import (
"context"
"testing"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/structpb"
@@ -35,7 +34,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner),
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.Username(),
},
},
wantErr: true,
@@ -55,7 +54,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
},
},
wantErr: true,
@@ -65,7 +64,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
DataType: &schema.UserSchema_Schema{
Schema: func() *structpb.Struct {
s := new(structpb.Struct)
@@ -96,7 +95,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
DataType: &schema.UserSchema_Schema{
Schema: func() *structpb.Struct {
s := new(structpb.Struct)
@@ -135,7 +134,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
DataType: &schema.UserSchema_Schema{
Schema: func() *structpb.Struct {
s := new(structpb.Struct)
@@ -169,7 +168,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
DataType: &schema.UserSchema_Schema{
Schema: func() *structpb.Struct {
s := new(structpb.Struct)
@@ -211,7 +210,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
DataType: &schema.UserSchema_Schema{
Schema: func() *structpb.Struct {
s := new(structpb.Struct)
@@ -246,7 +245,7 @@ func TestServer_CreateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.CreateUserSchemaRequest{
UserSchema: &schema.UserSchema{
Type: gofakeit.Name(),
Type: integration.UserSchemaName(),
DataType: &schema.UserSchema_Schema{
Schema: func() *structpb.Struct {
s := new(structpb.Struct)
@@ -329,7 +328,7 @@ func TestServer_UpdateUserSchema(t *testing.T) {
ctx: instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner),
req: &schema.PatchUserSchemaRequest{
UserSchema: &schema.PatchUserSchema{
Type: gu.Ptr(gofakeit.Name()),
Type: gu.Ptr(integration.UserSchemaName()),
},
},
},
@@ -386,7 +385,7 @@ func TestServer_UpdateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.PatchUserSchemaRequest{
UserSchema: &schema.PatchUserSchema{
Type: gu.Ptr(gofakeit.Name()),
Type: gu.Ptr(integration.UserSchemaName()),
},
},
},
@@ -570,7 +569,7 @@ func TestServer_UpdateUserSchema(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
req: &schema.PatchUserSchemaRequest{
UserSchema: &schema.PatchUserSchema{
Type: gu.Ptr(gofakeit.Name()),
Type: gu.Ptr(integration.UserSchemaName()),
},
},
},