fix test

mrsdizzie · mrsdizzie · commit 1bb78a013d55 · 2020-06-26T19:14:44.000-04:00
diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go
@@ -52,7 +52,6 @@ func render(body []byte, urlPrefix string, metas map[string]string, wikiMarkdown
 				extension.DefinitionList,
 				common.FootnoteExtension,
 				highlighting.NewHighlighting(
-					highlighting.WithStyle("gitea"),
 					highlighting.WithFormatOptions(
 						chromahtml.WithClasses(true),
 						chromahtml.PreventSurroundingPre(true),
diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go
@@ -15,6 +15,8 @@ import (
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/setting"
 
+	"gopkg.in/ini.v1"
+
 	dmp "github.com/sergi/go-diff/diffmatchpatch"
 	"github.com/stretchr/testify/assert"
 )
@@ -26,6 +28,7 @@ func assertEqual(t *testing.T, s1 string, s2 template.HTML) {
 }
 
 func TestDiffToHTML(t *testing.T) {
+	setting.Cfg = ini.Empty()
 	assertEqual(t, "foo <span class=\"added-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 		{Type: dmp.DiffEqual, Text: "foo "},
 		{Type: dmp.DiffInsert, Text: "bar"},

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ import (`
`15`	`15`	`"code.gitea.io/gitea/modules/git"`
`16`	`16`	`"code.gitea.io/gitea/modules/setting"`
`17`	`17`
	`18`	`+ "gopkg.in/ini.v1"`
	`19`	`+`
`18`	`20`	`dmp "github.com/sergi/go-diff/diffmatchpatch"`
`19`	`21`	`"github.com/stretchr/testify/assert"`
`20`	`22`	`)`
`@@ -26,6 +28,7 @@ func assertEqual(t *testing.T, s1 string, s2 template.HTML) {`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`func TestDiffToHTML(t *testing.T) {`
	`31`	`+ setting.Cfg = ini.Empty()`
`29`	`32`	`assertEqual(t, "foo <span class=\"added-code\">bar</span> biz", diffToHTML([]dmp.Diff{`
`30`	`33`	`{Type: dmp.DiffEqual, Text: "foo "},`
`31`	`34`	`{Type: dmp.DiffInsert, Text: "bar"},`