From 5f5834aeffe7c8b5aadce66b5da616bc37db00bd Mon Sep 17 00:00:00 2001 From: Andres Torres Date: Tue, 6 Jun 2017 10:59:09 -0500 Subject: [PATCH 1/2] Removing authtoken from the django admin --- rest_framework/authtoken/admin.py | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 rest_framework/authtoken/admin.py diff --git a/rest_framework/authtoken/admin.py b/rest_framework/authtoken/admin.py deleted file mode 100644 index 1a507249b..000000000 --- a/rest_framework/authtoken/admin.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.contrib import admin - -from rest_framework.authtoken.models import Token - - -class TokenAdmin(admin.ModelAdmin): - list_display = ('key', 'user', 'created') - fields = ('user',) - ordering = ('-created',) - - -admin.site.register(Token, TokenAdmin) From 6d12e7a367f37e48f072a92464e05128a0dab892 Mon Sep 17 00:00:00 2001 From: Andres Torres Date: Tue, 6 Jun 2017 11:13:08 -0500 Subject: [PATCH 2/2] Fixing tests --- tests/test_authtoken.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/test_authtoken.py b/tests/test_authtoken.py index 54ac1848d..c9d695210 100644 --- a/tests/test_authtoken.py +++ b/tests/test_authtoken.py @@ -1,9 +1,7 @@ import pytest -from django.contrib.admin import site from django.contrib.auth.models import User from django.test import TestCase -from rest_framework.authtoken.admin import TokenAdmin from rest_framework.authtoken.models import Token from rest_framework.authtoken.serializers import AuthTokenSerializer from rest_framework.exceptions import ValidationError @@ -12,15 +10,9 @@ from rest_framework.exceptions import ValidationError class AuthTokenTests(TestCase): def setUp(self): - self.site = site self.user = User.objects.create_user(username='test_user') self.token = Token.objects.create(key='test token', user=self.user) - def test_model_admin_displayed_fields(self): - mock_request = object() - token_admin = TokenAdmin(self.token, self.site) - assert token_admin.get_fields(mock_request) == ('user',) - def test_token_string_representation(self): assert str(self.token) == 'test token'