fix(httpx): update test cases for httpx

Author: lepture

authlib/integrations/httpx_client/__init__.py

@@ -17,7 +17,7 @@
 
 __all__ = [
     'OAuthError',
-    'OAuth1Auth', 'AsyncOAuth1Client',
+    'OAuth1Auth', 'AsyncOAuth1Client', 'OAuth1Client',
     'SIGNATURE_HMAC_SHA1', 'SIGNATURE_RSA_SHA1', 'SIGNATURE_PLAINTEXT',
     'SIGNATURE_TYPE_HEADER', 'SIGNATURE_TYPE_QUERY', 'SIGNATURE_TYPE_BODY',
     'OAuth2Auth', 'OAuth2ClientAuth', 'OAuth2Client', 'AsyncOAuth2Client',

tests/clients/test_httpx/test_assertion_client.py

@@ -1,5 +1,6 @@
 import time
 import pytest
+from httpx import WSGITransport
 from authlib.integrations.httpx_client import AssertionClient
 from ..wsgi_helper import MockDispatch
 
@@ -26,7 +27,7 @@ def verifier(request):
         audience='foo',
         alg='HS256',
         key='secret',
-        app=MockDispatch(default_token, assert_func=verifier)
+        transport=WSGITransport(MockDispatch(default_token, assert_func=verifier)),
     ) as client:
         client.get('https://i.b')
 
@@ -43,7 +44,7 @@ def verifier(request):
         key='secret',
         scope='email',
         claims={'test_mode': 'true'},
-        app=MockDispatch(default_token, assert_func=verifier)
+        transport=WSGITransport(MockDispatch(default_token, assert_func=verifier)),
     ) as client:
         client.get('https://i.b')
         client.get('https://i.b')
@@ -56,7 +57,7 @@ def test_without_alg():
         subject='foo',
         audience='foo',
         key='secret',
-        app=MockDispatch(default_token)
+        transport=WSGITransport(MockDispatch(default_token)),
     ) as client:
         with pytest.raises(ValueError):
             client.get('https://i.b')

tests/clients/test_httpx/test_async_assertion_client.py

@@ -1,5 +1,6 @@
 import time
 import pytest
+from httpx import ASGITransport
 from authlib.integrations.httpx_client import AsyncAssertionClient
 from ..asgi_helper import AsyncMockDispatch
 
@@ -28,7 +29,7 @@ async def verifier(request):
         audience='foo',
         alg='HS256',
         key='secret',
-        app=AsyncMockDispatch(default_token, assert_func=verifier)
+        transport=ASGITransport(AsyncMockDispatch(default_token, assert_func=verifier)),
     ) as client:
         await client.get('https://i.b')
 
@@ -45,7 +46,7 @@ async def verifier(request):
         key='secret',
         scope='email',
         claims={'test_mode': 'true'},
-        app=AsyncMockDispatch(default_token, assert_func=verifier)
+        transport=ASGITransport(AsyncMockDispatch(default_token, assert_func=verifier)),
     ) as client:
         await client.get('https://i.b')
         await client.get('https://i.b')
@@ -59,7 +60,7 @@ async def test_without_alg():
         subject='foo',
         audience='foo',
         key='secret',
-        app=AsyncMockDispatch()
+        transport=ASGITransport(AsyncMockDispatch()),
     ) as client:
         with pytest.raises(ValueError):
             await client.get('https://i.b')

tests/clients/test_httpx/test_async_oauth1_client.py

@@ -1,4 +1,5 @@
 import pytest
+from httpx import ASGITransport
 from authlib.integrations.httpx_client import (
     OAuthError,
     AsyncOAuth1Client,
@@ -19,8 +20,8 @@ async def assert_func(request):
         assert 'oauth_consumer_key="id"' in auth_header
         assert 'oauth_signature=' in auth_header
 
-    app = AsyncMockDispatch(request_token, assert_func=assert_func)
-    async with AsyncOAuth1Client('id', 'secret', app=app) as client:
+    transport = ASGITransport(AsyncMockDispatch(request_token, assert_func=assert_func))
+    async with AsyncOAuth1Client('id', 'secret', transport=transport) as client:
         response = await client.fetch_request_token(oauth_url)
 
     assert response == request_token
@@ -38,11 +39,11 @@ async def assert_func(request):
         assert b'oauth_consumer_key=id' in content
         assert b'&oauth_signature=' in content
 
-    mock_response = AsyncMockDispatch(request_token, assert_func=assert_func)
+    transport = ASGITransport(AsyncMockDispatch(request_token, assert_func=assert_func))
 
     async with AsyncOAuth1Client(
         'id', 'secret', signature_type=SIGNATURE_TYPE_BODY,
-        app=mock_response,
+        transport=transport,
     ) as client:
         response = await client.fetch_request_token(oauth_url)
 
@@ -61,11 +62,11 @@ async def assert_func(request):
         assert 'oauth_consumer_key=id' in url
         assert '&oauth_signature=' in url
 
-    mock_response = AsyncMockDispatch(request_token, assert_func=assert_func)
+    transport = ASGITransport(AsyncMockDispatch(request_token, assert_func=assert_func))
 
     async with AsyncOAuth1Client(
         'id', 'secret', signature_type=SIGNATURE_TYPE_QUERY,
-        app=mock_response,
+        transport=transport,
     ) as client:
         response = await client.fetch_request_token(oauth_url)
 
@@ -83,10 +84,10 @@ async def assert_func(request):
         assert 'oauth_consumer_key="id"' in auth_header
         assert 'oauth_signature=' in auth_header
 
-    mock_response = AsyncMockDispatch(request_token, assert_func=assert_func)
+    transport = ASGITransport(AsyncMockDispatch(request_token, assert_func=assert_func))
     async with AsyncOAuth1Client(
         'id', 'secret', token='foo', token_secret='bar',
-        app=mock_response,
+        transport=transport,
     ) as client:
         with pytest.raises(OAuthError):
             await client.fetch_access_token(oauth_url)
@@ -98,10 +99,10 @@ async def assert_func(request):
 
 @pytest.mark.asyncio
 async def test_get_via_header():
-    mock_response = AsyncMockDispatch(b'hello')
+    transport = ASGITransport(AsyncMockDispatch(b'hello'))
     async with AsyncOAuth1Client(
         'id', 'secret', token='foo', token_secret='bar',
-        app=mock_response,
+        transport=transport,
     ) as client:
         response = await client.get('https://example.com/')
 
@@ -121,11 +122,11 @@ async def assert_func(request):
         assert b'oauth_consumer_key=id' in content
         assert b'oauth_signature=' in content
 
-    mock_response = AsyncMockDispatch(b'hello', assert_func=assert_func)
+    transport = ASGITransport(AsyncMockDispatch(b'hello', assert_func=assert_func))
     async with AsyncOAuth1Client(
         'id', 'secret', token='foo', token_secret='bar',
         signature_type=SIGNATURE_TYPE_BODY,
-        app=mock_response,
+        transport=transport,
     ) as client:
         response = await client.post('https://example.com/')
 
@@ -138,11 +139,11 @@ async def assert_func(request):
 
 @pytest.mark.asyncio
 async def test_get_via_query():
-    mock_response = AsyncMockDispatch(b'hello')
+    transport = ASGITransport(AsyncMockDispatch(b'hello'))
     async with AsyncOAuth1Client(
         'id', 'secret', token='foo', token_secret='bar',
         signature_type=SIGNATURE_TYPE_QUERY,
-        app=mock_response,
+        transport=transport,
     ) as client:
         response = await client.get('https://example.com/')