Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Made the Selenium tests for the admin horizontal/vertical filter widg…

…ets a bit more thorough.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 794fe19e196b98533ee539d35fd7ab7f688166b7 1 parent 4dca9d1
@jphalip jphalip authored
Showing with 25 additions and 5 deletions.
  1. +25 −5 tests/regressiontests/admin_widgets/tests.py
View
30 tests/regressiontests/admin_widgets/tests.py
@@ -624,7 +624,8 @@ def test_filter(self):
for field_name in ['students', 'alumni']:
from_box = '#id_%s_from' % field_name
to_box = '#id_%s_to' % field_name
- choose_link = 'id_%s_add_link' % field_name
+ choose_link = '#id_%s_add_link' % field_name
+ remove_link = '#id_%s_remove_link' % field_name
input = self.selenium.find_element_by_css_selector('#id_%s_input' % field_name)
# Initial values
@@ -648,21 +649,40 @@ def test_filter(self):
str(self.cliff.id), str(self.jason.id),
str(self.jenny.id), str(self.john.id)])
+ # -----------------------------------------------------------------
# Check that chosing a filtered option sends it properly to the
# 'to' box.
input.send_keys('a')
self.assertSelectOptions(from_box, [str(self.arthur.id), str(self.jason.id)])
self.get_select_option(from_box, str(self.jason.id)).click()
- self.selenium.find_element_by_id(choose_link).click()
+ self.selenium.find_element_by_css_selector(choose_link).click()
self.assertSelectOptions(from_box, [str(self.arthur.id)])
+ self.assertSelectOptions(to_box,
+ [str(self.lisa.id), str(self.peter.id),
+ str(self.jason.id)])
+
+ self.get_select_option(to_box, str(self.lisa.id)).click()
+ self.selenium.find_element_by_css_selector(remove_link).click()
+ self.assertSelectOptions(from_box,
+ [str(self.arthur.id), str(self.lisa.id)])
+ self.assertSelectOptions(to_box,
+ [str(self.peter.id), str(self.jason.id)])
+
input.send_keys([Keys.BACK_SPACE]) # Clear text box
self.assertSelectOptions(from_box,
[str(self.arthur.id), str(self.bob.id),
str(self.cliff.id), str(self.jenny.id),
- str(self.john.id)])
+ str(self.john.id), str(self.lisa.id)])
self.assertSelectOptions(to_box,
- [str(self.lisa.id), str(self.peter.id),
- str(self.jason.id)])
+ [str(self.peter.id), str(self.jason.id)])
+
+ # Save and check that everything is properly stored in the database ---
+ self.selenium.find_element_by_xpath('//input[@value="Save"]').click()
+ self.school = models.School.objects.get(id=self.school.id) # Reload from database
+ self.assertEqual(list(self.school.students.all()),
+ [self.jason, self.peter])
+ self.assertEqual(list(self.school.alumni.all()),
+ [self.jason, self.peter])
class HorizontalVerticalFilterSeleniumChromeTests(HorizontalVerticalFilterSeleniumFirefoxTests):
webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
Please sign in to comment.
Something went wrong with that request. Please try again.