internal/handlers/handlers.go

@@ -80,15 +80,13 @@ func (m *Repository) MakeReservation(w http.ResponseWriter, r *http.Request) {
 	// filled with the info when sent back.
 	res, ok := m.App.Session.Get(r.Context(), "reservation").(models.Reservation)
 	if !ok {
-		m.App.Session.Put(r.Context(), "error", "can't get reservation from session")
-		http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
+		helpers.ServerError(w, errors.New("cannot get reservation from session"))
 		return
 	}
 
 	room, err := m.DB.GetRoomById(res.RoomID)
 	if err != nil {
-		m.App.Session.Put(r.Context(), "error", "can't find room")
-		http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
+		helpers.ServerError(w, err)
 		return
 	}
 

internal/handlers/handlers_test.go

@@ -1,11 +1,9 @@
 package handlers
 
 import (
-	"context"
-	"go-udemy-web-1/internal/models"
-	"log"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"testing"
 )
 
@@ -18,29 +16,30 @@ var theTests = []struct {
 	name               string
 	url                string
 	method             string
+	params             []postData
 	expectedStatusCode int
 }{
-	{"home", "/", "GET", http.StatusOK},
-	{"about", "/about", "GET", http.StatusOK},
-	{"gq", "/generals-quarters", "GET", http.StatusOK},
-	{"ms", "/majors-suite", "GET", http.StatusOK},
-	{"sa", "/availability", "GET", http.StatusOK},
-	{"contact", "/contact", "GET", http.StatusOK},
-
-	// {"post-search-avail", "/availability", "POST", []postData{
-	// 	{key: "start", value: "2020-01-01"},
-	// 	{key: "end", value: "2020-01-02"},
-	// }, http.StatusOK},
-	// {"post-search-avail-json", "/availability-json", "POST", []postData{
-	// 	{key: "start", value: "2020-01-01"},
-	// 	{key: "end", value: "2020-01-02"},
-	// }, http.StatusOK},
-	// {"make-reservation", "/make-reservation", "POST", []postData{
-	// 	{key: "first_name", value: "John"},
-	// 	{key: "last_name", value: "Smith"},
-	// 	{key: "email", value: "me@here.com"},
-	// 	{key: "phone", value: "12345"},
-	// }, http.StatusOK},
+	{"home", "/", "GET", []postData{}, http.StatusOK},
+	{"about", "/about", "GET", []postData{}, http.StatusOK},
+	{"gq", "/generals-quarters", "GET", []postData{}, http.StatusOK},
+	{"ms", "/majors-suite", "GET", []postData{}, http.StatusOK},
+	{"sa", "/availability", "GET", []postData{}, http.StatusOK},
+	{"contact", "/contact", "GET", []postData{}, http.StatusOK},
+	{"ma", "/make-reservation", "GET", []postData{}, http.StatusOK},
+	{"post-search-avail", "/availability", "POST", []postData{
+		{key: "start", value: "2020-01-01"},
+		{key: "end", value: "2020-01-02"},
+	}, http.StatusOK},
+	{"post-search-avail-json", "/availability-json", "POST", []postData{
+		{key: "start", value: "2020-01-01"},
+		{key: "end", value: "2020-01-02"},
+	}, http.StatusOK},
+	{"make-reservation", "/make-reservation", "POST", []postData{
+		{key: "first_name", value: "John"},
+		{key: "last_name", value: "Smith"},
+		{key: "email", value: "me@here.com"},
+		{key: "phone", value: "12345"},
+	}, http.StatusOK},
 }
 
 func TestHandlers(t *testing.T) {
@@ -49,6 +48,7 @@ func TestHandlers(t *testing.T) {
 	defer ts.Close()
 
 	for _, e := range theTests {
+		if e.method == "GET" {
 			resp, err := ts.Client().Get(ts.URL + e.url)
 			if err != nil {
 				t.Log(err)
@@ -57,68 +57,19 @@ func TestHandlers(t *testing.T) {
 			if resp.StatusCode != e.expectedStatusCode {
 				t.Errorf("for %s, expected %d but got %d", e.name, e.expectedStatusCode, resp.StatusCode)
 			}
+		} else {
+			values := url.Values{}
+			for _, x := range e.params {
+				values.Add(x.key, x.value)
 			}
-}
-
-func TestRepository_Reservation(t *testing.T) {
-	reservation := models.Reservation{
-		RoomID: 1,
-		Room: models.Room{
-			ID:       1,
-			RoomName: "General's Quarters",
-		},
-	}
-
-	req, _ := http.NewRequest("GET", "/make-reservation", nil)
-	ctx := getCtx(req)
-
-	req = req.WithContext(ctx)
-
-	rr := httptest.NewRecorder()
-
-	session.Put(ctx, "reservation", reservation)
-
-	handler := http.HandlerFunc(Repo.MakeReservation)
-
-	handler.ServeHTTP(rr, req)
-
-	if rr.Code != http.StatusOK {
-		t.Errorf("Reservation handler returned response code: got %d, wanted %d",
-			rr.Code, http.StatusOK)
-	}
-
-	// test case where reservation is not in session (reset everything)
-	req, _ = http.NewRequest("GET", "/make-reservation", nil)
-	ctx = getCtx(req)
-	req = req.WithContext(ctx)
-	rr = httptest.NewRecorder()
-
-	handler.ServeHTTP(rr, req)
-	if rr.Code != http.StatusTemporaryRedirect {
-		t.Errorf("Reservation handler returned response code: got %d, wanted %d",
-			rr.Code, http.StatusTemporaryRedirect)
-	}
-
-	// test with non-existant room
-	req, _ = http.NewRequest("GET", "/make-reservation", nil)
-	ctx = getCtx(req)
-	req = req.WithContext(ctx)
-	rr = httptest.NewRecorder()
-	reservation.RoomID = 100
-	session.Put(ctx, "reservation", reservation)
-
-	handler.ServeHTTP(rr, req)
-	if rr.Code != http.StatusTemporaryRedirect {
-		t.Errorf("Reservation handler returned response code: got %d, wanted %d",
-			rr.Code, http.StatusTemporaryRedirect)
-	}
-}
-
-func getCtx(req *http.Request) context.Context {
-	ctx, err := session.Load(req.Context(), req.Header.Get("X-Session"))
+			resp, err := ts.Client().PostForm(ts.URL+e.url, values)
 			if err != nil {
-		log.Println(err)
+				t.Log(err)
+				t.Fatal(err)
+			}
+			if resp.StatusCode != e.expectedStatusCode {
+				t.Errorf("for %s, expected %d but got %d", e.name, e.expectedStatusCode, resp.StatusCode)
+			}
+		}
 	}
-
-	return ctx
 }

internal/handlers/setup_test.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"testing"
 	"time"
 
 	"github.com/alexedwards/scs/v2"
@@ -27,7 +26,7 @@ var (
 	session *scs.SessionManager
 )
 
-func TestMain(m *testing.M) {
+func getRoutes() http.Handler {
 	gob.Register(models.Reservation{})
 	// change this to true when in production
 	app.InProduction = false
@@ -58,10 +57,6 @@ func TestMain(m *testing.M) {
 
 	render.NewRenderer(&app)
 
-	os.Exit(m.Run())
-}
-
-func getRoutes() http.Handler {
 	mux := chi.NewMux()
 
 	mux.Use(middleware.Recoverer)

internal/repository/dbrepo/test-repo.go

@@ -1,7 +1,6 @@
 package dbrepo
 
 import (
-	"errors"
 	"go-udemy-web-1/internal/models"
 	"time"
 )
@@ -34,9 +33,5 @@ func (m *testDBRepo) SearchAvailabilityForAllRooms(start, end time.Time) ([]mode
 // GetRoomById gets a room by id
 func (m *testDBRepo) GetRoomById(id int) (models.Room, error) {
 	var room models.Room
-
-	if id > 2 {
-		return room, errors.New("Deliberate error")
-	}
 	return room, nil
 }