summaryrefslogtreecommitdiff
path: root/tests/admin_inlines
diff options
context:
space:
mode:
authorAkshesh <aksheshdoshi@gmail.com>2016-02-07 07:54:36 +0530
committerSimon Charette <charette.s@gmail.com>2016-03-15 13:10:32 -0400
commit44c0ecdd9226d039a8c666b36ae320af2046a1c1 (patch)
tree0bb97b72359a18c7f1ef39ebd9239ef5ee62dc5f /tests/admin_inlines
parent93a135d111c2569d88d65a3f4ad9e6d9ad291452 (diff)
Fixed #25364 -- Added generic way to test on all browsers supported by selenium.
Browser names should be passed as a comma separated list to the --selenium flag. Thanks Tim Graham, Simon Charette and Moritz Sichert for review and discussion.
Diffstat (limited to 'tests/admin_inlines')
-rw-r--r--tests/admin_inlines/tests.py15
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index 7ea08d1a40..9a3dc4888a 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.contrib.admin import ModelAdmin, TabularInline
from django.contrib.admin.helpers import InlineAdminForm
-from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
+from django.contrib.admin.tests import AdminSeleniumTestCase
from django.contrib.auth.models import Permission, User
from django.contrib.contenttypes.models import ContentType
from django.test import RequestFactory, TestCase, override_settings
@@ -688,10 +688,9 @@ class TestInlinePermissions(TestCase):
@override_settings(ROOT_URLCONF='admin_inlines.urls')
-class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
+class SeleniumTests(AdminSeleniumTestCase):
- available_apps = ['admin_inlines'] + AdminSeleniumWebDriverTestCase.available_apps
- webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
+ available_apps = ['admin_inlines'] + AdminSeleniumTestCase.available_apps
def setUp(self):
User.objects.create_superuser(username='super', password='secret', email='super@example.com')
@@ -871,11 +870,3 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
self.wait_until_visible(field_name)
hide_links[hide_index].click()
self.wait_until_invisible(field_name)
-
-
-class SeleniumChromeTests(SeleniumFirefoxTests):
- webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
-
-
-class SeleniumIETests(SeleniumFirefoxTests):
- webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'