Fixing tests

Author: nicolasgarnier

claat/parser/gdoc/parse_test.go

@@ -110,7 +110,7 @@ func TestParseTopCodeBlock(t *testing.T) {
 	code := "start func() {\n}\n\nfunc2() {\n} // comment"
 	term := "adb shell am start -a VIEW \\\n-d \"http://host\" app"
 	content := types.NewListNode()
-	var lang string;
+	var lang string
 	content.Append(types.NewCodeNode(code, false, lang))
 	content.Append(types.NewCodeNode(term, true, lang))
 
@@ -127,9 +127,9 @@ func TestParseTopCodeBlock(t *testing.T) {
 		cur: doc.FirstChild,
 	}
 	parseTop(ds)
-
-	html1, _ := render.HTML("", ds.step.Content)
-	html2, _ := render.HTML("", content)
+	var ctx render.Context
+	html1, _ := render.HTML(ctx, ds.step.Content)
+	html2, _ := render.HTML(ctx, content)
 	s1 := strings.TrimSpace(string(html1))
 	s2 := strings.TrimSpace(string(html2))
 	if s1 != s2 {
@@ -492,7 +492,7 @@ func TestParseDoc(t *testing.T) {
 		"http://host/file.java", types.NewTextNode("a file")))
 	content.Append(h)
 
-	var lang string;
+	var lang string
 	code := "start func() {\n}\n\nfunc2() {\n} // comment"
 	cn := types.NewCodeNode(code, false, lang)
 	cn.MutateBlock(1)
@@ -523,8 +523,9 @@ func TestParseDoc(t *testing.T) {
 	})
 	content.Append(sv)
 
-	html1, _ := render.HTML("", step.Content)
-	html2, _ := render.HTML("", content)
+	var ctx render.Context
+	html1, _ := render.HTML(ctx, step.Content)
+	html2, _ := render.HTML(ctx, content)
 	if html1 != html2 {
 		t.Errorf("step.Content:\n\n%s\nwant:\n\n%s", html1, html2)
 	}
@@ -577,8 +578,9 @@ func TestParseFragment(t *testing.T) {
 	para.MutateBlock(true)
 	want = append(want, para)
 
-	html1, _ := render.HTML("", nodes...)
-	html2, _ := render.HTML("", want...)
+	var ctx render.Context
+	html1, _ := render.HTML(ctx, nodes...)
+	html2, _ := render.HTML(ctx, want...)
 	if html1 != html2 {
 		t.Errorf("nodes:\n\n%s\nwant:\n\n%s", html1, html2)
 	}

claat/render/html_test.go

@@ -39,7 +39,9 @@ func TestHTMLEnv(t *testing.T) {
 		{"four", ""},
 	}
 	for i, test := range tests {
-		h, err := HTML(test.env, one, two, three)
+		var ctx Context
+		ctx.Env = test.env
+		h, err := HTML(ctx, one, two, three)
 		if err != nil {
 			t.Errorf("%d: %v", i, err)
 			continue

claat/render/template_test.go

@@ -26,13 +26,15 @@ func TestExecuteBuiltin(t *testing.T) {
 		Title:   "Test step",
 		Content: types.NewListNode(types.NewTextNode("text")),
 	}
-	ctx := &Context{
+	data := &struct {
+		Context
+	}{Context: Context{
 		Meta:  &types.Meta{},
 		Steps: []*types.Step{step},
-	}
+	}}
 	for _, f := range []string{"html", "md"} {
 		var buf bytes.Buffer
-		if err := Execute(&buf, f, ctx); err != nil {
+		if err := Execute(&buf, f, data); err != nil {
 			t.Errorf("%s: %v", f, err)
 		}
 	}