Hopiu/django-axes
1
0
Fork 0
mirror of https://github.com/jazzband/django-axes.git synced 2026-05-01 12:14:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing tests for django 1.7

Browse source
This commit is contained in:
Andrew Crosio 2014-04-25 14:55:58 +04:00
parent cdb1866cbb
commit 298ba366b8
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
axes/decorators.py
View file

@ -62,7 +62,6 @@ IP_BLACKLIST = getattr(settings, 'AXES_IP_BLACKLIST', None)
ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. "
"Note that both fields are case-sensitive.")
LOGIN_FORM_KEY = 'this_is_the_login_form'
def get_ip(request):

19
axes/tests.py
View file

@ -5,15 +5,24 @@ import time
from django.test import TestCase
from django.test.client import Client
from django.contrib.auth.models import User
from django.core.urlresolvers import NoReverseMatch
from django.core.urlresolvers import reverse
from axes.decorators import COOLOFF_TIME
from axes.decorators import FAILURE_LIMIT
from axes.decorators import LOGIN_FORM_KEY
from axes.models import AccessLog
from axes.utils import reset
# Django >= 1.7 compatibility
try:
ADMIN_LOGIN_URL = reverse('admin:login')
LOGIN_FORM_KEY = '<form action="/admin/login/" method="post" id="login-form">'
except NoReverseMatch:
ADMIN_LOGIN_URL = reverse('admin:index')
LOGIN_FORM_KEY = 'this_is_the_login_form'
class AccessAttemptTest(TestCase):
"""Test case using custom settings for testing
"""
@ -35,7 +44,7 @@ class AccessAttemptTest(TestCase):
return self._generate_random_string()
def _login(self, existing_username=False, user_agent='test-browser'):
response = self.client.post(reverse('admin:index'), {
response = self.client.post(ADMIN_LOGIN_URL, {
'username': self._random_username(existing_username),
'password': self._generate_random_string(),
'this_is_the_login_form': 1,
@ -102,7 +111,7 @@ class AccessAttemptTest(TestCase):
"""Tests a valid login for a real username
"""
valid_username = self._random_username(existing_username=True)
response = self.client.post(reverse('admin:index'), {
response = self.client.post(ADMIN_LOGIN_URL, {
'username': valid_username,
'password': valid_username,
'this_is_the_login_form': 1,
@ -122,7 +131,7 @@ class AccessAttemptTest(TestCase):
def _unsuccessful_login(self, username):
c = Client()
response = c.post('/admin/', {
response = c.post(ADMIN_LOGIN_URL, {
'username': username,
'password': 'wrong',
'this_is_the_login_form': 1,
@ -167,7 +176,7 @@ class AccessAttemptTest(TestCase):
"""Tests a valid logout and make sure the logout_time is updated
"""
valid_username = self._random_username(existing_username=True)
response = self.client.post(reverse('admin:index'), {
self.client.post(ADMIN_LOGIN_URL, {
'username': valid_username,
'password': valid_username,
'this_is_the_login_form': 1,