Small updates

Author: Filip

group_memberships/group_memberships.go

@@ -2,11 +2,12 @@ package group_memberships
 
 import (
 	"encoding/json"
+	"net/http"
+	"strconv"
+
 	"github.com/AirHelp/zendesk-mock/mocks"
 	"github.com/AirHelp/zendesk-mock/respond"
 	"github.com/go-martini/martini"
-	"net/http"
-	"strconv"
 )
 
 func Index(res http.ResponseWriter, req *http.Request, params martini.Params) {
@@ -45,6 +46,6 @@ func respondWithJobStatus(res http.ResponseWriter, code int) {
 	if bytes, err := json.Marshal(mocks.JobStatus()); err != nil {
 		respond.Json(res, 500, nil, err)
 	} else {
-		respond.Json(res, 200, bytes, nil)
+		respond.Json(res, code, bytes, nil)
 	}
 }

group_memberships/group_memberships_test.go

@@ -1,36 +1,40 @@
 package group_memberships_test
 
 import (
+	"testing"
+
 	"github.com/AirHelp/zendesk-mock/group_memberships"
 	"github.com/AirHelp/zendesk-mock/test"
-	"testing"
 )
 
 func TestIndex(t *testing.T) {
-	var response = test.RecordGet(
+	var response = test.RecordMethod(
 		"/api/v2/users/:user_id/group_memberships",
 		"/api/v2/users/1/group_memberships",
 		"",
+		test.Get,
 		group_memberships.Index)
 
 	test.IsExpectedToRespondWithCode(t, response, 200)
 }
 
 func TestDestroyMany(t *testing.T) {
-	var response = test.RecordDelete(
+	var response = test.RecordMethod(
 		"/api/v2/group_memberships/destroy_many",
 		"/api/v2/group_memberships/destroy_many?ids=1,2,3",
 		"",
+		test.Delete,
 		group_memberships.DestroyMany)
 
 	test.IsExpectedToRespondWithCode(t, response, 200)
 }
 
 func TestCreateMany(t *testing.T) {
-	var response = test.RecordPost(
+	var response = test.RecordMethod(
 		"/api/v2/group_memberships/create_many",
 		"/api/v2/group_memberships/create_many?ids=1,2,3",
 		"",
+		test.Post,
 		group_memberships.CreateMany)
 
 	test.IsExpectedToRespondWithCode(t, response, 200)

groups/groups_test.go

@@ -2,29 +2,30 @@ package groups_test
 
 import (
 	"encoding/json"
+	"net/http/httptest"
+	"testing"
+
 	"github.com/AirHelp/zendesk-mock/api"
 	"github.com/AirHelp/zendesk-mock/groups"
 	"github.com/AirHelp/zendesk-mock/test"
-	"net/http/httptest"
-	"testing"
 )
 
 func TestGroupsShow(t *testing.T) {
-	var response = test.RecordGet("/api/v2/groups/:id", "/api/v2/groups/123", "", groups.Show)
+	var response = test.RecordMethod("/api/v2/groups/:id", "/api/v2/groups/123", "", test.Get, groups.Show)
 
 	test.IsExpectedToRespondWithCode(t, response, 200)
 	test.IsExpectedToNotBeBlank(t, receivedGroup(response).Name)
 }
 
 func TestGroupsCreate(t *testing.T) {
-	var response = test.RecordPost("/api/v2/groups", "/api/v2/groups", body(), groups.Create)
+	var response = test.RecordMethod("/api/v2/groups", "/api/v2/groups", body(), test.Post, groups.Create)
 
 	test.IsExpectedToRespondWithCode(t, response, 201)
 	test.IsExpectedToNotBeBlank(t, receivedGroup(response).Name)
 }
 
 func TestGroupsUpdate(t *testing.T) {
-	var response = test.RecordPut("/api/v2/groups/:id", "/api/v2/groups/1", body(), groups.Update)
+	var response = test.RecordMethod("/api/v2/groups/:id", "/api/v2/groups/1", body(), test.Put, groups.Update)
 
 	test.IsExpectedToRespondWithCode(t, response, 200)
 	test.IsExpectedToNotBeBlank(t, receivedGroup(response).Name)

mocks/mocks.go

@@ -1,8 +1,9 @@
 package mocks
 
 import (
-	"github.com/AirHelp/zendesk-mock/api"
 	"time"
+
+	"github.com/AirHelp/zendesk-mock/api"
 )
 
 func Id() int {
@@ -16,14 +17,14 @@ func JobStatus() api.JobStatusEnvelope {
 		Total:    1,
 		Progress: 0,
 		Status:   "queued"}
-	return api.JobStatusEnvelope{resource}
+	return api.JobStatusEnvelope{JobStatus: resource}
 }
 
 func GroupMemberships(userId int) api.GroupMembershipsEnvelope {
 	collection := []api.GroupMembership{
 		GroupMembership(userId, 0),
 		GroupMembership(userId, 1)}
-	return api.GroupMembershipsEnvelope{collection}
+	return api.GroupMembershipsEnvelope{GroupMemberships: collection}
 }
 
 func GroupMembership(userId int, idOffset int) api.GroupMembership {
@@ -35,5 +36,5 @@ func GroupMembership(userId int, idOffset int) api.GroupMembership {
 }
 
 func Group(id int, name string) api.GroupEnvelope {
-	return api.GroupEnvelope{api.Group{Id: id, Name: name}}
+	return api.GroupEnvelope{Group: api.Group{Id: id, Name: name}}
 }

test/test.go

@@ -1,40 +1,33 @@
 package test
 
 import (
-	"github.com/go-martini/martini"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
-)
 
-type action func(res http.ResponseWriter, req *http.Request, params martini.Params)
-
-func RecordGet(route string, url string, body string, handler action) *httptest.ResponseRecorder {
-	m := martini.Classic()
-	m.Get(route, handler)
-	req, _ := http.NewRequest("GET", url, strings.NewReader(body))
-	return responseRecorder(m, req)
-}
+	"github.com/go-martini/martini"
+)
 
-func RecordPost(route string, url string, body string, handler action) *httptest.ResponseRecorder {
-	m := martini.Classic()
-	m.Post(route, handler)
-	req, _ := http.NewRequest("POST", url, strings.NewReader(body))
-	return responseRecorder(m, req)
-}
+const (
+	Get    = "GET"
+	Post   = "POST"
+	Put    = "PUT"
+	Delete = "DELETE"
+)
 
-func RecordPut(route string, url string, body string, handler action) *httptest.ResponseRecorder {
-	m := martini.Classic()
-	m.Put(route, handler)
-	req, _ := http.NewRequest("PUT", url, strings.NewReader(body))
-	return responseRecorder(m, req)
-}
+type action func(res http.ResponseWriter, req *http.Request, params martini.Params)
 
-func RecordDelete(route string, url string, body string, handler action) *httptest.ResponseRecorder {
+func RecordMethod(route, url, body, method string, handler action) *httptest.ResponseRecorder {
 	m := martini.Classic()
-	m.Delete(route, handler)
-	req, _ := http.NewRequest("DELETE", url, strings.NewReader(body))
+	methods := map[string]func(string, ...martini.Handler) martini.Route{
+		Get:    m.Get,
+		Post:   m.Post,
+		Put:    m.Put,
+		Delete: m.Delete,
+	}
+	methods[method](route, handler)
+	req, _ := http.NewRequest(method, url, strings.NewReader(body))
 	return responseRecorder(m, req)
 }