Skip to content

Commit

Permalink
Use RequestFactory instead of HttpRequest.
Browse files Browse the repository at this point in the history
  • Loading branch information
dianakhuang committed Mar 31, 2020
1 parent 522fec5 commit adb400c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion organizations/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def get_actions(self, request):
actions = super(OrganizationAdmin, self).get_actions(request)

# Remove the delete action.
del actions['delete_selected']
if 'delete_selected' in actions:
del actions['delete_selected']

return actions

Expand Down
9 changes: 6 additions & 3 deletions organizations/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
from __future__ import unicode_literals
from django.contrib.admin.sites import AdminSite
from django.contrib.messages.storage.fallback import FallbackStorage
from django.http import HttpRequest
from django.test import RequestFactory

import organizations.tests.utils as utils
from organizations.admin import OrganizationAdmin, OrganizationCourseAdmin
from organizations.models import Organization, OrganizationCourse
from organizations.tests.factories import UserFactory


def create_organization(active=True):
Expand All @@ -29,9 +30,11 @@ class OrganizationsAdminTestCase(utils.OrganizationsTestCaseBase):

def setUp(self):
super(OrganizationsAdminTestCase, self).setUp()
self.request = HttpRequest()
self.org_admin = OrganizationAdmin(Organization, AdminSite())
self.request = RequestFactory().get('/admin')
self.admin_user = UserFactory(is_staff=True)
self.request.session = 'session'
self.request.user = self.admin_user
self.request._messages = FallbackStorage(self.request) # pylint: disable=protected-access

def test_default_fields(self):
Expand Down Expand Up @@ -98,7 +101,7 @@ class OrganizationCourseAdminTestCase(utils.OrganizationsTestCaseBase):

def setUp(self):
super(OrganizationCourseAdminTestCase, self).setUp()
self.request = HttpRequest()
self.request = RequestFactory().get('')
self.org_course_admin = OrganizationCourseAdmin(OrganizationCourse, AdminSite())

def test_foreign_key_field_active_choices(self):
Expand Down

0 comments on commit adb400c

Please sign in to comment.