Changed skipif condition and split a test

Author: orronai

tests/test_registration.py

@@ -1,10 +1,10 @@
+import sys
 import time
 from unittest.mock import Mock, patch
 
 from flask.testing import FlaskClient
 import pytest
 
-from lms.lmsweb import config_file
 from lms.lmsweb.config import CONFIRMATION_TIME, MAIL_DEFAULT_SENDER
 from lms.lmsdb.models import User
 from lms.models.users import generate_user_token
@@ -135,7 +135,11 @@ def test_expired_token(client: FlaskClient):
 
     @staticmethod
     @pytest.mark.skipif(
-        condition=not config_file.is_file(),
+        condition=(
+            sys.platform != 'darwin'
+            and sys.platform != 'linux'
+            and sys.platform != 'win32'
+        ),
         reason='should run with configuration file and correct mail info',
     )
     def test_successful_registration(client: FlaskClient, captured_templates):

tests/test_users.py

@@ -122,7 +122,9 @@ def test_forgot_my_password_invalid_mail(
         assert template.name == "resetpassword.html"
 
     @staticmethod
-    def test_forgot_my_password(client: FlaskClient, captured_templates):
+    def test_forgot_my_password_invalid_recover(
+        client: FlaskClient, captured_templates,
+    ):
         user = conftest.create_student_user(index=1)
         client.post('/reset-password', data={
             'email': user.mail_address,
@@ -146,6 +148,16 @@ def test_forgot_my_password(client: FlaskClient, captured_templates):
         template, _ = captured_templates[-1]
         assert template.name == "recoverpassword.html"
 
+    @staticmethod
+    def test_forgot_my_password(client: FlaskClient, captured_templates):
+        user = conftest.create_student_user(index=1)
+        client.post('/reset-password', data={
+            'email': user.mail_address,
+        }, follow_redirects=True)
+        template, _ = captured_templates[-1]
+        assert template.name == "login.html"
+
+        token = generate_user_token(user)
         client.post(f'/recover-password/{user.id}/{token}', data={
             'password': 'new pass',
             'confirm': 'new pass',