Merge pull request #22 from creyD/dev

Major Version 3.0.0

creyPY/fastapi/db/async_session.py

@@ -5,7 +5,9 @@ from sqlalchemy.orm import sessionmaker
 
 from .common import SQLALCHEMY_DATABASE_URL, name
 
-async_engine = create_async_engine(SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True)
+async_engine = create_async_engine(
+    SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": "require"}
+)
 
 AsyncSessionLocal = sessionmaker(
     bind=async_engine,

creyPY/fastapi/db/session.py

@@ -6,7 +6,9 @@ from sqlalchemy.orm.session import Session
 
 from .common import SQLALCHEMY_DATABASE_URL, name
 
-engine = create_engine(SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True)
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": "require"}
+)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 

creyPY/fastapi/testing.py

@@ -41,7 +41,7 @@ class GenericClient(TestClient):
         re = self.c.post(
             url,
             files={"file": file},
-            headers=self.default_headers | {"Content-Type": "application/json"},
+            headers=self.default_headers,
             *args,
             **kwargs,
         )

creyPY/fastapi/testing_async.py

@@ -1,13 +1,14 @@
 import json
-from httpx import AsyncClient, ASGITransport
+
+from httpx import ASGITransport, AsyncClient
 
 
 class AsyncGenericClient:
-    def __init__(self, app):
+    def __init__(self, app, headers={}):
         self.c = AsyncClient(
             transport=ASGITransport(app=app), base_url="http://testserver", follow_redirects=True
         )
-        self.default_headers = {}
+        self.default_headers = headers
 
     async def get(self, url: str, r_code: int = 200, parse_json=True):
         re = await self.c.get(url, headers=self.default_headers)
@@ -35,7 +36,8 @@ class AsyncGenericClient:
         )
         if re.status_code != r_code:
             print(re.content)
-        assert r_code == re.status_code
+        if not raw_response:
+            assert r_code == re.status_code
         return re.json() if not raw_response else re
 
     async def post_file(
@@ -44,7 +46,7 @@ class AsyncGenericClient:
         re = await self.c.post(
             url,
             files={"file": file},
-            headers=self.default_headers | {"Content-Type": "application/json"},
+            headers=self.default_headers,
             *args,
             **kwargs,
         )