Converted test fixtures to setUpTestData methods (39a7eed1) · Commits · Dom Sekotill / django

tests/admin_changelist/fixtures/users.json

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		[
		{
		"pk": 100,
		"model": "auth.user",
		"fields": {
		"username": "super",
		"first_name": "Super",
		"last_name": "User",
		"is_active": true,
		"is_superuser": true,
		"is_staff": true,
		"last_login": "2007-05-30 13:20:10",
		"groups": [],
		"user_permissions": [],
		"password": "sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158",
		"email": "super@example.com",
		"date_joined": "2007-05-30 13:20:10"
		}
		}
		]

tests/admin_changelist/tests.py

+10 −1

Original line number	Diff line number	Diff line
		@@ -672,9 +672,18 @@ class AdminLogNodeTestCase(TestCase):
		class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):

		available_apps = ['admin_changelist'] + AdminSeleniumWebDriverTestCase.available_apps
		fixtures = ['users.json']
		webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'

		@classmethod
		def setUpTestData(cls):
		# password = "secret"
		User.objects.create(
		pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',
		password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,
		is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),
		date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
		)

		def test_add_row_selection(self):
		"""
		Ensure that the status line for selected rows gets updated correcly (#22038)

tests/admin_custom_urls/fixtures/actions.json

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		[
		{
		"pk": "delete",
		"model": "admin_custom_urls.action",
		"fields": {
		"description": "Remove things."
		}
		},
		{
		"pk": "rename",
		"model": "admin_custom_urls.action",
		"fields": {
		"description": "Gives things other names."
		}
		},
		{
		"pk": "add",
		"model": "admin_custom_urls.action",
		"fields": {
		"description": "Add things."
		}
		},
		{
		"pk": "path/to/file/",
		"model": "admin_custom_urls.action",
		"fields": {
		"description": "An action with '/' in its name."
		}
		},
		{
		"pk": "path/to/html/document.html",
		"model": "admin_custom_urls.action",
		"fields": {
		"description": "An action with a name similar to a HTML doc path."
		}
		},
		{
		"pk": "javascript:alert('Hello world');\">Click here</a>",
		"model": "admin_custom_urls.action",
		"fields": {
		"description": "An action with a name suspected of being a XSS attempt"
		}
		}
		]

tests/admin_custom_urls/fixtures/users.json

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		[
		{
		"pk": 100,
		"model": "auth.user",
		"fields": {
		"username": "super",
		"first_name": "Super",
		"last_name": "User",
		"is_active": true,
		"is_superuser": true,
		"is_staff": true,
		"last_login": "2007-05-30 13:20:10",
		"groups": [],
		"user_permissions": [],
		"password": "sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158",
		"email": "super@example.com",
		"date_joined": "2007-05-30 13:20:10"
		}
		}
		]

tests/admin_custom_urls/tests.py

+25 −10

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		import datetime

		from django.contrib.admin.utils import quote
		from django.contrib.auth.models import User
		from django.core.urlresolvers import reverse
		from django.template.response import TemplateResponse
		from django.test import TestCase, override_settings
		@@ -17,7 +20,28 @@ class AdminCustomUrlsTest(TestCase):
		* The ModelAdmin for Action customizes the add_view URL, it's
		'<app name>/<model name>/!add/'
		"""
		fixtures = ['users.json', 'actions.json']

		@classmethod
		def setUpTestData(cls):
		# password = "secret"
		User.objects.create(
		pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',
		password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,
		is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),
		date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
		)
		Action.objects.create(name='delete', description='Remove things.')
		Action.objects.create(name='rename', description='Gives things other names.')
		Action.objects.create(name='add', description='Add things.')
		Action.objects.create(name='path/to/file/', description="An action with '/' in its name.")
		Action.objects.create(
		name='path/to/html/document.html',
		description='An action with a name similar to a HTML doc path.'
		)
		Action.objects.create(
		name='javascript:alert(\'Hello world\');">Click here</a>',
		description='An action with a name suspected of being a XSS attempt'
		)

		def setUp(self):
		self.client.login(username='super', password='secret')
		@@ -76,15 +100,6 @@ class AdminCustomUrlsTest(TestCase):
		self.assertContains(response, 'Change action')
		self.assertContains(response, 'value="path/to/html/document.html"')


		@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
		ROOT_URLCONF='admin_custom_urls.urls',)
		class CustomRedirects(TestCase):
		fixtures = ['users.json', 'actions.json']

		def setUp(self):
		self.client.login(username='super', password='secret')

		def test_post_save_add_redirect(self):
		"""
		Ensures that ModelAdmin.response_post_save_add() controls the