testbase-fix

tests/conftest.py

@@ -102,7 +102,6 @@ def test_engine():
     import orm.invite
     import orm.notification
     import orm.collection
-    import orm.rating
     
     # Явно импортируем классы для гарантии регистрации
     from orm.base import BaseModel as Base
@@ -484,11 +483,16 @@ def backend_server():
     if not backend_running:
         print("🔄 Запускаем бэкенд сервер для тестов...")
         try:
-            # Запускаем бэкенд сервер
+            # Запускаем бэкенд сервер с тестовой базой данных
+            env = os.environ.copy()
+            env["DATABASE_URL"] = "sqlite:///test_e2e.db"  # Используем тестовую БД для e2e
+            env["TESTING"] = "true"
+            
             backend_process = subprocess.Popen(
                 ["uv", "run", "python", "dev.py"],
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
+                env=env,
                 cwd=os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
             )
 
@@ -912,3 +916,171 @@ def ensure_rbac_initialized():
     import rbac
     rbac.initialize_rbac()
     yield
+
+
+@pytest.fixture(autouse=True)
+def mock_redis_globally():
+    """Глобально мокает Redis для всех тестов, включая e2e"""
+    try:
+        import fakeredis.aioredis
+        
+        # Создаем fakeredis сервер
+        fake_redis = fakeredis.aioredis.FakeRedis()
+        
+        # Патчим глобальный redis экземпляр
+        with patch('storage.redis.redis') as mock_redis:
+            # Эмулируем RedisService.execute метод
+            async def mock_execute(command: str, *args):
+                cmd_method = getattr(fake_redis, command.lower(), None)
+                if cmd_method is not None:
+                    if hasattr(cmd_method, '__call__'):
+                        return await cmd_method(*args)
+                    else:
+                        return cmd_method
+                return None
+            
+            # Патчим все основные методы Redis
+            mock_redis.execute = mock_execute
+            mock_redis.get = fake_redis.get
+            mock_redis.set = fake_redis.set
+            mock_redis.delete = fake_redis.delete
+            mock_redis.exists = fake_redis.exists
+            mock_redis.ping = fake_redis.ping
+            mock_redis.hset = fake_redis.hset
+            mock_redis.hget = fake_redis.hget
+            mock_redis.hgetall = fake_redis.hgetall
+            mock_redis.hdel = fake_redis.hdel
+            mock_redis.expire = fake_redis.expire
+            mock_redis.ttl = fake_redis.ttl
+            mock_redis.keys = fake_redis.keys
+            mock_redis.scan = fake_redis.scan
+            mock_redis.is_connected = True
+            
+            # Async методы для connect/disconnect
+            async def mock_connect():
+                return True
+            
+            async def mock_disconnect():
+                pass
+            
+            mock_redis.connect = mock_connect
+            mock_redis.disconnect = mock_disconnect
+            
+            yield
+            
+    except ImportError:
+        # Если fakeredis не доступен, используем базовый mock
+        with patch('storage.redis.redis') as mock_redis:
+            mock_redis.execute.return_value = None
+            mock_redis.get.return_value = None
+            mock_redis.set.return_value = True
+            mock_redis.delete.return_value = True
+            mock_redis.exists.return_value = False
+            mock_redis.ping.return_value = True
+            mock_redis.hset.return_value = True
+            mock_redis.hget.return_value = None
+            mock_redis.hgetall.return_value = {}
+            mock_redis.hdel.return_value = True
+            mock_redis.expire.return_value = True
+            mock_redis.ttl.return_value = -1
+            mock_redis.keys.return_value = []
+            mock_redis.scan.return_value = ([], 0)
+            mock_redis.is_connected = True
+            
+            async def mock_connect():
+                return True
+            
+            async def mock_disconnect():
+                pass
+            
+            mock_redis.connect = mock_connect
+            mock_redis.disconnect = mock_disconnect
+            
+            yield
+
+
+@pytest.fixture(autouse=True)
+def mock_redis_service_globally():
+    """Глобально мокает RedisService для всех тестов, включая e2e"""
+    try:
+        import fakeredis.aioredis
+        
+        # Создаем fakeredis сервер
+        fake_redis = fakeredis.aioredis.FakeRedis()
+        
+        # Патчим RedisService класс
+        with patch('storage.redis.RedisService') as mock_service_class:
+            # Создаем mock экземпляр
+            mock_service = mock_service_class.return_value
+            
+            # Эмулируем RedisService.execute метод
+            async def mock_execute(command: str, *args):
+                cmd_method = getattr(fake_redis, command.lower(), None)
+                if cmd_method is not None:
+                    if hasattr(cmd_method, '__call__'):
+                        return await cmd_method(*args)
+                    else:
+                        return cmd_method
+                return None
+            
+            # Патчим все основные методы
+            mock_service.execute = mock_execute
+            mock_service.get = fake_redis.get
+            mock_service.set = fake_redis.set
+            mock_service.delete = fake_redis.delete
+            mock_service.exists = fake_redis.exists
+            mock_service.ping = fake_redis.ping
+            mock_service.hset = fake_redis.hset
+            mock_service.hget = fake_redis.hget
+            mock_service.hgetall = fake_redis.hgetall
+            mock_service.hdel = fake_redis.hdel
+            mock_service.expire = fake_redis.expire
+            mock_service.ttl = fake_redis.ttl
+            mock_service.keys = fake_redis.keys
+            mock_service.scan = fake_redis.scan
+            mock_service._client = fake_redis
+            mock_service.is_connected = True
+            
+            # Async методы для connect/disconnect
+            async def mock_connect():
+                return True
+            
+            async def mock_disconnect():
+                pass
+            
+            mock_service.connect = mock_connect
+            mock_service.disconnect = mock_disconnect
+            
+            yield
+            
+    except ImportError:
+        # Если fakeredis не доступен, используем базовый mock
+        with patch('storage.redis.RedisService') as mock_service_class:
+            mock_service = mock_service_class.return_value
+            
+            mock_service.execute.return_value = None
+            mock_service.get.return_value = None
+            mock_service.set.return_value = True
+            mock_service.delete.return_value = True
+            mock_service.exists.return_value = False
+            mock_service.ping.return_value = True
+            mock_service.hset.return_value = True
+            mock_service.hget.return_value = None
+            mock_service.hgetall.return_value = {}
+            mock_service.hdel.return_value = True
+            mock_service.expire.return_value = True
+            mock_service.ttl.return_value = -1
+            mock_service.keys.return_value = []
+            mock_service.scan.return_value = ([], 0)
+            mock_service.is_connected = True
+            
+            async def mock_connect():
+                return True
+            
+            async def mock_disconnect():
+                pass
+            
+            mock_service.connect = mock_connect
+            mock_service.disconnect = mock_disconnect
+            
+            yield