Update QgisInterface class, refactor and improve tests [#24]

GispoCoding · Dec 18, 2023 · f0a76ac · f0a76ac
1 parent dadc2a7
commit f0a76ac
Show file tree

Hide file tree

Showing 7 changed files with 363 additions and 312 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,3 +75,4 @@ target/
 /tests/data/db.gpkg-shm
 /tests/data/db.gpkg-wal
 /tests/data/*.tif.aux.xml
+/Makefile
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+## Fixes
+
+* Make stub QgisInterface and MockMessageBar inherit real interfaces
+
 # Version 2.0.0 (29-11-2023)
 
 ## New Features

diff --git a/pyproject.toml b/pyproject.toml
@@ -122,7 +122,7 @@ ban-relative-imports = "all"
 
 [tool.ruff.per-file-ignores]
 "src/pytest_qgis/pytest_qgis.py"=["PLR2004"]  # TODO: Fix magic values. Remove this after.
-"src/pytest_qgis/qgis_interface.py" = ["N802", "N803", "N815"]
+"src/pytest_qgis/qgis_interface.py" = ["N802", "N803", "N815", "ARG002"]
 "src/pytest_qgis/mock_qgis_classes.py" = ["N802", "N803"]
 "tests/*" = [
     "ANN001",

diff --git a/src/pytest_qgis/pytest_qgis.py b/src/pytest_qgis/pytest_qgis.py
@@ -30,7 +30,6 @@
 
 import pytest
 from qgis.core import Qgis, QgsApplication, QgsProject, QgsRectangle, QgsVectorLayer
-from qgis.gui import QgisInterface as QgisInterfaceOrig
 from qgis.gui import QgsGui, QgsLayerTreeMapCanvasBridge, QgsMapCanvas
 from qgis.PyQt import QtCore, QtWidgets, sip
 from qgis.PyQt.QtCore import QCoreApplication
@@ -185,7 +184,7 @@ def qgis_version() -> int:
 
 
 @pytest.fixture(scope="session")
-def qgis_iface() -> QgisInterfaceOrig:
+def qgis_iface() -> QgisInterface:
     assert _IFACE
     return _IFACE