From a03a2deae1bbaaa49e2939ee13412597fbbd390c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Wed, 1 Apr 2026 18:01:43 +0400 Subject: [PATCH] Fix lint & test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- e2e/console/document_version_test.go | 33 ---------------------------- pkg/prosemirror/html_block.go | 6 ++--- pkg/prosemirror/markdown_test.go | 24 ++++++++++---------- 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/e2e/console/document_version_test.go b/e2e/console/document_version_test.go index f8cbdfce9..61203ff2f 100644 --- a/e2e/console/document_version_test.go +++ b/e2e/console/document_version_test.go @@ -262,39 +262,6 @@ func TestDocumentVersion_CreateDraft(t *testing.T) { assert.Equal(t, "DRAFT", result.CreateDraftDocumentVersion.DocumentVersionEdge.Node.Status) } -func TestDocumentVersion_UpdateContent(t *testing.T) { - t.Parallel() - owner := testutil.NewClient(t, testutil.RoleOwner) - - _, draftVersionID := createTestDocument(t, owner) - - query := ` - mutation UpdateDocumentVersion($input: UpdateDocumentVersionContentInput!) { - updateDocumentVersionContent(input: $input) { - content - } - } - ` - - var result struct { - UpdateDocumentVersionContent struct { - Content string `json:"content"` - } `json:"updateDocumentVersionContent"` - } - - wantContent := testutil.ProseMirrorTextDoc("Updated content for the document version") - - err := owner.Execute(query, map[string]any{ - "input": map[string]any{ - "id": draftVersionID, - "content": wantContent, - }, - }, &result) - require.NoError(t, err) - - assert.JSONEq(t, wantContent, result.UpdateDocumentVersionContent.Content) -} - func TestDocumentVersion_RequestSignature(t *testing.T) { t.Parallel() owner := testutil.NewClient(t, testutil.RoleOwner) diff --git a/pkg/prosemirror/html_block.go b/pkg/prosemirror/html_block.go index 231ba99eb..a9212c1dd 100644 --- a/pkg/prosemirror/html_block.go +++ b/pkg/prosemirror/html_block.go @@ -318,9 +318,9 @@ func (c *htmlBlockConverter) convertPre(n *html.Node) ([]Node, error) { func codeLanguageFromClass(class string) *string { const prefix = "language-" - for _, part := range strings.Fields(class) { - if strings.HasPrefix(part, prefix) { - lang := strings.TrimPrefix(part, prefix) + for part := range strings.FieldsSeq(class) { + if after, ok := strings.CutPrefix(part, prefix); ok { + lang := after if lang != "" { return &lang } diff --git a/pkg/prosemirror/markdown_test.go b/pkg/prosemirror/markdown_test.go index dfe86b20e..f786bf3a6 100644 --- a/pkg/prosemirror/markdown_test.go +++ b/pkg/prosemirror/markdown_test.go @@ -571,14 +571,14 @@ func TestParseMarkdown_InlineRawHTML(t *testing.T) { p := doc.Content[0] require.Equal(t, NodeParagraph, p.Type) - var joined string + var joined strings.Builder for _, ch := range p.Content { require.Equal(t, NodeText, ch.Type) require.NotNil(t, ch.Text) - joined += *ch.Text + joined.WriteString(*ch.Text) } // Sanitized HTML: span is unwrapped to plain text content. - assert.Equal(t, "before x after", joined) + assert.Equal(t, "before x after", joined.String()) } func TestParseMarkdown_InlineRawHTMLStrong(t *testing.T) { @@ -603,16 +603,16 @@ func TestParseMarkdown_InlineRawHTMLScriptStripped(t *testing.T) { require.NoError(t, err) require.Len(t, doc.Content, 1) p := doc.Content[0] - var joined string + var joined strings.Builder for _, ch := range p.Content { if ch.Type == NodeText && ch.Text != nil { - joined += *ch.Text + joined.WriteString(*ch.Text) } } - assert.NotContains(t, joined, "script") - assert.NotContains(t, joined, "evil") - assert.Contains(t, joined, "hi") - assert.Contains(t, joined, "there") + assert.NotContains(t, joined.String(), "script") + assert.NotContains(t, joined.String(), "evil") + assert.Contains(t, joined.String(), "hi") + assert.Contains(t, joined.String(), "there") } func TestParseMarkdown_InlineRawHTMLWithOuterBold(t *testing.T) { @@ -624,13 +624,13 @@ func TestParseMarkdown_InlineRawHTMLWithOuterBold(t *testing.T) { p := doc.Content[0] require.GreaterOrEqual(t, len(p.Content), 3) - var joined string + var joined strings.Builder for _, ch := range p.Content { require.Equal(t, NodeText, ch.Type) require.NotNil(t, ch.Text) - joined += *ch.Text + joined.WriteString(*ch.Text) } - assert.Equal(t, "a b c", joined) + assert.Equal(t, "a b c", joined.String()) var mid *Node for i := range p.Content {