Deprecates ResponseMsgUses. Introduces common/requests.go

This commit is contained in:
smavros 2019-08-13 17:41:04 +02:00
parent ae2737571f
commit b6a269bdeb
3 changed files with 15 additions and 13 deletions

3
common/requests.go Normal file
View file

@ -0,0 +1,3 @@
package common
type KeyModels map[string]interface{}

View file

@ -80,13 +80,13 @@ type ResponseMsg struct {
Message string `json:"message"`
}
type ResponseMsgUsers struct {
Users []User `json:"users"`
}
//type ResponseMsgUsers struct {
//Users []User `json:"users"`
//}
type ResponseMsgUser struct {
User `json:"user"`
}
//type ResponseMsgUser struct {
//User `json:"user"`
//}
type ResponseMsgScenarios struct {
Scenarios []ScenarioResponse `json:"scenarios"`

View file

@ -11,9 +11,6 @@ import (
func TestUserEndpoints(t *testing.T) {
myUsers := []common.User{common.User0}
msgUsers := common.ResponseMsgUsers{Users: myUsers}
db := common.DummyInitDB()
defer db.Close()
common.DummyOnlyAdminDB(db)
@ -30,12 +27,14 @@ func TestUserEndpoints(t *testing.T) {
assert.NoError(t, err)
// test GET user/
err = common.NewTestEndpoint(router, token, "/api/users", "GET",
nil, 200, msgUsers)
err = common.NewTestEndpoint(router, token,
"/api/users", "GET", nil,
200, common.KeyModels{"users": []common.User{common.User0}})
assert.NoError(t, err)
// test GET user/1 (the admin)
err = common.NewTestEndpoint(router, token, "/api/users/1", "GET",
nil, 200, common.ResponseMsgUser{common.User0})
err = common.NewTestEndpoint(router, token,
"/api/users/1", "GET", nil,
200, common.KeyModels{"user": common.User0})
assert.NoError(t, err)
}