Browse Source

Added session to tests

Alex Myasoedov 8 years ago
parent
commit
8ddd1d61bb
2 changed files with 16 additions and 14 deletions
  1. 10 10
      app_test.go
  2. 6 4
      main.go

+ 10 - 10
app_test.go

@@ -1,21 +1,22 @@
 package main
 
 import (
-	. "github.com/franela/goblin"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	. "github.com/franela/goblin"
+	"github.com/gin-gonic/gin"
 )
 
 const Cookie = "Set-Cookie"
 
-func client(method, path, session string) *httptest.ResponseRecorder {
+func client(method, path, cookie string) *httptest.ResponseRecorder {
 	gin.SetMode("test")
 	app := NewApp()
 	req, _ := http.NewRequest(method, path, nil)
-	if len(session) != 0 {
-		req.Header.Set(Cookie, session)
+	if len(cookie) != 0 {
+		req.Header.Set("Cookie", cookie)
 	}
 	w := httptest.NewRecorder()
 	app.ServeHTTP(w, req)
@@ -25,23 +26,22 @@ func client(method, path, session string) *httptest.ResponseRecorder {
 func Test(t *testing.T) {
 	g := Goblin(t)
 	g.Describe("App api", func() {
-		var session string
+		var cookie string
 
 		g.It("Should return 200 on / ", func() {
 			w := client("GET", "/", "")
 
 			g.Assert(w.Code).Equal(200)
-			session = w.HeaderMap.Get(Cookie)
-
+			cookie = w.HeaderMap.Get(Cookie)
 		})
 
 		g.It("Should return 200 on /slides.md ", func() {
-			w := client("GET", "/slides.md", session)
+			w := client("GET", "/slides.md", cookie)
 			g.Assert(w.Code).Equal(200)
 		})
 
 		g.It("Should return 200 on PUT /slides.md ", func() {
-			w := client("PUT", "/slides.md", session)
+			w := client("PUT", "/slides.md", cookie)
 			g.Assert(w.Code).Equal(200)
 		})
 

+ 6 - 4
main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+
 	log "github.com/Sirupsen/logrus"
-	"github.com/atrox/haikunatorgo"
+	haikunator "github.com/atrox/haikunatorgo"
 	"github.com/gin-gonic/contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"io/ioutil"
-	"os"
 )
 
 const SessionHeader = "slide-session"
@@ -39,12 +40,12 @@ func NewApp() *gin.Engine {
 		})
 	})
 
-
 	r.GET("/slides.md", func(c *gin.Context) {
 		session := sessions.Default(c)
 		val := session.Get("name")
 		if val == nil {
 			c.String(400, "No context")
+			return
 		}
 		log.WithFields(log.Fields{
 			"path": val,
@@ -76,6 +77,7 @@ func NewApp() *gin.Engine {
 		val := session.Get("name")
 		if val == nil {
 			c.String(400, "No context")
+			return
 		}
 		log.WithFields(log.Fields{
 			"path": val,