From d227392c793e9caa418b42ae8996d29c9a3400e8 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Mon, 29 Mar 2021 11:59:43 +0200
Subject: [PATCH] put fixtures into conftest

---
 tests/test_blag.py      | 15 ++++++---------
 tests/test_devserver.py |  9 ---------
 tests/test_templates.py | 41 -----------------------------------------
 3 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/tests/test_blag.py b/tests/test_blag.py
index d2ef954..ba5ef78 100644
--- a/tests/test_blag.py
+++ b/tests/test_blag.py
@@ -7,19 +7,15 @@ import pytest
 from blag import blag
 
 
-@pytest.fixture
-def outdir():
-    with TemporaryDirectory() as dir:
-        yield dir
-
-
-def test_generate_feed(outdir):
+def test_generate_feed(tempdir):
+    outdir = f'{tempdir}/build'
     articles = []
     blag.generate_feed(articles, outdir, ' ', ' ', ' ', ' ')
     assert os.path.exists(f'{outdir}/atom.xml')
 
 
-def test_feed(outdir):
+def test_feed(tempdir):
+    outdir = f'{tempdir}/build'
     articles = [
         [
             'dest1.html',
@@ -66,7 +62,8 @@ def test_feed(outdir):
     assert '<link href="https://example.com/dest2.html"' in feed
 
 
-def test_generate_feed_with_description(outdir):
+def test_generate_feed_with_description(tempdir):
+    outdir = f'{tempdir}/build'
     # if a description is provided, it will be used as the summary in
     # the feed, otherwise we simply use the title of the article
     articles = [[
diff --git a/tests/test_devserver.py b/tests/test_devserver.py
index 5490a93..9ae182a 100644
--- a/tests/test_devserver.py
+++ b/tests/test_devserver.py
@@ -1,17 +1,8 @@
 import time
 
-import pytest
-
-from tempfile import TemporaryDirectory
 from blag import devserver
 
 
-@pytest.fixture
-def tempdir():
-    with TemporaryDirectory() as dir:
-        yield dir
-
-
 def test_get_last_modified(tempdir):
     # take initial time
     t1 = devserver.get_last_modified([tempdir])
diff --git a/tests/test_templates.py b/tests/test_templates.py
index fa57526..c0377f0 100644
--- a/tests/test_templates.py
+++ b/tests/test_templates.py
@@ -1,46 +1,5 @@
 import datetime
 
-import pytest
-
-from blag import blag
-
-
-@pytest.fixture
-def environment():
-    site = {
-        'base_url': 'site base_url',
-        'title': 'site title',
-        'description': 'site description',
-        'author': 'site author',
-    }
-    env = blag.environment_factory(globals_=dict(site=site))
-    yield env
-
-
-@pytest.fixture
-def page_template(environment):
-    yield environment.get_template('page.html')
-
-
-@pytest.fixture
-def article_template(environment):
-    yield environment.get_template('article.html')
-
-
-@pytest.fixture
-def archive_template(environment):
-    yield environment.get_template('archive.html')
-
-
-@pytest.fixture
-def tags_template(environment):
-    yield environment.get_template('tags.html')
-
-
-@pytest.fixture
-def tag_template(environment):
-    yield environment.get_template('tag.html')
-
 
 def test_page(page_template):
     ctx = {