fix handler.Initialize calls

Author: samdfonseca

app/handler/admin_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dingoblog/dingo/app/model"
 	"github.com/dinever/golf"
+	"github.com/dingoblog/dingo/app/model"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -22,7 +22,8 @@ func authenticatedContext(form url.Values, method, path string) *golf.Context {
 	ctx.App.ServeHTTP(ctx.Response, ctx.Request)
 	rec := ctx.Response.(*httptest.ResponseRecorder)
 	w := httptest.NewRecorder()
-	app := InitTestApp()
+	app := golf.New()
+	app = InitTestApp(app)
 	req := makeTestHTTPRequest(strings.NewReader(form.Encode()), method, path)
 	req.Header = http.Header{"Cookie": rec.HeaderMap["Set-Cookie"]}
 	req.PostForm = form

app/handler/auth_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dingoblog/dingo/app/model"
 	"github.com/dinever/golf"
+	"github.com/dingoblog/dingo/app/model"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -155,7 +155,8 @@ func TestUserLogInWithCorrectInformation(t *testing.T) {
 				Convey("Visit admin dashboard", func() {
 
 					w := httptest.NewRecorder()
-					app := Initialize()
+					app := golf.New()
+					app = Initialize(app)
 
 					req := makeTestHTTPRequest(nil, "GET", "/admin/")
 					req.Header = http.Header{"Cookie": rec.HeaderMap["Set-Cookie"]}

app/handler/setup_test.go

@@ -15,8 +15,8 @@ const name = "Shawn Ding"
 const email = "[email protected]"
 const password = "passwordfortest"
 
-func InitTestApp() *golf.Application {
-	app := Initialize()
+func InitTestApp(app *golf.Application) *golf.Application {
+	app = Initialize(app)
 
 	app.View.SetTemplateLoader("base", "view")
 	app.View.SetTemplateLoader("admin", filepath.Join("..", "..", "view", "admin"))
@@ -34,7 +34,8 @@ func makeTestHTTPRequest(body io.Reader, method, url string) *http.Request {
 
 func mockSignUpPostRequest(email, name, password, rePassword string) *golf.Context {
 	w := httptest.NewRecorder()
-	Initialize()
+	app := golf.New()
+	app = Initialize(app)
 
 	form := url.Values{}
 	form.Add("email", email)
@@ -49,7 +50,8 @@ func mockSignUpPostRequest(email, name, password, rePassword string) *golf.Conte
 
 func mockContext(form url.Values, method, path string) *golf.Context {
 	w := httptest.NewRecorder()
-	Initialize()
+	app := golf.New()
+	app = Initialize(app)
 
 	r := makeTestHTTPRequest(strings.NewReader(form.Encode()), method, path)
 	r.PostForm = form
@@ -58,7 +60,8 @@ func mockContext(form url.Values, method, path string) *golf.Context {
 
 func mockLogInPostContext() *golf.Context {
 	w := httptest.NewRecorder()
-	Initialize()
+	app := golf.New()
+	app = Initialize(app)
 
 	form := url.Values{}
 	form.Add("email", email)