Skip to content

Fix for issue #65 - ElementFinder.find should return [] when WebDriver.find* returns None #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ombre42 wants to merge 1 commit into from
Closed

Fix for issue #65 - ElementFinder.find should return [] when WebDriver.find* returns None #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Selenium2Library/locators/elementfinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def find(self, browser, locator, tag=None):
# Strategy routines, private

def _find_by_identifier(self, browser, criteria, tag, constraints):
elements = browser.find_elements_by_id(criteria)
elements.extend(browser.find_elements_by_name(criteria))
elements = browser.find_elements_by_id(criteria) or []
elements.extend(browser.find_elements_by_name(criteria) or [])
return self._filter_elements(elements, tag, constraints)

def _find_by_id(self, browser, criteria, tag, constraints):
Expand Down Expand Up @@ -92,7 +92,7 @@ def _find_by_key_attrs(self, browser, criteria, tag, constraints):
' and '.join(xpath_constraints) + ' and ' if len(xpath_constraints) > 0 else '',
' or '.join(xpath_searchers))

return browser.find_elements_by_xpath(xpath)
return browser.find_elements_by_xpath(xpath) or []

# Private

Expand Down Expand Up @@ -138,6 +138,7 @@ def _element_matches(self, element, tag, constraints):
return True

def _filter_elements(self, elements, tag, constraints):
if elements is None: elements = []
if tag is None: return elements
return filter(
lambda element: self._element_matches(element, tag, constraints),
Expand Down
9 changes: 9 additions & 0 deletions test/unit/locators/test_elementfinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,15 @@ def test_find_by_id_with_synonym_and_constraints(self):
result = finder.find(browser, "id=test1", tag='file upload')
self.assertEqual(result, [elements[7]])

def test_webdriver_find_returns_none(self):
finder = ElementFinder()
browser = mock()

for locator in ("identifier=it", "id=it", "name=it", "xpath=//div", "dom=document.images[1]", "link=it", "css=div.it",
"tag=div", "default"):
result = finder.find(browser, locator)
self.assertEqual(result, [])

def _make_mock_elements(self, *tags):
elements = []
for tag in tags:
Expand Down