Skip to content

Commit

Permalink
clean up test mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnetordoff committed Jan 29, 2025
1 parent 3d38500 commit 583d9c2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from api.base.settings.defaults import API_BASE
from api_tests.nodes.views.test_node_contributors_detail import (
TestContributorDetail,
ContributorDetailMixin,
TestNodeContributorPartialUpdate,
TestNodeContributorDelete
)
Expand All @@ -20,8 +20,8 @@
def user():
return AuthUserFactory(given_name='Dawn')


class TestDraftContributorDetail(TestContributorDetail):
@pytest.mark.django_db
class TestDraftContributorDetail(ContributorDetailMixin):
@pytest.fixture()
def project_public(self, user, title, description, category):
# Defining "project public" as a draft reg, overriding TestContributorDetail
Expand Down
7 changes: 4 additions & 3 deletions api_tests/nodes/views/test_node_contributors_detail.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
from website.project.signals import contributor_removed


@pytest.mark.django_db
@pytest.mark.enable_implicit_clean
class TestContributorDetail:
class ContributorDetailMixin:

@pytest.fixture()
def user(self):
Expand Down Expand Up @@ -68,6 +66,9 @@ def url_public(self, user, project_public):
def url_private(self, node, user_id):
return f'/{API_BASE}nodes/{node._id}/contributors/{user_id}/'

@pytest.mark.django_db
@pytest.mark.enable_implicit_clean
class TestContributorDetail(ContributorDetailMixin):
def test_get_public_contributor_detail(self, app, user, project_public, project_private, url_public):
res = app.get(url_public)
assert res.status_code == 200
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
from api_tests.utils import disconnected_from_listeners
from website.project.signals import contributor_removed


@pytest.fixture()
def user(self):
def user():
return AuthUserFactory()

@pytest.mark.django_db
Expand Down

0 comments on commit 583d9c2

Please sign in to comment.