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

Commit93de18a

Browse files
committed
detect newlines
1 parent7cd20bb commit93de18a

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

‎cli/templatepush.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"io"
77
"path/filepath"
8+
"strings"
89
"time"
910

1011
"github.com/briandowns/spinner"
@@ -117,9 +118,13 @@ func (pf *templateUploadFlags) checkForLockfile(inv *clibase.Invocation) error {
117118
}
118119

119120
func (pf*templateUploadFlags)templateMessage(inv*clibase.Invocation)string {
120-
iflen(pf.message)>72 {
121+
title:=strings.SplitN(pf.message,"\n",2)[0]
122+
iflen(title)>72 {
121123
cliui.Warn(inv.Stdout,"Template message is longer than 72 characters, it will be displayed as truncated.")
122124
}
125+
iftitle!=pf.message {
126+
cliui.Warn(inv.Stdout,"Template message contains newlines, only the first line will be displayed.")
127+
}
123128
ifpf.message!="" {
124129
returnpf.message
125130
}

‎cli/templatepush_test.go

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -123,30 +123,36 @@ func TestTemplatePush(t *testing.T) {
123123
ProvisionApply:echo.ProvisionComplete,
124124
})
125125

126-
wantMessage:=strings.Repeat("a",73)
127-
128-
inv,root:=clitest.New(t,"templates","push",template.Name,"--directory",source,"--test.provisioner",string(database.ProvisionerTypeEcho),"--name","example","--message",wantMessage,"--yes")
129-
clitest.SetupConfig(t,client,root)
130-
pty:=ptytest.New(t).Attach(inv)
131-
132-
ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitMedium)
126+
ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)
133127
defercancel()
134128

135-
inv=inv.WithContext(ctx)
136-
w:=clitest.StartWithWaiter(t,inv)
129+
fori,tt:=range []struct {
130+
wantMessagestring
131+
wantMatchstring
132+
}{
133+
{wantMessage:strings.Repeat("a",73),wantMatch:"Template message is longer than 72 characters"},
134+
{wantMessage:"This is my title\n\nAnd this is my body.",wantMatch:"Template message contains newlines"},
135+
} {
136+
inv,root:=clitest.New(t,"templates","push",template.Name,"--directory",source,"--test.provisioner",string(database.ProvisionerTypeEcho),"--name","example","--message",tt.wantMessage,"--yes")
137+
clitest.SetupConfig(t,client,root)
138+
pty:=ptytest.New(t).Attach(inv)
137139

138-
pty.ExpectMatchContext(ctx,"Template message is longer than 72 characters")
140+
inv=inv.WithContext(ctx)
141+
w:=clitest.StartWithWaiter(t,inv)
139142

140-
w.RequireSuccess()
143+
pty.ExpectMatchContext(ctx,tt.wantMatch)
141144

142-
// Assert that the template version changed.
143-
templateVersions,err:=client.TemplateVersionsByTemplate(ctx, codersdk.TemplateVersionsByTemplateRequest{
144-
TemplateID:template.ID,
145-
})
146-
require.NoError(t,err)
147-
assert.Len(t,templateVersions,2)
148-
assert.NotEqual(t,template.ActiveVersionID,templateVersions[1].ID)
149-
require.Equal(t,wantMessage,templateVersions[1].Message)
145+
w.RequireSuccess()
146+
147+
// Assert that the template version changed.
148+
templateVersions,err:=client.TemplateVersionsByTemplate(ctx, codersdk.TemplateVersionsByTemplateRequest{
149+
TemplateID:template.ID,
150+
})
151+
require.NoError(t,err)
152+
assert.Len(t,templateVersions,2+i)
153+
assert.NotEqual(t,template.ActiveVersionID,templateVersions[1+i].ID)
154+
require.Equal(t,tt.wantMessage,templateVersions[1+i].Message)
155+
}
150156
})
151157

152158
t.Run("NoLockfile",func(t*testing.T) {

0 commit comments

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