Skip to content

Tweak feedback tests to ensure feature flags are set. #4662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtibbles merged 1 commit into from
Aug 20, 2024
Merged

Tweak feedback tests to ensure feature flags are set. #4662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions contentcuration/contentcuration/tests/testdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,9 @@ def user(email='user@test.com', feature_flags=None):
if is_new:
user.set_password('password')
user.is_active = True
if feature_flags is not None:
user.feature_flags = feature_flags
user.save()
if feature_flags is not None:
user.feature_flags = feature_flags
user.save()
return user

Expand Down
8 changes: 7 additions & 1 deletion contentcuration/contentcuration/viewsets/feedback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


class IsAdminForListAndDestroy(permissions.BasePermission):
def has_permission(self, request, view):
def _check_admin_or_feature_flag(self, request, view):
# only allow list and destroy of flagged content to admins
if view.action in ['list', 'destroy', 'retrieve']:
try:
Expand All @@ -18,6 +18,12 @@ def has_permission(self, request, view):
return True
return False

def has_permission(self, request, view):
return self._check_admin_or_feature_flag(request, view)

def has_object_permission(self, request, view, obj):
return self._check_admin_or_feature_flag(request, view)


class BaseFeedbackSerializer(serializers.ModelSerializer):
class Meta:
Expand Down