mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-08-04 12:30:11 +03:00
Merge 6d12e7a367
into 836e49b535
This commit is contained in:
commit
cd1b8b2c8a
|
@ -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)
|
|
|
@ -1,9 +1,7 @@
|
||||||
import pytest
|
import pytest
|
||||||
from django.contrib.admin import site
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from rest_framework.authtoken.admin import TokenAdmin
|
|
||||||
from rest_framework.authtoken.models import Token
|
from rest_framework.authtoken.models import Token
|
||||||
from rest_framework.authtoken.serializers import AuthTokenSerializer
|
from rest_framework.authtoken.serializers import AuthTokenSerializer
|
||||||
from rest_framework.exceptions import ValidationError
|
from rest_framework.exceptions import ValidationError
|
||||||
|
@ -12,15 +10,9 @@ from rest_framework.exceptions import ValidationError
|
||||||
class AuthTokenTests(TestCase):
|
class AuthTokenTests(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.site = site
|
|
||||||
self.user = User.objects.create_user(username='test_user')
|
self.user = User.objects.create_user(username='test_user')
|
||||||
self.token = Token.objects.create(key='test token', user=self.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):
|
def test_token_string_representation(self):
|
||||||
assert str(self.token) == 'test token'
|
assert str(self.token) == 'test token'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user