TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-11-02 03:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: correct org integration tests (#10708)

Browse Source 
# Which Problems Are Solved

Eventual consistency issues.

# How the Problems Are Solved

Correctly handle timeouts and change queries to domains instead of using
the organization name.

# Additional Changes

None

# Additional Context

None

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Stefan Benz
2025-09-16 09:26:19 +02:00
committed by GitHub
parent bc471b4f78
commit b0642a5898
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/api/grpc/org/v2beta/integration_test/org_test.go
View File

@@ -575,10 +575,7 @@ func TestServer_ListOrganizations(t *testing.T) {
{ {
Filter: &v2beta_org.OrganizationSearchFilter_DomainFilter{ Filter: &v2beta_org.OrganizationSearchFilter_DomainFilter{
DomainFilter: &v2beta_org.OrgDomainFilter{ DomainFilter: &v2beta_org.OrgDomainFilter{
Domain: func() string { Domain: orgsDomain[1][1 : len(orgsDomain[1])-2],
domain := strings.ToLower(strings.ReplaceAll(orgsName[1][1:len(orgsName[1])-2], " ", "-"))
return domain
}(),
Method: v2beta_object.TextQueryMethod_TEXT_QUERY_METHOD_CONTAINS, Method: v2beta_object.TextQueryMethod_TEXT_QUERY_METHOD_CONTAINS,
}, },
}, },
@@ -598,10 +595,7 @@ func TestServer_ListOrganizations(t *testing.T) {
{ {
Filter: &v2beta_org.OrganizationSearchFilter_DomainFilter{ Filter: &v2beta_org.OrganizationSearchFilter_DomainFilter{
DomainFilter: &v2beta_org.OrgDomainFilter{ DomainFilter: &v2beta_org.OrgDomainFilter{
Domain: func() string { Domain: strings.ToUpper(orgsDomain[1][1 : len(orgsDomain[1])-2]),
domain := strings.ToUpper(strings.ReplaceAll(orgsName[1][1:len(orgsName[1])-2], " ", "-"))
return domain
}(),
Method: v2beta_object.TextQueryMethod_TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE, Method: v2beta_object.TextQueryMethod_TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE,
}, },
}, },
@@ -1254,21 +1248,20 @@ func TestServer_DeleteOrganizationDomain(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
var orgId string
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
orgId = tt.testFunc() orgId := tt.testFunc()
})
_, err := Client.DeleteOrganizationDomain(CTX, &v2beta_org.DeleteOrganizationDomainRequest{ _, err := Client.DeleteOrganizationDomain(CTX, &v2beta_org.DeleteOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: tt.domain, Domain: tt.domain,
}) })
if tt.err != nil { if tt.err != nil {
require.Contains(t, err.Error(), tt.err.Error()) require.Contains(t, err.Error(), tt.err.Error())
} else { } else {
require.NoError(t, err) require.NoError(t, err)
} }
})
} }
} }
@@ -1984,8 +1977,8 @@ func createOrgs(ctx context.Context, t *testing.T, client v2beta_org.Organizatio
require.NoError(t, err) require.NoError(t, err)
} }
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute)
for i := range noOfOrgs { for i := range noOfOrgs {
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, 5*time.Minute)
require.EventuallyWithT(t, func(collect *assert.CollectT) { require.EventuallyWithT(t, func(collect *assert.CollectT) {
listOrgRes, err := client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{ listOrgRes, err := client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{
Filter: []*v2beta_org.OrganizationSearchFilter{ Filter: []*v2beta_org.OrganizationSearchFilter{