test: refactor test suite

KyleKing · Jan 15, 2024 · cee4782 · cee4782
1 parent 94fee75
commit cee4782
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,7 @@ keywords = ["mdformat", "markdown", "markdown-it"]
 requires-python = ">=3.8.4"
 dependencies = [
     "mdformat >= 0.7.16",
-    "mdformat-admon >= 2.0.0rc1",
+    "mdformat-admon >= 2.0.0",
     # "mdformat-gfm >= 0.3.6",  # TODO: PENDING RELEASE (https://github.com/hukkin/mdformat-gfm/issues/31)
     "mdformat-gfm @ git+https://github.com/hukkin/mdformat-gfm.git",
 ]

diff --git a/tests/format/__init__.py b/tests/format/__init__.py
diff --git a/tests/format/fixtures.md b/tests/format/fixtures.md
diff --git a/tests/test_fixtures.py → tests/format/test_fixtures.py b/tests/test_fixtures.py → tests/format/test_fixtures.py
@@ -4,7 +4,7 @@
 import pytest
 from markdown_it.utils import read_fixture_file
 
-from .helpers import print_text
+from ..helpers import print_text
 
 FIXTURE_PATH = Path(__file__).parent / "fixtures.md"
 fixtures = read_fixture_file(FIXTURE_PATH)

diff --git a/tests/render/__init__.py b/tests/render/__init__.py
diff --git a/tests/fixtures-admon-mkdocs.md → tests/render/fixtures/admonitions.md b/tests/fixtures-admon-mkdocs.md → tests/render/fixtures/admonitions.md
diff --git a/tests/fixtures-mkdocs-content-tabs.md → tests/render/fixtures/content-tabs.md b/tests/fixtures-mkdocs-content-tabs.md → tests/render/fixtures/content-tabs.md
diff --git a/tests/test_render.py → tests/render/test_render.py b/tests/test_render.py → tests/render/test_render.py
@@ -6,9 +6,9 @@
 
 from mdformat_mkdocs.plugins import content_tabs_plugin, mkdocs_admon_plugin
 
-from .helpers import print_text
+from ..helpers import print_text
 
-FIXTURE_PATH = Path(__file__).parent
+FIXTURE_PATH = Path(__file__).parent / "fixtures"
 
 
 def with_plugin(filename, plugins):
@@ -18,9 +18,9 @@ def with_plugin(filename, plugins):
 @pytest.mark.parametrize(
     ("line", "title", "text", "expected", "plugins"),
     [
-        *with_plugin("fixtures-admon-mkdocs.md", [mkdocs_admon_plugin]),
+        *with_plugin("admonitions.md", [mkdocs_admon_plugin]),
         *with_plugin(
-            "fixtures-mkdocs-content-tabs.md",
+            "content-tabs.md",
             [mkdocs_admon_plugin, content_tabs_plugin],
         ),
     ],