Fix test action

Author: osminogin

.github/workflows/test.yml

@@ -10,16 +10,17 @@ jobs:
         image: postgres
         env:
           POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
     strategy:
       matrix:
-        go-version: [1.14.x]
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.platform }}
+        go-version: [1.13.x, 1.14.x]
+    runs-on: ubuntu-latest
     steps:
       - name: Setup Go
         uses: actions/setup-go@v1
@@ -30,7 +31,3 @@ jobs:
       - run: git branch
       - run: cat handlers.go
       - run: go test -v ./...
-        env:
-          DATABASE_URL: postgres://postgres:postgres@postgres/postgres
-          SECRET_KEY: 4tests0nly
-          HTTPS_ONLY: False

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/gorilla/mux v1.7.4
 	github.com/segmentio/encoding v0.1.14 // indirect
 	github.com/spf13/viper v1.7.0
+	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
 	golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect
 )
 

handlers_test.go

@@ -18,6 +18,7 @@ package tornote
 
 import (
 	"bytes"
+	"golang.org/x/net/html"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -26,6 +27,47 @@ import (
 
 const TestRandomString = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
+func requestMainForm(s *Server) (w *httptest.ResponseRecorder) {
+	w = httptest.NewRecorder()
+	req, _ := http.NewRequest("GET", "/", nil)
+	s.router.ServeHTTP(w, req)
+	return
+}
+
+func getCSRFToken(body *bytes.Buffer) (token string) {
+	root, err := html.Parse(body)
+	if err != nil {
+		return ""
+	}
+	if n, ok := getElementByName("csrf_token", root); ok {
+		token = getAttributeByKey("value", n)
+	}
+	return
+}
+
+func getElementByName(name string, n *html.Node) (el *html.Node, ok bool) {
+	for _, a := range n.Attr {
+		if a.Key == "name" && a.Val == name {
+			return n, true
+		}
+	}
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if el, ok = getElementByName(name, c); ok {
+			return
+		}
+	}
+	return
+}
+
+func getAttributeByKey(key string, n *html.Node) string {
+	for _, attr := range n.Attr {
+		if attr.Key == key {
+			return attr.Val
+		}
+	}
+	return ""
+}
+
 func TestMainFormHandler(t *testing.T) {
 	w := httptest.NewRecorder()
 	s := stubServer()
@@ -52,19 +94,19 @@ func TestHealthStatusHandler(t *testing.T) {
 }
 
 func TestCreateNoteHandler(t *testing.T) {
-	w := httptest.NewRecorder()
-	s := stubServer()
-
-	// First request page and set CSRF protected cookie on request
-	req1, _ := http.NewRequest("GET", "/", nil)
-	s.router.ServeHTTP(w, req1)
+	srv := stubServer()
+	w := requestMainForm(srv)
 
 	data := url.Values{}
+	cookies := w.Result().Cookies()
 	data.Set("body", TestRandomString)
+	data.Set("csrf_token", getCSRFToken(w.Body))
 
-	req2, _ := http.NewRequest("POST", "/note", bytes.NewBufferString(data.Encode()))
-	req2.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
-	s.router.ServeHTTP(w, req2)
+	w = httptest.NewRecorder()
+	req, _ := http.NewRequest("POST", "/note", bytes.NewBufferString(data.Encode()))
+	req.AddCookie(cookies[0])
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
+	srv.router.ServeHTTP(w, req)
 
 	if w.Code != http.StatusCreated {
 		t.Errorf("return code %d instead %d", w.Code, http.StatusCreated)

server.go

@@ -160,20 +160,21 @@ func (s *Server) Init() {
 	if err := s.compileTemplates(); err != nil {
 		panic(err)
 	}
-}
 
-// Listen server on specified port with opened database connection.
-func (s *Server) Listen() error {
 	// Connecting to database
 	if err := s.connectDB(); err != nil {
-		return err
+		panic(err)
 	}
-	defer s.db.Close()
 
-	// Bootstrap database if not exists
+	// Bootstrap tables if not exists
 	if err := s.createSchema(); err != nil {
-		return err
+		panic(err)
 	}
+}
+
+// Listen server on specified port with opened database connection.
+func (s *Server) Listen() error {
+	defer s.db.Close()
 
 	// Start the server
 	if s.opts.HTTPSOnly {

server_test.go

@@ -18,23 +18,24 @@
 package tornote
 
 const (
-	TestDSN    = "postgres://postgres:postgres@localhost/testdb"
+	TestDSN    = "postgres://postgres:postgres@localhost/postgres?sslmode=disable"
 	TestPort   = 31337
-	TestSecret = "0123456789"
+	TestSecret = "4tests0nly"
 )
 
 func stubServer() *Server {
-	srv := NewServer(ServerOpts{})
+	o := testServerOpts()
+	srv := NewServer(o)
 	srv.Init()
 	return srv
 }
 
 func testServerOpts() ServerOpts {
 	return ServerOpts{
-		Port:      8000,
-		DSN:       "postgres://postgres:postgres@postgres/postgres",
+		Port:      TestPort,
+		DSN:       TestDSN,
+		Secret:    TestSecret,
 		HTTPSOnly: false,
-		Secret:    "4tests0nly",
 	}
 }