distinguish in the log message between calls and access logs

qvest-digital · Jun 21, 2016 · efeac40 · efeac40
1 parent 20d3c39
commit efeac40
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/composition/composition_handler_test.go b/composition/composition_handler_test.go
@@ -36,7 +36,8 @@ func Test_CompositionHandler_PositiveCase(t *testing.T) {
 	r, _ := http.NewRequest("GET", "http://example.com", nil)
 	ch.ServeHTTP(resp, r)
 
-	expected := `<html>
+	expected := `<!DOCTYPE html>
+<html>
   <head>
     
   </head>

diff --git a/composition/content_merge.go b/composition/content_merge.go
@@ -47,7 +47,7 @@ func (cntx *ContentMerge) GetHtml() ([]byte, error) {
 		return f.Execute(w, cntx.MetaJSON, executeFragment)
 	}
 
-	io.WriteString(w, "<html>\n  <head>\n    ")
+	io.WriteString(w, "<!DOCTYPE html>\n<html>\n  <head>\n    ")
 
 	for _, f := range cntx.Head {
 		if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {

diff --git a/composition/content_merge_test.go b/composition/content_merge_test.go
@@ -10,7 +10,8 @@ import (
 func Test_ContentMerge_PositiveCase(t *testing.T) {
 	a := assert.New(t)
 
-	expected := `<html>
+	expected := `<!DOCTYPE html>
+<html>
   <head>
     <page1-head/>
     <page2-head/>

diff --git a/composition_example/expected_test_result.html b/composition_example/expected_test_result.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <link rel="stylesheet" href="/static/stylesheet.css"><link rel="stylesheet" href="/static/basic.css">