Skip to content

Commit 3375ada

Browse files
committed
chore: dependency upgrade
1 parent f5d6139 commit 3375ada

File tree

9 files changed

+825
-645
lines changed

9 files changed

+825
-645
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ requires-python = ">= 3.10"
2828
dependencies = [
2929
"click>=8.1.7",
3030
"scim2-client>=0.4.3",
31-
"scim2-tester[httpx]>=0.1.10",
31+
"scim2-tester[httpx]>=0.2.0",
3232
"sphinx-click-rst-to-ansi-formatter>=0.1.0",
3333
"pydanclick>=0.4.0",
3434
"pygments>=2.18.0",
@@ -146,7 +146,7 @@ commands = [
146146
]
147147

148148
[tool.tox.env.minversions]
149-
runner = "uv-venv-lock-runner"
149+
runner = "uv-venv-runner"
150150
uv_resolution = "lowest-direct"
151151

152152
[tool.tox.env.doc]

tests/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_stdin_bad_json(runner, httpserver):
4646
catch_exceptions=False,
4747
)
4848
assert result.exit_code == 1
49-
assert "Invalid JSON input." in result.stdout
49+
assert "Invalid JSON input." in result.output
5050

5151

5252
def test_auth_headers(runner, httpserver, simple_user_payload):

tests/test_create.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def test_no_command(runner, httpserver):
1010
["--url", httpserver.url_for("/"), "create"],
1111
catch_exceptions=False,
1212
)
13-
assert result.exit_code == 1, result.stdout
14-
assert "create user --help" in result.stdout
13+
assert result.exit_code == 1, result.output
14+
assert "create user --help" in result.output
1515

1616

1717
def test_invalid_command(runner, httpserver):
@@ -21,8 +21,8 @@ def test_invalid_command(runner, httpserver):
2121
["--url", httpserver.url_for("/"), "create", "invalid"],
2222
catch_exceptions=False,
2323
)
24-
assert result.exit_code == 1, result.stdout
25-
assert "Error: Invalid model" in result.stdout
24+
assert result.exit_code == 1, result.output
25+
assert "Error: Invalid model" in result.output
2626

2727

2828
def test_no_command_stdin(runner, httpserver, simple_user_payload):
@@ -47,7 +47,7 @@ def test_no_command_stdin(runner, httpserver, simple_user_payload):
4747
input=json.dumps(payload),
4848
catch_exceptions=False,
4949
)
50-
assert result.exit_code == 0, result.stdout
50+
assert result.exit_code == 0, result.output
5151
json_output = json.loads(result.output)
5252

5353
assert json_output == response_payload
@@ -60,8 +60,8 @@ def test_no_command_no_stdin(runner, httpserver, simple_user_payload):
6060
["--url", httpserver.url_for("/"), "create"],
6161
catch_exceptions=False,
6262
)
63-
assert result.exit_code == 1, result.stdout
64-
assert "Usage: cli create" in result.stdout
63+
assert result.exit_code == 1, result.output
64+
assert "Usage: cli create" in result.output
6565

6666

6767
def test_no_command_scimclient_error(runner, httpserver, simple_user_payload):
@@ -92,8 +92,8 @@ def test_no_command_scimclient_error(runner, httpserver, simple_user_payload):
9292
input=json.dumps(payload),
9393
catch_exceptions=False,
9494
)
95-
assert result.exit_code == 1, result.stdout
96-
assert "Unexpected response status code: 999" in result.stdout
95+
assert result.exit_code == 1, result.output
96+
assert "Unexpected response status code: 999" in result.output
9797

9898

9999
def test_no_command_validation_error(runner, httpserver, simple_user_payload):
@@ -124,8 +124,8 @@ def test_no_command_validation_error(runner, httpserver, simple_user_payload):
124124
catch_exceptions=False,
125125
input=json.dumps(payload),
126126
)
127-
assert result.exit_code == 1, result.stdout
128-
assert "Expected type User but got undefined object with no schema" in result.stdout
127+
assert result.exit_code == 1, result.output
128+
assert "Expected type User but got undefined object with no schema" in result.output
129129

130130

131131
def test_command_stdin(runner, httpserver, simple_user_payload):
@@ -150,7 +150,7 @@ def test_command_stdin(runner, httpserver, simple_user_payload):
150150
input=json.dumps(payload),
151151
catch_exceptions=False,
152152
)
153-
assert result.exit_code == 0, result.stdout
153+
assert result.exit_code == 0, result.output
154154
json_output = json.loads(result.output)
155155

156156
assert json_output == response_payload
@@ -177,7 +177,7 @@ def test_command_parameters(runner, httpserver, simple_user_payload):
177177
],
178178
catch_exceptions=False,
179179
)
180-
assert result.exit_code == 0, result.stdout
180+
assert result.exit_code == 0, result.output
181181
json_output = json.loads(result.output)
182182

183183
assert json_output == response_payload
@@ -190,8 +190,8 @@ def test_command_no_stdin_no_parameters(runner, httpserver, simple_user_payload)
190190
["--url", httpserver.url_for("/"), "create", "user"],
191191
catch_exceptions=False,
192192
)
193-
assert result.exit_code == 1, result.stdout
194-
assert "Usage: cli create" in result.stdout
193+
assert result.exit_code == 1, result.output
194+
assert "Usage: cli create" in result.output
195195

196196

197197
def test_command_validation_error(runner, httpserver, simple_user_payload):
@@ -217,5 +217,5 @@ def test_command_validation_error(runner, httpserver, simple_user_payload):
217217
],
218218
catch_exceptions=False,
219219
)
220-
assert result.exit_code == 1, result.stdout
221-
assert "Expected type User but got undefined object with no schema" in result.stdout
220+
assert result.exit_code == 1, result.output
221+
assert "Expected type User but got undefined object with no schema" in result.output

tests/test_delete.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_nominal_case(runner, httpserver):
2525
],
2626
catch_exceptions=False,
2727
)
28-
assert result.exit_code == 0, result.stdout
28+
assert result.exit_code == 0, result.output
2929

3030

3131
def test_scimclient_error(runner, httpserver):
@@ -50,8 +50,8 @@ def test_scimclient_error(runner, httpserver):
5050
],
5151
catch_exceptions=False,
5252
)
53-
assert result.exit_code == 1, result.stdout
54-
assert "Unexpected response status code: 999" in result.stdout
53+
assert result.exit_code == 1, result.output
54+
assert "Unexpected response status code: 999" in result.output
5555

5656

5757
def test_bad_resource_type(runner, httpserver):
@@ -67,8 +67,8 @@ def test_bad_resource_type(runner, httpserver):
6767
],
6868
catch_exceptions=False,
6969
)
70-
assert result.exit_code == 1, result.stdout
71-
assert "Unknown resource type 'invalid'." in result.stdout
70+
assert result.exit_code == 1, result.output
71+
assert "Unknown resource type 'invalid'." in result.output
7272

7373

7474
def test_not_found(runner, httpserver):
@@ -97,7 +97,7 @@ def test_not_found(runner, httpserver):
9797
],
9898
catch_exceptions=False,
9999
)
100-
assert result.exit_code == 0, result.stdout
100+
assert result.exit_code == 0, result.output
101101
json_output = json.loads(result.output)
102102
assert json_output == {
103103
"schemas": ["urn:ietf:params:scim:api:messages:2.0:Error"],

tests/test_query.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_all(runner, httpserver, simple_user_payload):
9797
],
9898
catch_exceptions=False,
9999
)
100-
assert result.exit_code == 0, result.stdout
100+
assert result.exit_code == 0, result.output
101101

102102
json_output = json.loads(result.output)
103103
assert json_output == {
@@ -139,7 +139,7 @@ def test_get_by_id(runner, httpserver, simple_user_payload):
139139
],
140140
catch_exceptions=False,
141141
)
142-
assert result.exit_code == 0, result.stdout
142+
assert result.exit_code == 0, result.output
143143

144144
json_output = json.loads(result.output)
145145
assert json_output == simple_user_payload("one-by-id")
@@ -157,7 +157,7 @@ def test_get_resources_without_id(runner, httpserver, simple_user_payload):
157157
],
158158
catch_exceptions=False,
159159
)
160-
assert result.exit_code == 0, result.stdout
160+
assert result.exit_code == 0, result.output
161161

162162
json_output = json.loads(result.output)
163163
assert json_output == {
@@ -178,7 +178,7 @@ def test_stdin(runner, httpserver, simple_user_payload):
178178
input=json.dumps(payload),
179179
catch_exceptions=False,
180180
)
181-
assert result.exit_code == 0, result.stdout
181+
assert result.exit_code == 0, result.output
182182

183183
json_output = json.loads(result.output)
184184
assert json_output == simple_user_payload("user-name-qs")
@@ -211,7 +211,7 @@ def test_search_request_payload(runner, httpserver, simple_user_payload):
211211
],
212212
catch_exceptions=False,
213213
)
214-
assert result.exit_code == 0, result.stdout
214+
assert result.exit_code == 0, result.output
215215

216216
json_output = json.loads(result.output)
217217
assert json_output == simple_user_payload("full-qs")
@@ -233,8 +233,8 @@ def test_unknown_resource_type(
233233
],
234234
catch_exceptions=False,
235235
)
236-
assert result.exit_code == 1, result.stdout
237-
assert "Unknown resource type 'invalid. Available values are:" in result.stdout
236+
assert result.exit_code == 1, result.output
237+
assert "Unknown resource type 'invalid. Available values are:" in result.output
238238

239239

240240
def test_scimclient_error(runner, httpserver, simple_user_payload):
@@ -250,8 +250,8 @@ def test_scimclient_error(runner, httpserver, simple_user_payload):
250250
],
251251
catch_exceptions=False,
252252
)
253-
assert result.exit_code == 1, result.stdout
254-
assert "Unexpected response status code: 999" in result.stdout
253+
assert result.exit_code == 1, result.output
254+
assert "Unexpected response status code: 999" in result.output
255255

256256

257257
def test_validation_error(runner, httpserver, simple_user_payload):
@@ -267,5 +267,5 @@ def test_validation_error(runner, httpserver, simple_user_payload):
267267
],
268268
catch_exceptions=False,
269269
)
270-
assert result.exit_code == 1, result.stdout
271-
assert "Expected type User but got undefined object with no schema" in result.stdout
270+
assert result.exit_code == 1, result.output
271+
assert "Expected type User but got undefined object with no schema" in result.output

tests/test_replace.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def test_no_command(runner, httpserver):
1010
["--url", httpserver.url_for("/"), "replace"],
1111
catch_exceptions=False,
1212
)
13-
assert result.exit_code == 1, result.stdout
14-
assert "replace user --help" in result.stdout
13+
assert result.exit_code == 1, result.output
14+
assert "replace user --help" in result.output
1515

1616

1717
def test_invalid_command(runner, httpserver):
@@ -21,8 +21,8 @@ def test_invalid_command(runner, httpserver):
2121
["--url", httpserver.url_for("/"), "replace", "invalid"],
2222
catch_exceptions=False,
2323
)
24-
assert result.exit_code == 1, result.stdout
25-
assert "Error: Invalid model" in result.stdout
24+
assert result.exit_code == 1, result.output
25+
assert "Error: Invalid model" in result.output
2626

2727

2828
def test_no_command_stdin(runner, httpserver, simple_user_payload):
@@ -51,7 +51,7 @@ def test_no_command_stdin(runner, httpserver, simple_user_payload):
5151
input=json.dumps(payload),
5252
catch_exceptions=False,
5353
)
54-
assert result.exit_code == 0, result.stdout
54+
assert result.exit_code == 0, result.output
5555
json_output = json.loads(result.output)
5656

5757
assert json_output == response_payload
@@ -72,8 +72,8 @@ def test_no_command_payload_without_an_id(runner, httpserver, simple_user_payloa
7272
input=json.dumps(payload),
7373
catch_exceptions=False,
7474
)
75-
assert result.exit_code == 1, result.stdout
76-
assert "Resource must have an id" in result.stdout
75+
assert result.exit_code == 1, result.output
76+
assert "Resource must have an id" in result.output
7777

7878

7979
def test_no_command_no_stdin(runner, httpserver, simple_user_payload):
@@ -83,8 +83,8 @@ def test_no_command_no_stdin(runner, httpserver, simple_user_payload):
8383
["--url", httpserver.url_for("/"), "replace"],
8484
catch_exceptions=False,
8585
)
86-
assert result.exit_code == 1, result.stdout
87-
assert "Usage: cli replace" in result.stdout
86+
assert result.exit_code == 1, result.output
87+
assert "Usage: cli replace" in result.output
8888

8989

9090
def test_no_command_scimclient_error(runner, httpserver, simple_user_payload):
@@ -116,8 +116,8 @@ def test_no_command_scimclient_error(runner, httpserver, simple_user_payload):
116116
input=json.dumps(payload),
117117
catch_exceptions=False,
118118
)
119-
assert result.exit_code == 1, result.stdout
120-
assert "Unexpected response status code: 999" in result.stdout
119+
assert result.exit_code == 1, result.output
120+
assert "Unexpected response status code: 999" in result.output
121121

122122

123123
def test_no_command_validation_error(runner, httpserver, simple_user_payload):
@@ -149,8 +149,8 @@ def test_no_command_validation_error(runner, httpserver, simple_user_payload):
149149
catch_exceptions=False,
150150
input=json.dumps(payload),
151151
)
152-
assert result.exit_code == 1, result.stdout
153-
assert "Expected type User but got undefined object with no schema" in result.stdout
152+
assert result.exit_code == 1, result.output
153+
assert "Expected type User but got undefined object with no schema" in result.output
154154

155155

156156
def test_command_stdin(runner, httpserver, simple_user_payload):
@@ -179,7 +179,7 @@ def test_command_stdin(runner, httpserver, simple_user_payload):
179179
input=json.dumps(payload),
180180
catch_exceptions=False,
181181
)
182-
assert result.exit_code == 0, result.stdout
182+
assert result.exit_code == 0, result.output
183183
json_output = json.loads(result.output)
184184

185185
assert json_output == response_payload
@@ -211,7 +211,7 @@ def test_command_parameters(runner, httpserver, simple_user_payload):
211211
],
212212
catch_exceptions=False,
213213
)
214-
assert result.exit_code == 0, result.stdout
214+
assert result.exit_code == 0, result.output
215215
json_output = json.loads(result.output)
216216

217217
assert json_output == response_payload
@@ -231,8 +231,8 @@ def test_command_payload_without_an_id(runner, httpserver, simple_user_payload):
231231
],
232232
catch_exceptions=False,
233233
)
234-
assert result.exit_code == 1, result.stdout
235-
assert "Resource must have an id" in result.stdout
234+
assert result.exit_code == 1, result.output
235+
assert "Resource must have an id" in result.output
236236

237237

238238
def test_command_no_stdin_no_parameter(runner, httpserver, simple_user_payload):
@@ -242,8 +242,8 @@ def test_command_no_stdin_no_parameter(runner, httpserver, simple_user_payload):
242242
["--url", httpserver.url_for("/"), "replace", "user"],
243243
catch_exceptions=False,
244244
)
245-
assert result.exit_code == 1, result.stdout
246-
assert "Usage: cli replace user" in result.stdout
245+
assert result.exit_code == 1, result.output
246+
assert "Usage: cli replace user" in result.output
247247

248248

249249
def test_command_scimclient_error(runner, httpserver, simple_user_payload):
@@ -271,8 +271,8 @@ def test_command_scimclient_error(runner, httpserver, simple_user_payload):
271271
],
272272
catch_exceptions=False,
273273
)
274-
assert result.exit_code == 1, result.stdout
275-
assert "Unexpected response status code: 999" in result.stdout
274+
assert result.exit_code == 1, result.output
275+
assert "Unexpected response status code: 999" in result.output
276276

277277

278278
def test_command_validation_error(runner, httpserver, simple_user_payload):
@@ -300,5 +300,5 @@ def test_command_validation_error(runner, httpserver, simple_user_payload):
300300
],
301301
catch_exceptions=False,
302302
)
303-
assert result.exit_code == 1, result.stdout
304-
assert "Expected type User but got undefined object with no schema" in result.stdout
303+
assert result.exit_code == 1, result.output
304+
assert "Expected type User but got undefined object with no schema" in result.output

0 commit comments

Comments
 (0)