Skip to content

Fix for #372 #380

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

Merged
just-be-dev merged 2 commits into from
May 5, 2015
Merged

Fix for #372 #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670d050
Fix for #372
just-be-dev Apr 28, 2015
b735f28
Fixed test, updated changelog
just-be-dev Apr 28, 2015
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
3 changes: 2 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Release Notes
known browser and python version noncritical. Also added a noncritical case to the
travis config for situations where testing is failing on travis for an unknown reason.
- 'Capture Screenshot' now attempts to create its containing directory if the directory
specified in the filename does not exist.
specified in the filename does not exist.
- 'Choose File' now fails if the file doesn't exist
[zephraph]

- Added 'Get Window Position' and 'Set Window Position' keywords matching the
Expand Down
2 changes: 1 addition & 1 deletion src/Selenium2Library/keywords/_formelement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def choose_file(self, locator, file_path):
| Choose File | my_upload_field | /home/user/files/trades.csv |
"""
if not os.path.isfile(file_path):
self._info("File '%s' does not exist on the local file system"
raise AssertionError("File '%s' does not exist on the local file system"
% file_path)
self._element_find(locator, True, True).send_keys(file_path)

Expand Down
5 changes: 2 additions & 3 deletions test/acceptance/keywords/forms_and_buttons.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ Click button created with <button> by tag content

Choose File
[Setup] Navigate To File Upload Form And Create Temp File To Upload
Choose File file_to_upload ${TEMPDIR}${/}temp.txt
Choose File file_to_upload ${CURDIR}${/}temp.txt
${dep_browser}= Set Variable If '${BROWSER}'.lower() == 'ff' or '${BROWSER}'.lower() == 'firefox' temp.txt C:\\fakepath\\temp.txt #Needs to be checked in Windows and OS X
Textfield Value Should Be name= file_to_upload ${dep_browser}
[Teardown] Remove File ${TEMPDIR}${/}temp.txt
[Teardown] Remove File ${CURDIR}${/}temp.txt

Click Image With Submit Type Images
[Setup] Go To Page "forms/form_with_image_submit.html"
Expand All @@ -73,4 +73,3 @@ Navigate To File Upload Form And Create Temp File To Upload
Cannot Be Executed in IE
Go To Page "forms/file_upload_form.html"
Touch ${CURDIR}${/}temp.txt