Skip to content

Commit

Permalink
Add mapMerger
Browse files Browse the repository at this point in the history
  • Loading branch information
marcomilon committed Sep 19, 2020
1 parent b48e8ac commit e8099e1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion internal/gstatic/generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func TestCompositionGenerator(t *testing.T) {
}

indexResult := strings.TrimSpace(string(indexTpl))
indexExpected := "<main><p>Index</p></main>"
indexExpected := "<h1>Hello world</h1><main><p>Index</p></main>"
if strings.ToLower(indexResult) != strings.ToLower(indexExpected) {
t.Errorf("expected %v; got %v", indexExpected, indexResult)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/gstatic/testdata/composition/layout/layout.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{define "base"}}
<main>{{template "content" . }}</main>
<h1>{{ .h1 }}</h1><main>{{template "content" . }}</main>
{{end}}
2 changes: 1 addition & 1 deletion internal/gstatic/testdata/composition/layout/layout.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
hello: Hello world
h1: Hello world

0 comments on commit e8099e1

Please sign in to comment.