Test edit user fully

server/tests/test_app.py

@@ -31,7 +31,7 @@ def test_misc_api(client):
     ## Cities
     response, body = post(client, "/api/misc/cities", {"name": "Göteborg"}, headers=headers)
     assert body["count"] >= 2
-    assert body["items"][1]["name"] == "Göteborg"
+    assert body["items"][2]["name"] == "Göteborg"
 
     response, body = put(client, "/api/misc/cities/2", {"name": "Gbg"}, headers=headers)
     assert body["count"] >= 2
@@ -120,9 +120,11 @@ def test_auth_and_users_api(client):
     assert body["email"] == "test1@test.se"
 
     # Edit current user name
-    response, body = put(client, "/api/users", {"name": "carl carlsson"}, headers=headers)
+    response, body = put(client, "/api/users", {"name": "carl carlsson", "city_id": 2, "role_id": 1}, headers=headers)
     assert response.status_code == codes.OK
     assert body["name"] == "Carl Carlsson"
+    assert body["city"]["id"] == 2
+    assert body["role"]["id"] == 1
 
     # Find other user
     response, body = get(
@@ -149,7 +151,7 @@ def test_auth_and_users_api(client):
     response, body = put(client, f"/api/users/{user_id}", {"email": "carl@carlsson.test"}, headers=headers)
     assert response.status_code == codes.OK
     assert body["email"] == "carl@carlsson.test"
-    
+
     # Edit user from ID but add the same email as other user
     response, body = put(client, f"/api/users/{user_id}", {"email": "test1@test.se"}, headers=headers)
     assert response.status_code == codes.BAD_REQUEST
@@ -184,8 +186,8 @@ def test_auth_and_users_api(client):
     response, body = get(client, "/api/users", headers=headers)
     assert response.status_code == codes.OK
     assert body["email"] == "test1@test.se"
-    assert body["city"]["id"] == 1
-    assert body["role"]["id"] == 2
+    assert body["city"]["id"] == 2
+    assert body["role"]["id"] == 1
 
     # Delete current user
     user_id = body["id"]

server/tests/test_helpers.py

@@ -9,7 +9,7 @@ def add_default_values():
     media_types = ["Image", "Video"]
     question_types = ["Boolean", "Multiple", "Text"]
     roles = ["Admin", "Editor"]
-    cities = ["Linköping"]
+    cities = ["Linköping", "Testköping"]
 
     # Add media types
     for item in media_types: