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

Commite7a3163

Browse files
committed
add unset test
1 parent9243e30 commite7a3163

File tree

2 files changed

+79
-0
lines changed

2 files changed

+79
-0
lines changed

‎cli/templateedit.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,14 @@ func updateTemplateMetaRequest(args updateTemplateMetaArgs) codersdk.UpdateTempl
342342
ifargs.unsetAutostopRequirementDaysOfWeek {
343343
args.autostopRequirementDaysOfWeek= []string{}
344344
}
345+
unsetDefaultTTL,err:=time.ParseDuration("24h")
346+
iferr!=nil {
347+
panic(err)
348+
}
349+
350+
ifargs.defaultTTL==unsetDefaultTTL {
351+
args.defaultTTL=time.Duration(args.template.DefaultTTLMillis)*time.Millisecond
352+
}
345353
ifargs.failureTTL==0 {
346354
args.failureTTL=time.Duration(args.template.FailureTTLMillis)*time.Millisecond
347355
}

‎cli/templatepush_test.go

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,77 @@ func TestTemplatePush(t *testing.T) {
787787
assert.Equal(t,defaultTTL.Milliseconds(),updated.DefaultTTLMillis)
788788
assert.Equal(t,allowUserCancelWorkspaceJobs,updated.AllowUserCancelWorkspaceJobs)
789789
})
790+
791+
t.Run("EditMetadataKeepUnsetUnchanged",func(t*testing.T) {
792+
t.Parallel()
793+
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
794+
owner:=coderdtest.CreateFirstUser(t,client)
795+
templateAdmin,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())
796+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,nil)
797+
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
798+
799+
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
800+
801+
// Test the cli command.
802+
source:=clitest.CreateTemplateVersionSource(t,&echo.Responses{
803+
Parse:echo.ParseComplete,
804+
ProvisionApply:echo.ApplyComplete,
805+
})
806+
807+
desc:="lorem ipsum dolor sit amet et cetera"
808+
809+
inv,root:=clitest.New(t,
810+
"templates",
811+
"push",
812+
template.Name,
813+
"--directory",source,
814+
"--test.provisioner",string(database.ProvisionerTypeEcho),
815+
"--description",desc,
816+
)
817+
clitest.SetupConfig(t,templateAdmin,root)
818+
pty:=ptytest.New(t).Attach(inv)
819+
820+
execDone:=make(chanerror)
821+
gofunc() {
822+
execDone<-inv.Run()
823+
}()
824+
825+
matches:= []struct {
826+
matchstring
827+
writestring
828+
}{
829+
{match:"Upload",write:"yes"},
830+
}
831+
for_,m:=rangematches {
832+
pty.ExpectMatch(m.match)
833+
pty.WriteLine(m.write)
834+
}
835+
836+
require.NoError(t,<-execDone)
837+
838+
// Assert that the template version changed.
839+
templateVersions,err:=client.TemplateVersionsByTemplate(context.Background(), codersdk.TemplateVersionsByTemplateRequest{
840+
TemplateID:template.ID,
841+
})
842+
require.NoError(t,err)
843+
assert.Len(t,templateVersions,2)
844+
assert.NotEqual(t,template.ActiveVersionID,templateVersions[1].ID)
845+
846+
// Assert that the template metadata changed.
847+
updated,err:=client.Template(context.Background(),template.ID)
848+
require.NoError(t,err)
849+
assert.Equal(t,template.Name,updated.Name)
850+
assert.Equal(t,template.DisplayName,updated.DisplayName)
851+
assert.Equal(t,desc,updated.Description)
852+
assert.Equal(t,template.Icon,updated.Icon)
853+
assert.Equal(t,template.DefaultTTLMillis,updated.DefaultTTLMillis)
854+
assert.Equal(t,template.FailureTTLMillis,updated.FailureTTLMillis)
855+
assert.Equal(t,template.TimeTilDormantAutoDeleteMillis,updated.TimeTilDormantAutoDeleteMillis)
856+
assert.Equal(t,template.AutostartRequirement.DaysOfWeek,updated.AutostartRequirement.DaysOfWeek)
857+
assert.Equal(t,template.AutostopRequirement.DaysOfWeek,updated.AutostopRequirement.DaysOfWeek)
858+
assert.Equal(t,template.RequireActiveVersion,updated.RequireActiveVersion)
859+
assert.Equal(t,template.AllowUserCancelWorkspaceJobs,updated.AllowUserCancelWorkspaceJobs)
860+
})
790861
}
791862

792863
funccreateEchoResponsesWithTemplateVariables(templateVariables []*proto.TemplateVariable)*echo.Responses {

0 commit comments

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