From 8ddd1d61bbd757efeab8eb09c21a2b3cd03eb24a Mon Sep 17 00:00:00 2001
From: Alex Myasoedov <msoedov@gmail.com>
Date: Tue, 1 Mar 2016 20:40:13 +0200
Subject: [PATCH] Added session to tests

---
 app_test.go | 20 ++++++++++----------
 main.go     | 12 +++++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app_test.go b/app_test.go
index a285258..39f8ce5 100644
--- a/app_test.go
+++ b/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)
 		})
 
diff --git a/main.go b/main.go
index 8cbacb0..b4fbc14 100644
--- a/main.go
+++ b/main.go
@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/atrox/haikunatorgo"
-	"github.com/gin-gonic/contrib/sessions"
-	"github.com/gin-gonic/gin"
 	"io/ioutil"
 	"os"
+
+	log "github.com/Sirupsen/logrus"
+	haikunator "github.com/atrox/haikunatorgo"
+	"github.com/gin-gonic/contrib/sessions"
+	"github.com/gin-gonic/gin"
 )
 
 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,