Skip to content

Commit 7ee8592

Browse files
RelrinRelrin
authored
Merge pull request #4 from OpenMatchmaking/feature-update-dependecies
 Updated sage-utils version
2 parents 0557a3a + dcb6643 commit 7ee8592

File tree

7 files changed

+179
-160
lines changed

7 files changed

+179
-160
lines changed

‎auth/tests/test_generate_token.py‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ async def test_generate_token_returns_error_for_an_invalid_username(sanic_server
4444
assert Response.EVENT_FIELD_NAME not in response_json.keys()
4545
error = response_json[Response.ERROR_FIELD_NAME]
4646

47-
assert 'type' in error.keys()
48-
assert error['type'] == NOT_FOUND_ERROR
47+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
48+
assert error[Response.ERROR_TYPE_FIELD_NAME] == NOT_FOUND_ERROR
4949

50-
assert 'message' in error.keys()
51-
assert error['message'] == "User wasn't found or specified an invalid password."
50+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
51+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == "User wasn't found or " \
52+
"specified an invalid password."
5253

5354
await User.collection.delete_many({})
5455

@@ -70,11 +71,12 @@ async def test_generate_token_returns_error_for_an_invalid_password(sanic_server
7071
assert Response.EVENT_FIELD_NAME not in response_json.keys()
7172
error = response_json[Response.ERROR_FIELD_NAME]
7273

73-
assert 'type' in error.keys()
74-
assert error['type'] == NOT_FOUND_ERROR
74+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
75+
assert error[Response.ERROR_TYPE_FIELD_NAME] == NOT_FOUND_ERROR
7576

76-
assert 'message' in error.keys()
77-
assert error['message'] == "User wasn't found or specified an invalid password."
77+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
78+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == "User wasn't found or " \
79+
"specified an invalid password."
7880

7981
await User.collection.delete_many({})
8082

@@ -90,19 +92,21 @@ async def test_generate_token_returns_validation_error_for_empty_body(sanic_serv
9092
error = response_json[Response.ERROR_FIELD_NAME]
9193
assert len(error.keys()) == 2
9294

93-
assert 'type' in error.keys()
94-
assert error["type"] == VALIDATION_ERROR
95+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
96+
assert error[Response.ERROR_TYPE_FIELD_NAME] == VALIDATION_ERROR
9597

96-
assert 'message' in error.keys()
97-
assert len(error['message'].keys()) == 2
98+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
99+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME].keys()) == 2
98100

99-
assert 'username' in error['message'].keys()
100-
assert len(error['message']['username']) == 1
101-
assert error['message']['username'][0] == 'Missing data for required field.'
101+
assert 'username' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
102+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['username']) == 1
103+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['username'][0] == 'Missing data for ' \
104+
'required field.'
102105

103-
assert 'password' in error['message'].keys()
104-
assert len(error['message']['password']) == 1
105-
assert error['message']['password'][0] == 'Missing data for required field.'
106+
assert 'password' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
107+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['password']) == 1
108+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['password'][0] == 'Missing data for ' \
109+
'required field.'
106110

107111

108112
async def test_generate_token_get_not_allowed(sanic_server):

‎auth/tests/test_refresh_token.py‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ async def test_refresh_token_returns_error_for_a_missing_authorization_header(sa
5151
assert Response.EVENT_FIELD_NAME not in response_json.keys()
5252
error = response_json[Response.ERROR_FIELD_NAME]
5353

54-
assert 'type' in error.keys()
55-
assert error['type'] == AUTHORIZATION_ERROR
54+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
55+
assert error[Response.ERROR_TYPE_FIELD_NAME] == AUTHORIZATION_ERROR
5656

57-
assert 'message' in error.keys()
58-
assert error['message'] == "Authorization header isn't set in request."
57+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
58+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == "Authorization header isn't set in request."
5959

6060

6161
async def test_refresh_token_return_error_for_a_missing_header_prefix(sanic_server):
@@ -89,11 +89,12 @@ async def test_refresh_token_return_error_for_a_missing_header_prefix(sanic_serv
8989
assert Response.EVENT_FIELD_NAME not in response_json.keys()
9090
error = response_json[Response.ERROR_FIELD_NAME]
9191

92-
assert 'type' in error.keys()
93-
assert error['type'] == HEADER_ERROR
92+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
93+
assert error[Response.ERROR_TYPE_FIELD_NAME] == HEADER_ERROR
9494

95-
assert 'message' in error.keys()
96-
assert error['message'] == 'Before the token necessary to specify the `JWT` prefix.'
95+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
96+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == 'Before the token necessary ' \
97+
'to specify the `JWT` prefix.'
9798

9899
await User.collection.delete_one({'id': user.id})
99100

@@ -130,11 +131,12 @@ async def test_refresh_token_return_error_for_an_invalid_header_prefix(sanic_ser
130131
assert Response.EVENT_FIELD_NAME not in response_json.keys()
131132
error = response_json[Response.ERROR_FIELD_NAME]
132133

133-
assert 'type' in error.keys()
134-
assert error['type'] == HEADER_ERROR
134+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
135+
assert error[Response.ERROR_TYPE_FIELD_NAME] == HEADER_ERROR
135136

136-
assert 'message' in error.keys()
137-
assert error['message'] == 'Before the token necessary to specify the `JWT` prefix.'
137+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
138+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == 'Before the token necessary ' \
139+
'to specify the `JWT` prefix.'
138140

139141
await User.collection.delete_one({'id': user.id})
140142

@@ -174,11 +176,11 @@ async def test_refresh_token_return_error_for_an_invalid_access_token(sanic_serv
174176
assert Response.EVENT_FIELD_NAME not in response_json.keys()
175177
error = response_json[Response.ERROR_FIELD_NAME]
176178

177-
assert 'type' in error.keys()
178-
assert error['type'] == TOKEN_ERROR
179+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
180+
assert error[Response.ERROR_TYPE_FIELD_NAME] == TOKEN_ERROR
179181

180-
assert 'message' in error.keys()
181-
assert error['message'] == 'Signature verification failed.'
182+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
183+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == 'Signature verification failed.'
182184

183185
await User.collection.delete_one({'id': user.id})
184186

@@ -215,15 +217,16 @@ async def test_refresh_token_return_error_for_a_missing_refresh_token(sanic_serv
215217
assert Response.EVENT_FIELD_NAME not in response_json.keys()
216218
error = response_json[Response.ERROR_FIELD_NAME]
217219

218-
assert 'type' in error.keys()
219-
assert error['type'] == TOKEN_ERROR
220+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
221+
assert error[Response.ERROR_TYPE_FIELD_NAME] == TOKEN_ERROR
220222

221-
assert 'message' in error.keys()
222-
assert len(error['message']) == 1
223+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
224+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]) == 1
223225

224-
assert 'refresh_token' in error['message'].keys()
225-
assert len(error['message']['refresh_token']) == 1
226-
assert error['message']['refresh_token'][0] == 'Missing data for required field.'
226+
assert 'refresh_token' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
227+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['refresh_token']) == 1
228+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['refresh_token'][0] == 'Missing data for ' \
229+
'required field.'
227230

228231
await User.collection.delete_one({'id': user.id})
229232

@@ -262,11 +265,12 @@ async def test_refresh_token_return_error_for_an_refresh_token(sanic_server):
262265
assert Response.EVENT_FIELD_NAME not in response_json.keys()
263266
error = response_json[Response.ERROR_FIELD_NAME]
264267

265-
assert 'type' in error.keys()
266-
assert error['type'] == TOKEN_ERROR
268+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
269+
assert error[Response.ERROR_TYPE_FIELD_NAME] == TOKEN_ERROR
267270

268-
assert 'message' in error.keys()
269-
assert error['message'] == "User wasn't found or specified an invalid `refresh_token`."
271+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
272+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == "User wasn't found or specified " \
273+
"an invalid `refresh_token`."
270274

271275
await User.collection.delete_one({'id': user.id})
272276

‎auth/tests/test_register_microservice.py‎

Lines changed: 56 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,21 @@ async def test_register_microservice_returns_validation_error_for_missing_fields
3131
assert Response.ERROR_FIELD_NAME in response.keys()
3232
error = response[Response.ERROR_FIELD_NAME]
3333

34-
assert 'type' in error.keys()
35-
assert error["type"] == VALIDATION_ERROR
34+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
35+
assert error[Response.ERROR_TYPE_FIELD_NAME] == VALIDATION_ERROR
3636

37-
assert 'message' in error.keys()
38-
assert len(error['message'].keys()) == 2
37+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
38+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME].keys()) == 2
3939

40-
assert 'name' in error['message'].keys()
41-
assert len(error['message']['name']) == 1
42-
assert error['message']['name'][0] == 'Missing data for required field.'
40+
assert 'name' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
41+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['name']) == 1
42+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['name'][0] == 'Missing data for ' \
43+
'required field.'
4344

44-
assert 'version' in error['message'].keys()
45-
assert len(error['message']['version']) == 1
46-
assert error['message']['version'][0] == 'Missing data for required field.'
45+
assert 'version' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
46+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['version']) == 1
47+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['version'][0] == 'Missing data for ' \
48+
'required field.'
4749

4850

4951
async def test_register_microservice_returns_validation_error_for_invalid_data(sanic_server):
@@ -60,19 +62,21 @@ async def test_register_microservice_returns_validation_error_for_invalid_data(s
6062
assert Response.ERROR_FIELD_NAME in response.keys()
6163
error = response[Response.ERROR_FIELD_NAME]
6264

63-
assert 'type' in error.keys()
64-
assert error['type'] == VALIDATION_ERROR
65+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
66+
assert error[Response.ERROR_TYPE_FIELD_NAME] == VALIDATION_ERROR
6567

66-
assert 'message' in error.keys()
67-
assert len(error['message'].keys()) == 2
68+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
69+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME].keys()) == 2
6870

69-
assert 'name' in error['message'].keys()
70-
assert len(error['message']['name']) == 1
71-
assert error['message']['name'][0] == 'Missing data for required field.'
71+
assert 'name' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
72+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['name']) == 1
73+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['name'][0] == 'Missing data for ' \
74+
'required field.'
7275

73-
assert 'version' in error['message'].keys()
74-
assert len(error['message']['version']) == 1
75-
assert error['message']['version'][0] == 'Missing data for required field.'
76+
assert 'version' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
77+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['version']) == 1
78+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['version'][0] == 'Missing data for ' \
79+
'required field.'
7680

7781

7882
async def test_register_microservice_returns_validation_error_for_invalid_version(sanic_server):
@@ -94,16 +98,17 @@ async def test_register_microservice_returns_validation_error_for_invalid_versio
9498
assert Response.ERROR_FIELD_NAME in response.keys()
9599
error = response[Response.ERROR_FIELD_NAME]
96100

97-
assert 'type' in error.keys()
98-
assert error['type'] == VALIDATION_ERROR
101+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
102+
assert error[Response.ERROR_TYPE_FIELD_NAME] == VALIDATION_ERROR
99103

100-
assert 'message' in error.keys()
101-
assert len(error['message'].keys()) == 1
104+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
105+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME].keys()) == 1
102106

103-
assert 'version' in error['message'].keys()
104-
assert len(error['message']['version']) == 1
105-
assert error['message']['version'][0] == "Field value must match the " \
106-
"`major.minor.patch` version semantics."
107+
assert 'version' in error[Response.ERROR_DETAILS_FIELD_NAME].keys()
108+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME]['version']) == 1
109+
assert error[Response.ERROR_DETAILS_FIELD_NAME]['version'][0] == "Field value must match " \
110+
"the `major.minor.patch` " \
111+
"version semantics."
107112

108113

109114
async def test_register_microservice_creates_new_microservice_with_permissions(sanic_server):
@@ -161,18 +166,19 @@ async def test_register_microservice_returns_validation_error_for_invalid_permis
161166
assert Response.ERROR_FIELD_NAME in response.keys()
162167
error = response[Response.ERROR_FIELD_NAME]
163168

164-
assert "type" in error.keys()
165-
assert error["type"] == VALIDATION_ERROR
169+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
170+
assert error[Response.ERROR_TYPE_FIELD_NAME] == VALIDATION_ERROR
166171

167-
assert 'message' in error.keys()
168-
assert len(error['message'].keys()) == 1
172+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
173+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME].keys()) == 1
169174

170-
assert 'permissions' in error["message"].keys()
171-
assert len(error["message"]['permissions']) == 1
172-
assert len(error["message"]['permissions']['0']) == 1
173-
assert 'codename' in error["message"]['permissions']['0'].keys()
174-
assert len(error["message"]['permissions']['0']['codename']) == 1
175-
assert error["message"]['permissions']['0']['codename'][0] == 'Not a valid string.'
175+
details = error[Response.ERROR_DETAILS_FIELD_NAME]
176+
assert 'permissions' in details.keys()
177+
assert len(details['permissions']) == 1
178+
assert len(details['permissions']['0']) == 1
179+
assert 'codename' in details['permissions']['0'].keys()
180+
assert len(details['permissions']['0']['codename']) == 1
181+
assert details['permissions']['0']['codename'][0] == 'Not a valid string.'
176182

177183

178184
async def test_register_microservice_returns_validation_error_for_invalid_codename_format(sanic_server): # NOQA
@@ -196,20 +202,20 @@ async def test_register_microservice_returns_validation_error_for_invalid_codena
196202
assert Response.ERROR_FIELD_NAME in response.keys()
197203
error = response[Response.ERROR_FIELD_NAME]
198204

199-
assert "type" in error.keys()
200-
assert error["type"] == VALIDATION_ERROR
205+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
206+
assert error[Response.ERROR_TYPE_FIELD_NAME] == VALIDATION_ERROR
201207

202-
assert 'message' in error.keys()
203-
assert len(error['message'].keys()) == 1
208+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
209+
assert len(error[Response.ERROR_DETAILS_FIELD_NAME].keys()) == 1
204210

205-
assert 'permissions' in error["message"].keys()
206-
assert len(error["message"]['permissions']) == 1
207-
assert len(error["message"]['permissions']['0']) == 1
208-
assert 'codename' in error["message"]['permissions']['0'].keys()
209-
assert len(error["message"]['permissions']['0']['codename']) == 1
210-
assert error["message"]['permissions']['0']['codename'][0] == "Field value can contain " \
211-
"only 'a'-'z', '.', '-' " \
212-
"characters."
211+
details = error[Response.ERROR_DETAILS_FIELD_NAME]
212+
assert 'permissions' in details.keys()
213+
assert len(details['permissions']) == 1
214+
assert len(details['permissions']['0']) == 1
215+
assert 'codename' in details['permissions']['0'].keys()
216+
assert len(details['permissions']['0']['codename']) == 1
217+
assert details['permissions']['0']['codename'][0] == "Field value can contain " \
218+
"only 'a'-'z', '.', '-' characters."
213219

214220

215221
async def test_register_microservice_creates_new_microservice_without_permissions(sanic_server):

‎auth/tests/test_user_profile.py‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,12 @@ async def test_user_profile_returns_bad_request_for_missing_authorization_header
220220
assert Response.EVENT_FIELD_NAME not in response_json.keys()
221221
error = response_json[Response.ERROR_FIELD_NAME]
222222

223-
assert 'type' in error.keys()
224-
assert error['type'] == AUTHORIZATION_ERROR
223+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
224+
assert error[Response.ERROR_TYPE_FIELD_NAME] == AUTHORIZATION_ERROR
225225

226-
assert 'message' in error.keys()
227-
assert error['message'] == "Authorization header isn't set in request."
226+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
227+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == "Authorization header isn't set " \
228+
"in request."
228229

229230

230231
async def test_user_profile_returns_bad_request_for_invalid_header_prefix(sanic_server):
@@ -256,11 +257,12 @@ async def test_user_profile_returns_bad_request_for_invalid_header_prefix(sanic_
256257
assert Response.EVENT_FIELD_NAME not in response_json.keys()
257258
error = response_json[Response.ERROR_FIELD_NAME]
258259

259-
assert 'type' in error.keys()
260-
assert error['type'] == HEADER_ERROR
260+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
261+
assert error[Response.ERROR_TYPE_FIELD_NAME] == HEADER_ERROR
261262

262-
assert 'message' in error.keys()
263-
assert error['message'] == 'Before the token necessary to specify the `JWT` prefix.'
263+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
264+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == 'Before the token necessary to ' \
265+
'specify the `JWT` prefix.'
264266

265267
await User.collection.delete_many({})
266268

@@ -297,11 +299,11 @@ async def test_user_profile_returns_validation_error_for_invalid_token(sanic_ser
297299
assert Response.EVENT_FIELD_NAME not in response_json.keys()
298300
error = response_json[Response.ERROR_FIELD_NAME]
299301

300-
assert 'type' in error.keys()
301-
assert error['type'] == TOKEN_ERROR
302+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
303+
assert error[Response.ERROR_TYPE_FIELD_NAME] == TOKEN_ERROR
302304

303-
assert 'message' in error.keys()
304-
assert error['message'] == 'Signature verification failed.'
305+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
306+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == 'Signature verification failed.'
305307

306308
await User.collection.delete_many({})
307309

@@ -338,11 +340,11 @@ async def test_user_profile_returns_user_wasnot_found_error(sanic_server):
338340
assert Response.EVENT_FIELD_NAME not in response_json.keys()
339341
error = response_json[Response.ERROR_FIELD_NAME]
340342

341-
assert 'type' in error.keys()
342-
assert error['type'] == NOT_FOUND_ERROR
343+
assert Response.ERROR_TYPE_FIELD_NAME in error.keys()
344+
assert error[Response.ERROR_TYPE_FIELD_NAME] == NOT_FOUND_ERROR
343345

344-
assert 'message' in error.keys()
345-
assert error['message'] == 'User was not found.'
346+
assert Response.ERROR_DETAILS_FIELD_NAME in error.keys()
347+
assert error[Response.ERROR_DETAILS_FIELD_NAME] == 'User was not found.'
346348

347349
await User.collection.delete_many({})
348350

0 commit comments

Comments
 (0)