Renaming - Uses only one modRequest variable in user test

This commit is contained in:
smavros 2019-08-25 20:02:35 +02:00
parent d6cc9ed224
commit 4d79f06aba

View file

@ -227,59 +227,59 @@ func TestModifyAddedUserAsAdmin(t *testing.T) {
newUser.Password = "" newUser.Password = ""
// modify newUser's name // modify newUser's name
modRequest1 := common.Request{Username: "NewUsername"} modRequest := common.Request{Username: "NewUsername"}
newUser.Username = modRequest1.Username newUser.Username = modRequest.Username
code, resp, err = common.NewTestEndpoint(router, token, code, resp, err = common.NewTestEndpoint(router, token,
fmt.Sprintf("/api/users/%v", newUserID), "PUT", fmt.Sprintf("/api/users/%v", newUserID), "PUT",
common.KeyModels{"user": modRequest1}) common.KeyModels{"user": modRequest})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
err = common.CompareResponse(resp, common.KeyModels{"user": newUser}) err = common.CompareResponse(resp, common.KeyModels{"user": newUser})
assert.NoError(t, err) assert.NoError(t, err)
// modify newUser's email // modify newUser's email
modRequest2 := common.Request{Mail: "new@e.mail"} modRequest = common.Request{Mail: "new@e.mail"}
newUser.Mail = modRequest2.Mail newUser.Mail = modRequest.Mail
code, resp, err = common.NewTestEndpoint(router, token, code, resp, err = common.NewTestEndpoint(router, token,
fmt.Sprintf("/api/users/%v", newUserID), "PUT", fmt.Sprintf("/api/users/%v", newUserID), "PUT",
common.KeyModels{"user": modRequest2}) common.KeyModels{"user": modRequest})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
err = common.CompareResponse(resp, common.KeyModels{"user": newUser}) err = common.CompareResponse(resp, common.KeyModels{"user": newUser})
assert.NoError(t, err) assert.NoError(t, err)
// modify newUser's role // modify newUser's role
modRequest3 := common.Request{Role: "Admin"} modRequest = common.Request{Role: "Admin"}
newUser.Role = modRequest3.Role newUser.Role = modRequest.Role
code, resp, err = common.NewTestEndpoint(router, token, code, resp, err = common.NewTestEndpoint(router, token,
fmt.Sprintf("/api/users/%v", newUserID), "PUT", fmt.Sprintf("/api/users/%v", newUserID), "PUT",
common.KeyModels{"user": modRequest3}) common.KeyModels{"user": modRequest})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
err = common.CompareResponse(resp, common.KeyModels{"user": newUser}) err = common.CompareResponse(resp, common.KeyModels{"user": newUser})
assert.NoError(t, err) assert.NoError(t, err)
// modify newUser's password with INVALID password // modify newUser's password with INVALID password
modRequest4 := common.Request{Password: "short"} modRequest = common.Request{Password: "short"}
code, resp, err = common.NewTestEndpoint(router, token, code, resp, err = common.NewTestEndpoint(router, token,
fmt.Sprintf("/api/users/%v", newUserID), "PUT", fmt.Sprintf("/api/users/%v", newUserID), "PUT",
common.KeyModels{"user": modRequest4}) common.KeyModels{"user": modRequest})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) // HTTP 400 assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) // HTTP 400
// modify newUser's password with VALID password // modify newUser's password with VALID password
modRequest5 := common.Request{Password: "4_g00d_pw!"} modRequest = common.Request{Password: "4_g00d_pw!"}
code, resp, err = common.NewTestEndpoint(router, token, code, resp, err = common.NewTestEndpoint(router, token,
fmt.Sprintf("/api/users/%v", newUserID), "PUT", fmt.Sprintf("/api/users/%v", newUserID), "PUT",
common.KeyModels{"user": modRequest5}) common.KeyModels{"user": modRequest})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
// try to login as newUser with the modified username and password // try to login as newUser with the modified username and password
_, err = common.NewAuthenticateForTest(router, _, err = common.NewAuthenticateForTest(router,
"/api/authenticate", "POST", common.Request{ "/api/authenticate", "POST", common.Request{
Username: modRequest1.Username, Username: newUser.Username,
Password: modRequest5.Password, Password: modRequest.Password,
}) })
assert.NoError(t, err) assert.NoError(t, err)
} }