Merge branch 'main' into add-ldap-configuration-edit-tests

6543 · web-flow · commit 237d0e56b78d · 2021-07-18T15:22:17.000+02:00
diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go
@@ -42,6 +42,7 @@ func TestRender_StandardLinks(t *testing.T) {
 			URLPrefix: setting.AppSubURL,
 			IsWiki:    true,
 		}, input)
+		assert.NoError(t, err)
 		assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(buffer))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ func TestRender_StandardLinks(t *testing.T) {`
`42`	`42`	`URLPrefix: setting.AppSubURL,`
`43`	`43`	`IsWiki: true,`
`44`	`44`	`}, input)`
	`45`	`+ assert.NoError(t, err)`
`45`	`46`	`assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(buffer))`
`46`	`47`	`}`
`47`	`48`