resolve merge conflicts

This commit is contained in:
Ahmed TAHRI
2024-03-18 18:19:30 +01:00
28 changed files with 330 additions and 346 deletions

View File

@ -42,7 +42,7 @@ def test_bearer_auth(httpbin_both, token):
new=lambda self, prompt: 'password')
def test_password_prompt(httpbin):
r = http('--auth', 'user',
'GET', httpbin.url + '/basic-auth/user/password')
'GET', httpbin + '/basic-auth/user/password')
assert HTTP_OK in r
assert r.json == {'authenticated': True, 'user': 'user'}