Skip to content

Commit

Permalink
Sync diff between #10739 and #1068
Browse files Browse the repository at this point in the history
  • Loading branch information
cslzchen committed Sep 6, 2024
1 parent 77c297e commit 7f2b2c3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion api/base/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from framework.auth.cas import CasResponse

from osf.models import ApiOAuth2Application, ApiOAuth2PersonalToken
from osf.utils import permissions as osf_permissions
from website.util.sanitize import is_iterable_but_not_string
from api.base.utils import get_user_auth

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ def preprint(self, user):
preprint.add_contributor(user, READ)
return preprint


@pytest.fixture()
def url(self, preprint):
return f'/{API_BASE}preprints/{preprint._id}/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ def institution_E(self):
def institution_F(self):
return InstitutionFactory()


@pytest.fixture()
def admin_with_institutional_affiliation(self, institution_A, institution_B, institution_C, preprint):
def admin_with_institutional_affiliation(self, institution_A, institution_B, institution_C, preprint):
user = AuthUserFactory()
preprint.add_contributor(user, permissions=ADMIN)
user.add_or_update_affiliated_institution(institution_A)
Expand Down

0 comments on commit 7f2b2c3

Please sign in to comment.