p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #31042 -- Removed AdminSeleniumTestCase.get_css_value() in favor of Selenium .is_displayed(). 

All instances of AdminSeleniumTestCase.get_css_value() were used to
inspect the display property.
This commit is contained in:
Jon Dufresne 2019-11-28 06:10:13 -08:00 committed by Carlton Gibson
parent 875e3ff4fd
commit c8bd37a860
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/admin/tests.py
View File

@ -133,14 +133,6 @@ class AdminSeleniumTestCase(SeleniumTestCase, StaticLiveServerTestCase):
with self.wait_page_loaded(): with self.wait_page_loaded():
self.selenium.find_element_by_xpath('//input[@value="%s"]' % login_text).click() self.selenium.find_element_by_xpath('//input[@value="%s"]' % login_text).click()
def get_css_value(self, selector, attribute):
"""
Return the value for the CSS attribute of a DOM element specified by
the given selector. Uses the jQuery that ships with Django.
"""
return self.selenium.execute_script(
'return django.jQuery("%s").css("%s")' % (selector, attribute))
def select_option(self, selector, value): def select_option(self, selector, value):
""" """
Select the <OPTION> with the value `value` inside the <SELECT> widget Select the <OPTION> with the value `value` inside the <SELECT> widget

16
tests/admin_widgets/tests.py
View File

@ -743,19 +743,19 @@ class DateTimePickerSeleniumTests(AdminWidgetSeleniumTestCase):
# First, with the date picker widget --------------------------------- # First, with the date picker widget ---------------------------------
cal_icon = self.selenium.find_element_by_id('calendarlink0') cal_icon = self.selenium.find_element_by_id('calendarlink0')
# The date picker is hidden # The date picker is hidden
self.assertEqual(self.get_css_value('#calendarbox0', 'display'), 'none') self.assertFalse(self.selenium.find_element_by_id('calendarbox0').is_displayed())
# Click the calendar icon # Click the calendar icon
cal_icon.click() cal_icon.click()
# The date picker is visible # The date picker is visible
self.assertEqual(self.get_css_value('#calendarbox0', 'display'), 'block') self.assertTrue(self.selenium.find_element_by_id('calendarbox0').is_displayed())
# Press the ESC key # Press the ESC key
self.selenium.find_element_by_tag_name('body').send_keys([Keys.ESCAPE]) self.selenium.find_element_by_tag_name('body').send_keys([Keys.ESCAPE])
# The date picker is hidden again # The date picker is hidden again
self.assertEqual(self.get_css_value('#calendarbox0', 'display'), 'none') self.assertFalse(self.selenium.find_element_by_id('calendarbox0').is_displayed())
# Click the calendar icon, then on the 15th of current month # Click the calendar icon, then on the 15th of current month
cal_icon.click() cal_icon.click()
self.selenium.find_element_by_xpath("//a[contains(text(), '15')]").click() self.selenium.find_element_by_xpath("//a[contains(text(), '15')]").click()
self.assertEqual(self.get_css_value('#calendarbox0', 'display'), 'none') self.assertFalse(self.selenium.find_element_by_id('calendarbox0').is_displayed())
self.assertEqual( self.assertEqual(
self.selenium.find_element_by_id('id_birthdate_0').get_attribute('value'), self.selenium.find_element_by_id('id_birthdate_0').get_attribute('value'),
datetime.today().strftime('%Y-%m-') + '15', datetime.today().strftime('%Y-%m-') + '15',
@ -764,11 +764,11 @@ class DateTimePickerSeleniumTests(AdminWidgetSeleniumTestCase):
# Then, with the time picker widget ---------------------------------- # Then, with the time picker widget ----------------------------------
time_icon = self.selenium.find_element_by_id('clocklink0') time_icon = self.selenium.find_element_by_id('clocklink0')
# The time picker is hidden # The time picker is hidden
self.assertEqual(self.get_css_value('#clockbox0', 'display'), 'none') self.assertFalse(self.selenium.find_element_by_id('clockbox0').is_displayed())
# Click the time icon # Click the time icon
time_icon.click() time_icon.click()
# The time picker is visible # The time picker is visible
self.assertEqual(self.get_css_value('#clockbox0', 'display'), 'block') self.assertTrue(self.selenium.find_element_by_id('clockbox0').is_displayed())
self.assertEqual( self.assertEqual(
[ [
x.text for x in x.text for x in
@ -779,11 +779,11 @@ class DateTimePickerSeleniumTests(AdminWidgetSeleniumTestCase):
# Press the ESC key # Press the ESC key
self.selenium.find_element_by_tag_name('body').send_keys([Keys.ESCAPE]) self.selenium.find_element_by_tag_name('body').send_keys([Keys.ESCAPE])
# The time picker is hidden again # The time picker is hidden again
self.assertEqual(self.get_css_value('#clockbox0', 'display'), 'none') self.assertFalse(self.selenium.find_element_by_id('clockbox0').is_displayed())
# Click the time icon, then select the 'Noon' value # Click the time icon, then select the 'Noon' value
time_icon.click() time_icon.click()
self.selenium.find_element_by_xpath("//a[contains(text(), 'Noon')]").click() self.selenium.find_element_by_xpath("//a[contains(text(), 'Noon')]").click()
self.assertEqual(self.get_css_value('#clockbox0', 'display'), 'none') self.assertFalse(self.selenium.find_element_by_id('clockbox0').is_displayed())
self.assertEqual( self.assertEqual(
self.selenium.find_element_by_id('id_birthdate_1').get_attribute('value'), self.selenium.find_element_by_id('id_birthdate_1').get_attribute('value'),
'12:00:00', '12:00:00',