refactor password tests

tests/conftest.py

@@ -1,13 +1,42 @@
 import pytest
 import responses
+from typing import Generator
 from responses.matchers import query_param_matcher
 from dotenv import load_dotenv
 import os
+from streamlit.testing.v1 import AppTest
 
 load_dotenv()
 
 API_URL = os.getenv('API_URL')
 
+# -----------------------------------------------------------------
+# Fixtures for Streamlit
+# -----------------------------------------------------------------
+@pytest.fixture()
+def page_1() -> Generator[AppTest, None, None]:
+    """
+    Fixture to get the page 1 of the AppTest instance.
+    """
+    script_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "app", "1_Prédictions.py"))
+    app = AppTest.from_file(script_path)
+    app.run()
+
+    yield app
+    # Put here any cleaning operation
+
+@pytest.fixture()
+def page_2() -> Generator[AppTest, None, None]:
+    """
+    Fixture to get the page 2 of the AppTest instance.
+    """
+    script_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "app", "pages", "2_Archives.py"))
+    app = AppTest.from_file(script_path)
+    app.run()
+
+    yield app
+    # Put here any cleaning operation
+
 # -----------------------------------------------------------------
 # Fixtures for requests calls
 # -----------------------------------------------------------------

tests/pwd_protection.py

@@ -0,0 +1,46 @@
+from streamlit.testing.v1 import AppTest
+
+
+def pwd_protection(at: AppTest):
+    """
+    Test the login flow with a correct password.
+    """
+    import os
+    from dotenv import load_dotenv
+    
+    load_dotenv()
+
+    STREAMLIT_PWD = os.getenv("STREAMLIT_PWD")
+    assert STREAMLIT_PWD is not None, "STREAMLIT_PWD environment variable is not set"
+
+    # Check expected session state updates
+    assert "is_authenticated" not in at.session_state, "Expected 'is_authenticated' key in session state"
+    
+    # Simulate user typing the correct password
+    at.text_input[0].input(STREAMLIT_PWD).run()
+
+    # Check expected session state updates
+    assert "is_authenticated" in at.session_state, "Expected 'is_authenticated' key in session state"
+    assert at.session_state["is_authenticated"] is True, "Authentication should have succeeded"
+    assert "password" not in at.session_state, "Password should be cleared from session state"
+
+def pwd_protection_pwd_incorrect(at: AppTest):
+    """
+    Test the login flow with an incorrect password.
+    """
+    import os
+    from dotenv import load_dotenv
+    
+    load_dotenv()
+
+    STREAMLIT_PWD = os.getenv("STREAMLIT_PWD")
+    assert STREAMLIT_PWD is not None, "STREAMLIT_PWD environment variable is not set"
+
+    # Check expected session state updates
+    assert "is_authenticated" not in at.session_state, "Expected 'is_authenticated' key in session state"
+
+    # Simulate user typing an incorrect password
+    at.text_input[0].input('an_incorrect_password').run()
+
+    # Check expected session state updates
+    assert "is_authenticated" not in at.session_state, "Expected 'is_authenticated' key in session state"

tests/test_1_Prédictions.py

@@ -1,50 +1,8 @@
 from streamlit.testing.v1 import AppTest
-import os
-from dotenv import load_dotenv
+from tests.pwd_protection import pwd_protection, pwd_protection_pwd_incorrect
 
-load_dotenv()
+def test_pwd_protection(page_1: AppTest):
+    pwd_protection(page_1)
 
-def _get_app_test():
-    """
-    Helper function to get the AppTest instance.
-    """
-    script_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "app", "1_Prédictions.py"))
-    return AppTest.from_file(script_path).run()
-
-def test_pwd_protection():
-    """
-    Test the login flow with a correct password.
-    """
-    STREAMLIT_PWD = os.getenv("STREAMLIT_PWD")
-    assert STREAMLIT_PWD is not None, "STREAMLIT_PWD environment variable is not set"
-    
-    at = _get_app_test()
-
-    # Simulate user typing the correct password
-    at.text_input[0].input(STREAMLIT_PWD).run()
-
-    # Check expected session state updates
-    assert "is_authenticated" in at.session_state, "Expected 'is_authenticated' key in session state"
-    assert at.session_state["is_authenticated"] is True, "Authentication should have succeeded"
-    assert "password" not in at.session_state, "Password should be cleared from session state"
-
-    # Check there is no error
-    assert len(at.error) == 0, f"Errors have been printed to the user: {at.error}"
-
-def test_pwd_protection_pwd_incorrect():
-    """
-    Test the login flow with a correct password.
-    """
-    STREAMLIT_PWD = os.getenv("STREAMLIT_PWD")
-    assert STREAMLIT_PWD is not None, "STREAMLIT_PWD environment variable is not set"
-    
-    at = _get_app_test()
-
-    # Simulate user typing an incorrect password
-    at.text_input[0].input('an_incorrect_password').run()
-
-    # Check expected session state updates
-    assert "is_authenticated" not in at.session_state, "Expected 'is_authenticated' key in session state"
-
-    # Check there is no error
-    assert len(at.error) >= 1, "Errors should have been printed to the user"
+def test_pwd_protection_pwd_incorrect(page_1: AppTest):
+    pwd_protection_pwd_incorrect(page_1)

tests/test_2_Archives.py

@@ -1,50 +1,8 @@
 from streamlit.testing.v1 import AppTest
-import os
-from dotenv import load_dotenv
+from tests.pwd_protection import pwd_protection, pwd_protection_pwd_incorrect
 
-load_dotenv()
+def test_pwd_protection(page_2: AppTest):
+    pwd_protection(page_2)
 
-def _get_app_test():
-    """
-    Helper function to get the AppTest instance.
-    """
-    script_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "app", "pages", "2_Archives.py"))
-    return AppTest.from_file(script_path).run()
-
-def test_pwd_protection():
-    """
-    Test the login flow with a correct password.
-    """
-    STREAMLIT_PWD = os.getenv("STREAMLIT_PWD")
-    assert STREAMLIT_PWD is not None, "STREAMLIT_PWD environment variable is not set"
-    
-    at = _get_app_test()
-
-    # Simulate user typing the correct password
-    at.text_input[0].input(STREAMLIT_PWD).run()
-
-    # Check expected session state updates
-    assert "is_authenticated" in at.session_state, "Expected 'is_authenticated' key in session state"
-    assert at.session_state["is_authenticated"] is True, "Authentication should have succeeded"
-    assert "password" not in at.session_state, "Password should be cleared from session state"
-
-    # Check there is no error
-    assert len(at.error) == 0, f"Errors have been printed to the user: {at.error}"
-
-def test_pwd_protection_pwd_incorrect():
-    """
-    Test the login flow with a correct password.
-    """
-    STREAMLIT_PWD = os.getenv("STREAMLIT_PWD")
-    assert STREAMLIT_PWD is not None, "STREAMLIT_PWD environment variable is not set"
-    
-    at = _get_app_test()
-
-    # Simulate user typing an incorrect password
-    at.text_input[0].input('an_incorrect_password').run()
-
-    # Check expected session state updates
-    assert "is_authenticated" not in at.session_state, "Expected 'is_authenticated' key in session state"
-
-    # Check there is no error
-    assert len(at.error) >= 1, "Errors should have been printed to the user"
+def test_pwd_protection_pwd_incorrect(page_2: AppTest):
+    pwd_protection_pwd_incorrect(page_2)