diff options
| author | rr- | 2016-08-13 22:29:12 +0200 |
|---|---|---|
| committer | rr- | 2016-08-14 11:38:59 +0200 |
| commit | 2b3d193b7c006a474142f20d9f28992a6f207d82 (patch) | |
| tree | 8b46d4dbcee9837839ef00c856f28e8f66554c64 /server/szurubooru/tests/conftest.py | |
| parent | 6b77404ecff3993b3c48c33a6c970b0844b6115c (diff) | |
server/tags: don't auto-create tag categories
Diffstat (limited to 'server/szurubooru/tests/conftest.py')
| -rw-r--r-- | server/szurubooru/tests/conftest.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/szurubooru/tests/conftest.py b/server/szurubooru/tests/conftest.py index f53b041..4fb3882 100644 --- a/server/szurubooru/tests/conftest.py +++ b/server/szurubooru/tests/conftest.py @@ -106,18 +106,19 @@ def user_factory(): @pytest.fixture def tag_category_factory(): - def factory(name='dummy', color='dummy'): + def factory(name=None, color='dummy', default=False): category = db.TagCategory() - category.name = name + category.name = name or get_unique_name() category.color = color + category.default = default return category return factory @pytest.fixture def tag_factory(): - def factory(names=None, category=None, category_name='dummy'): + def factory(names=None, category=None): if not category: - category = db.TagCategory(category_name) + category = db.TagCategory(get_unique_name()) db.session.add(category) tag = db.Tag() tag.names = [db.TagName(name) for name in (names or [get_unique_name()])] |