Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7a991f7

Browse files
committed
fix tests
1 parent6c8baae commit7a991f7

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

‎coderd/members_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package coderd_test
22

33
import (
4+
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
45
"testing"
56

67
"github.com/google/uuid"
@@ -62,9 +63,9 @@ func TestListMembers(t *testing.T) {
6263
ctx:=testutil.Context(t,testutil.WaitShort)
6364
members,err:=client.OrganizationMembers(ctx,first.OrganizationID)
6465
require.NoError(t,err)
65-
require.Len(t,members,2)
66+
require.Len(t,members,3)
6667
require.ElementsMatch(t,
67-
[]uuid.UUID{first.UserID,user.ID},
68+
[]uuid.UUID{first.UserID,user.ID,prebuilds.OwnerID},
6869
db2sdk.List(members,onlyIDs))
6970
})
7071
}

‎codersdk/deployment.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,6 +2981,7 @@ Write out the current server config as YAML to stdout.`,
29812981
Default: (time.Second*15).String(),
29822982
Group:&deploymentGroupPrebuilds,
29832983
YAML:"reconciliation_backoff_interval",
2984+
Annotations: serpent.Annotations{}.Mark(annotationFormatDuration,"true"),
29842985
Hidden:true,
29852986
},
29862987
{
@@ -2992,6 +2993,7 @@ Write out the current server config as YAML to stdout.`,
29922993
Default: (time.Hour).String(),// TODO: use https://pkg.go.dev/github.com/jackc/pgtype@v1.12.0#Interval
29932994
Group:&deploymentGroupPrebuilds,
29942995
YAML:"reconciliation_backoff_lookback_period",
2996+
Annotations: serpent.Annotations{}.Mark(annotationFormatDuration,"true"),
29952997
Hidden:true,
29962998
},
29972999
}

‎enterprise/coderd/groups_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package coderd_test
22

33
import (
4+
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
45
"net/http"
56
"sort"
67
"testing"
@@ -819,6 +820,7 @@ func TestGroup(t *testing.T) {
819820
})
820821

821822
t.Run("everyoneGroupReturnsEmpty",func(t*testing.T) {
823+
// TODO (sasswart): this test seems to have drifted from its original intention. evaluate and remove/fix
822824
t.Parallel()
823825

824826
client,user:=coderdenttest.New(t,&coderdenttest.Options{LicenseOptions:&coderdenttest.LicenseOptions{
@@ -829,16 +831,19 @@ func TestGroup(t *testing.T) {
829831
userAdminClient,_:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID,rbac.RoleUserAdmin())
830832
_,user1:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
831833
_,user2:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
832-
833834
ctx:=testutil.Context(t,testutil.WaitLong)
835+
836+
prebuildsUser,err:=client.User(ctx,prebuilds.OwnerID.String())
837+
require.NoError(t,err)
834838
// The 'Everyone' group always has an ID that matches the organization ID.
835839
group,err:=userAdminClient.Group(ctx,user.OrganizationID)
836840
require.NoError(t,err)
837-
require.Len(t,group.Members,4)
841+
require.Len(t,group.Members,5)
838842
require.Equal(t,"Everyone",group.Name)
839843
require.Equal(t,user.OrganizationID,group.OrganizationID)
840844
require.Contains(t,group.Members,user1.ReducedUser)
841845
require.Contains(t,group.Members,user2.ReducedUser)
846+
require.Contains(t,group.Members,prebuildsUser.ReducedUser)
842847
})
843848
}
844849

‎enterprise/coderd/roles_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package coderd_test
33
import (
44
"bytes"
55
"context"
6+
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
67
"net/http"
78
"slices"
89
"testing"
@@ -360,9 +361,9 @@ func TestCustomOrganizationRole(t *testing.T) {
360361
// Verify members have the custom role
361362
originalMembers,err:=orgAdmin.OrganizationMembers(ctx,first.OrganizationID)
362363
require.NoError(t,err)
363-
require.Len(t,originalMembers,5)// 3 members + org admin + owner
364+
require.Len(t,originalMembers,6)// 3 members + org admin + owner + prebuilds user
364365
for_,member:=rangeoriginalMembers {
365-
ifmember.UserID==orgAdminUser.ID||member.UserID==first.UserID {
366+
ifmember.UserID==orgAdminUser.ID||member.UserID==first.UserID||member.UserID==prebuilds.OwnerID{
366367
continue
367368
}
368369

@@ -377,7 +378,7 @@ func TestCustomOrganizationRole(t *testing.T) {
377378
// Verify the role was removed from all members
378379
members,err:=orgAdmin.OrganizationMembers(ctx,first.OrganizationID)
379380
require.NoError(t,err)
380-
require.Len(t,members,5)// 3 members + org admin + owner
381+
require.Len(t,members,6)// 3 members + org admin + owner + prebuilds user
381382
for_,member:=rangemembers {
382383
require.False(t,slices.ContainsFunc(member.Roles,func(role codersdk.SlimRole)bool {
383384
returnrole.Name==customRoleIdentifier.Name

‎enterprise/coderd/templates_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ func TestTemplateACL(t *testing.T) {
940940
require.NoError(t,err)
941941

942942
require.Len(t,acl.Groups,1)
943-
require.Len(t,acl.Groups[0].Members,2)
943+
require.Len(t,acl.Groups[0].Members,3)// orgAdmin + TemplateAdmin + prebuilds user
944944
require.Len(t,acl.Users,0)
945945
})
946946

‎provisioner/terraform/provision.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func provisionEnv(
280280
env=append(env,provider.ParameterEnvironmentVariable(param.Name)+"="+param.Value)
281281
}
282282
for_,extAuth:=rangeexternalAuth {
283-
//env = append(env, gitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
283+
env=append(env,gitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
284284
env=append(env,provider.ExternalAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
285285
}
286286

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp