Fixed test and updated client fixture

Author: orronai

lms/lmsweb/tools/registration.py

@@ -14,7 +14,7 @@
 from wtforms.validators import Email, EqualTo, InputRequired, Length
 
 from lms.lmsdb import models
-from lms.lmsweb import config, webmail
+from lms.lmsweb import config, webapp, webmail
 from lms.utils.log import log
 
 import requests
@@ -179,7 +179,8 @@ def send_confirmation_mail(email: str, fullname: str) -> None:
     )
     link = url_for('confirm_email', token=token, _external=True)
     msg.body = f'Hey {fullname},\nYour confirmation link is: {link}'
-    webmail.send(msg)
+    if not webapp.config.get('TESTING'):
+        webmail.send(msg)
 
 
 if __name__ == '__main__':

tests/conftest.py

@@ -49,9 +49,9 @@ def db(db_in_memory):
         db_in_memory.rollback()
 
 
-@pytest.fixture(autouse=True, scope='session')
-def app():
-    return webapp
+@pytest.fixture(autouse=True, scope='function')
+def client():
+    return webapp.test_client()
 
 
 @pytest.fixture(autouse=True, scope='session')
@@ -179,17 +179,17 @@ def admin_user():
 
 
 @pytest.fixture(autouse=True, scope='session')
-def captured_templates(app):
+def captured_templates():
     recorded = []
 
     def record(sender, template, context, **kwargs):
         recorded.append((template, context))
 
-    template_rendered.connect(record, app)
+    template_rendered.connect(record, webapp)
     try:
         yield recorded
     finally:
-        template_rendered.disconnect(record, app)
+        template_rendered.disconnect(record, webapp)
 
 
 def create_notification(

tests/test_flask_limiter.py

@@ -1,3 +1,5 @@
+from flask.testing import FlaskClient
+
 from lms.lmsweb import routes
 from lms.lmsdb.models import Solution, User
 from lms.lmsweb import webapp
@@ -7,8 +9,7 @@
 class TestLimiter:
     @staticmethod
     @conftest.use_limiter
-    def test_limiter_login_fails(student_user: User):
-        client = webapp.test_client()
+    def test_limiter_login_fails(client: FlaskClient, student_user: User):
         for _ in range(webapp.config['LIMITS_PER_MINUTE'] - 1):
             response = client.post('/login', data={
                 'username': student_user.username,
@@ -25,16 +26,14 @@ def test_limiter_login_fails(student_user: User):
 
     @staticmethod
     @conftest.use_limiter
-    def test_limiter_login_refreshes():
-        client = webapp.test_client()
+    def test_limiter_login_refreshes(client: FlaskClient):
         for _ in range(webapp.config['LIMITS_PER_MINUTE'] + 1):
             response = client.get('/login')
             assert response.status_code == 200
 
     @staticmethod
     @conftest.use_limiter
-    def test_limiter_login_success(student_user: User):
-        client = webapp.test_client()
+    def test_limiter_login_success(client: FlaskClient, student_user: User):
         client.post('/login', data={
             'username': student_user.username,
             'password': 'fake5',

tests/test_login.py

@@ -1,11 +1,11 @@
+from flask.testing import FlaskClient
+
 from lms.lmsdb.models import User
-from lms.lmsweb import webapp
 
 
 class TestLogin:
     @staticmethod
-    def test_login_password_fail(student_user: User):
-        client = webapp.test_client()
+    def test_login_password_fail(client: FlaskClient, student_user: User):
         client.post('/login', data={
             'username': student_user.username,
             'password': 'wrong_pass',
@@ -14,8 +14,7 @@ def test_login_password_fail(student_user: User):
         assert fail_login_response.status_code == 302
 
     @staticmethod
-    def test_login_username_fail():
-        client = webapp.test_client()
+    def test_login_username_fail(client: FlaskClient):
         client.post('/login', data={
             'username': 'wrong_user',
             'password': 'fake pass',
@@ -25,10 +24,9 @@ def test_login_username_fail():
 
     @staticmethod
     def test_login_not_confirmed_user(
-        not_confirmed_user: User, captured_templates,
+        client: FlaskClient, not_confirmed_user: User, captured_templates,
     ):
-        client = webapp.test_client()
-        login_response = client.post('/login', data={
+        client.post('/login', data={
             'username': not_confirmed_user.username,
             'password': 'fake pass',
         }, follow_redirects=True)
@@ -39,8 +37,7 @@ def test_login_not_confirmed_user(
         assert fail_login_response.status_code == 302
 
     @staticmethod
-    def test_login_success(student_user: User):
-        client = webapp.test_client()
+    def test_login_success(client: FlaskClient, student_user: User):
         client.post('/login', data={
             'username': student_user.username,
             'password': 'fake pass',

tests/test_registration.py

@@ -1,12 +1,14 @@
+from flask.testing import FlaskClient
+
 from lms.lmsweb.tools.registration import generate_confirmation_token
 from lms.lmsdb.models import User
-from lms.lmsweb import webapp
 
 
 class TestRegistration:
     @staticmethod
-    def test_invalid_username(student_user: User, captured_templates):
-        client = webapp.test_client()
+    def test_invalid_username(
+        client: FlaskClient, student_user: User, captured_templates,
+    ):
         client.post('/signup', data={
             'email': 'some_name@mail.com',
             'username': student_user.username,
@@ -25,8 +27,9 @@ def test_invalid_username(student_user: User, captured_templates):
         assert fail_login_response.status_code == 302
 
     @staticmethod
-    def test_invalid_email(student_user: User, captured_templates):
-        client = webapp.test_client()
+    def test_invalid_email(
+        client: FlaskClient, student_user: User, captured_templates,
+    ):
         client.post('/signup', data={
             'email': student_user.mail_address,
             'username': 'some_user',
@@ -45,8 +48,7 @@ def test_invalid_email(student_user: User, captured_templates):
         assert fail_login_response.status_code == 302
 
     @staticmethod
-    def test_successful_registration(captured_templates):
-        client = webapp.test_client()
+    def test_successful_registration(client: FlaskClient, captured_templates):
         client.post('/signup', data={
             'email': 'some_user123@mail.com',
             'username': 'some_user',

tests/test_users.py

@@ -1,5 +1,6 @@
+from flask.testing import FlaskClient
+
 from lms.lmsdb.models import User
-from lms.lmsweb import webapp
 from tests import conftest
 
 
@@ -61,8 +62,7 @@ def test_logout(student_user: User):
         assert logout_response.status_code == 200
 
     @staticmethod
-    def test_banned_user(banned_user: User):
-        client = webapp.test_client()
+    def test_banned_user(client: FlaskClient, banned_user: User):
         login_response = client.post('/login', data={
             'username': banned_user.username,
             'password': 'fake pass',