Remove unecessary WebTest dependency

relatives/tests/tests.py

@@ -3,7 +3,6 @@
 from django.template.loader import render_to_string
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
-from django_webtest import WebTest
 
 from relatives.utils import edit_link
 from .models import (Pirate, Pet, Ship, Sailor, Movie, Actor, NotInAdmin,
@@ -26,48 +25,45 @@ def test_no_primary_key(self):
         self.assertEqual(edit_link(ship), "Star of India")
 
 
-class TemplateFilterTest(WebTest):
+class TemplateFilterTest(TestCase):
     def setUp(self):
         self.user = User.objects.create_superuser('u', 'u@example.com', 'pass')
 
     def login(self):
-        form = self.app.get(reverse('admin:index')).form
-        form['username'] = self.user.username
-        form['password'] = 'pass'
-        return form.submit()
+        self.client.login(username=self.user.username, password='pass')
 
     def test_foreign_key(self):
         self.login()
         ship = Ship.objects.create(id=1, name="Star of India")
         sailor = Sailor.objects.create(name="John Ford", ship=ship)
-        response = self.app.get(reverse('admin:tests_sailor_change',
-                                        args=[sailor.id]))
-        self.assertIn('<a href="/adm/tests/ship/1/">Star of India</a>',
-                      response.unicode_normal_body)
+        response = self.client.get(reverse('admin:tests_sailor_change',
+                                           args=[sailor.id]))
+        self.assertIn(b'<a href="/adm/tests/ship/1/">Star of India</a>',
+                      response.content)
 
     def test_no_foreign_key(self):
         self.login()
         ship = Ship.objects.create(id=1, name="Star of India")
-        response = self.app.get(reverse('admin:tests_ship_change',
-                                        args=[ship.id]))
-        self.assertIn('<p>Star of India</p>', response.unicode_normal_body)
+        response = self.client.get(reverse('admin:tests_ship_change',
+                                           args=[ship.id]))
+        self.assertIn(b'<p>Star of India</p>', response.content)
 
     def test_foreign_key_without_admin_url(self):
         self.login()
         pirate = Pirate.objects.create(id=1, name="Kristi Bell")
         pet = Pet.objects.create(owner=pirate)
-        response = self.app.get(reverse('admin:tests_pet_change',
-                                        args=[pet.id]))
-        self.assertIn('Kristi Bell', response.unicode_normal_body)
-        self.assertNotIn('Kristi Bell</a>', response.unicode_normal_body)
-        self.assertNotIn('Kristi Bell</option>', response.unicode_normal_body)
+        response = self.client.get(reverse('admin:tests_pet_change',
+                                           args=[pet.id]))
+        self.assertIn(b'Kristi Bell', response.content)
+        self.assertNotIn(b'Kristi Bell</a>', response.content)
+        self.assertNotIn(b'Kristi Bell</option>', response.content)
 
     def test_nullable_foreign_key(self):
         self.login()
         sailor = Sailor.objects.create(name="John Ford")
-        response = self.app.get(reverse('admin:tests_sailor_change',
-                                        args=[sailor.id]))
-        self.assertIn('(None)', response.unicode_normal_body)
+        response = self.client.get(reverse('admin:tests_sailor_change',
+                                           args=[sailor.id]))
+        self.assertIn(b'(None)', response.content)
 
 
 class RelatedObjectsTagTest(TestCase):

setup.py

@@ -16,7 +16,7 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=['Django >= 1.4.2'],
-    tests_require=['Django >= 1.4.2', 'webtest', 'django-webtest'],
+    tests_require=['Django >= 1.4.2'],
     test_suite='runtests.runtests',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',

tox.ini

@@ -46,7 +46,6 @@ deps =
 basepython = python2.6
 deps =
     https://github.com/django/django/tarball/master
-    https://github.com/mbraak/django-webtest/tarball/django1.6
     coverage == 3.6
 
 
@@ -66,7 +65,6 @@ deps =
 basepython = python2.7
 deps =
     https://github.com/django/django/tarball/master
-    https://github.com/mbraak/django-webtest/tarball/django1.6
     coverage == 3.6
 
 
@@ -80,7 +78,6 @@ deps =
 basepython = python3.2
 deps =
     https://github.com/django/django/tarball/master
-    https://github.com/mbraak/django-webtest/tarball/django1.6
     coverage == 3.6
 
 
@@ -95,5 +92,4 @@ deps =
 basepython = python3.3
 deps =
     https://github.com/django/django/tarball/master
-    https://github.com/mbraak/django-webtest/tarball/django1.6
     coverage == 3.6