🎉 Finish >:)

Kludex · Kludex · commit 5244b0a811b2 · 2020-08-16T23:32:19.000+02:00
diff --git a/docs_src/settings/app02/config.py b/docs_src/settings/app02/config.py
@@ -3,5 +3,5 @@
 
 class Settings(BaseSettings):
     app_name: str = "Awesome API"
-    admin_email: str
+    admin_email: str = "admin@example.com"
     items_per_user: int = 50
diff --git a/docs_src/settings/app02/test_main.py b/docs_src/settings/app02/test_main.py
@@ -1,23 +1,22 @@
 from fastapi.testclient import TestClient
 
-from . import config, main
+from .config import Settings
+from .main import app, get_settings
 
-client = TestClient(main.app)
+client = TestClient(app)
 
 
 def get_settings_override():
-    return config.Settings(admin_email="testing_admin@example.com")
+    return Settings(admin_email="another_admin@example.com")
 
 
-main.app.dependency_overrides[main.get_settings] = get_settings_override
+app.dependency_overrides[get_settings] = get_settings_override
 
 
 def test_app():
-
     response = client.get("/info")
-    data = response.json()
-    assert data == {
+    assert response.json() == {
         "app_name": "Awesome API",
-        "admin_email": "testing_admin@example.com",
+        "admin_email": "another_admin@example.com",
         "items_per_user": 50,
     }
diff --git a/tests/test_tutorial/test_conditional_openapi/test_tutorial001.py b/tests/test_tutorial/test_conditional_openapi/test_tutorial001.py
@@ -44,3 +44,10 @@ def test_disable_openapi(monkeypatch):
     assert response.status_code == 404, response.text
     response = client.get("/redoc")
     assert response.status_code == 404, response.text
+
+
+def test_root():
+    client = TestClient(tutorial001.app)
+    response = client.get("/")
+    assert response.status_code == 200
+    assert response.json() == {"message": "Hello World"}
diff --git a/tests/test_tutorial/test_settings/test_app02.py b/tests/test_tutorial/test_settings/test_app02.py
@@ -1,9 +1,19 @@
 from fastapi.testclient import TestClient
 
-from docs_src.settings.app02 import main, test_main
+from docs_src.settings.app02.main import app
 
-client = TestClient(main.app)
 
+def test_settings():
+    client = TestClient(app)
+    response = client.get("/info")
+    assert response.json() == {
+        "app_name": "Awesome API",
+        "admin_email": "admin@example.com",
+        "items_per_user": 50,
+    }
 
-def test_setting_override():
-    test_main.test_app()
+
+def test_override_settings():
+    from docs_src.settings.app02.test_main import test_app
+
+    test_app()
diff --git a/tests/test_tutorial/test_testing/test_main_b.py b/tests/test_tutorial/test_testing/test_main_b.py
@@ -1,6 +1,8 @@
-from docs_src.app_testing.test_main_b import test_create_existing_item  # noqa: F401
-from docs_src.app_testing.test_main_b import test_create_item  # noqa: F401
-from docs_src.app_testing.test_main_b import test_create_item_bad_token  # noqa: F401
-from docs_src.app_testing.test_main_b import test_read_inexistent_item  # noqa: F401
-from docs_src.app_testing.test_main_b import test_read_item  # noqa: F401
-from docs_src.app_testing.test_main_b import test_read_item_bad_token  # noqa: F401
+from docs_src.app_testing.test_main_b import (  # noqa: F401
+    test_create_existing_item,
+    test_create_item,
+    test_create_item_bad_token,
+    test_read_inexistent_item,
+    test_read_item,
+    test_read_item_bad_token,
+)
diff --git a/tests/test_tutorial/test_testing/test_tutorial002.py b/tests/test_tutorial/test_testing/test_tutorial002.py
@@ -1,9 +1,4 @@
-from docs_src.app_testing.tutorial002 import test_read_main, test_websocket
-
-
-def test_main():
-    test_read_main()
-
-
-def test_ws():
-    test_websocket()
+from docs_src.app_testing.tutorial002 import (  # noqa: F401
+    test_read_main,
+    test_websocket,
+)
diff --git a/tests/test_tutorial/test_testing/test_tutorial003.py b/tests/test_tutorial/test_testing/test_tutorial003.py
@@ -1,5 +1 @@
-from docs_src.app_testing.tutorial003 import test_read_items
-
-
-def test_main():
-    test_read_items()
+from docs_src.app_testing.tutorial003 import test_read_items  # noqa: F401
diff --git a/tests/test_tutorial/test_websockets/test_tutorial003.py b/tests/test_tutorial/test_websockets/test_tutorial003.py
@@ -1,10 +1,15 @@
 from fastapi.testclient import TestClient
 
-from docs_src.websockets.tutorial003 import app
+from docs_src.websockets.tutorial003 import app, html
 
 client = TestClient(app)
 
 
+def test_get():
+    response = client.get("/")
+    assert response.text == html
+
+
 def test_websocket_handle_disconnection():
     with client.websocket_connect("/ws/1234") as connection, client.websocket_connect(
         "/ws/5678"
