Skip to content

Commit 6bbc537

Browse files
authored
Merge pull request #69 from seleniumbase/framework-updates
Framework updates
2 parents 3f60c2e + 195004b commit 6bbc537

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SeleniumBase makes it easy to automate tedious business tasks. (*To learn about
3333

3434
(NOTE: Firefox versions 47.0 and above are no longer compatible with normal Selenium WebDriver. [Get Firefox 46.*](https://ftp.mozilla.org/pub/firefox/releases/46.0.1/) instead, or you can [Get Firefox ESR](https://www.mozilla.org/en-US/firefox/organizations/). (If you go with Firefox 46.*, make sure to turn off auto-updates or else you'll be back at v47 quickly!) For more information regarding this, [read this post](http://stackoverflow.com/questions/37693106/selenium-2-53-not-working-on-firefox-47) from Stack Overflow. There's a [new version of Firefox driver](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/WebDriver) coming soon.
3535

36-
* If you want to run automation on browsers other than Firefox, you'll need to download [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads), [PhantomJS](http://phantomjs.org/download.html), and [Edge Driver (Microsoft WebDriver)](https://www.microsoft.com/en-us/download/details.aspx?id=48212) separately. (Firefox drivers come with Selenium by default.)
36+
* If you want to run automation on browsers other than Firefox, you'll need to download [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads), [PhantomJS](http://phantomjs.org/download.html), [Edge Driver (Microsoft WebDriver)](https://www.microsoft.com/en-us/download/details.aspx?id=48212), and/or [Safari Driver](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/using_safari_driver.md) separately. (Firefox drivers come with Selenium by default.)
3737

3838
* For everything you download (such as ``pip`` and ``Chromedriver``) make sure those files get on your system [PATH](http://java.com/en/download/help/path.xml). (``Environmental Variables`` on a Windows machine)
3939

help_docs/using_safari_driver.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
### Info about using Safari Driver for running automated tests on a MAC
2+
3+
(NOTE: SafariDriver requires Safari 10 running on OSX El Capitan or greater)
4+
5+
You can find a nice overview on using Safari Driver [here on GitHub](https://github.com/SeleniumHQ/selenium/wiki/SafariDriver).
6+
7+
That above link will tell you to [download the required Safari Driver browser extension (SafariDriver.safariextz) here at this link](http://selenium-release.storage.googleapis.com/index.html?path=2.48/).
8+
9+
For that to work, you'll need to [download the Standalone Selenium Server from here](http://docs.seleniumhq.org/download/) and put that JAR file in ``/usr/local/bin/``. To make the next step easier, rename the downloaded JAR file to ``selenium-server-standalone.jar`` (if it's not already called that).
10+
11+
Next, configure the Selenium Server JAR file into your PATH like this:
12+
13+
```bash
14+
export SELENIUM_SERVER_JAR=/usr/local/bin/selenium-server-standalone.jar
15+
export PATH=$PATH:/usr/local/bin/selenium-server-standalone.jar
16+
```
17+
18+
Now you're ready to run automated tests on Safari if you use ``--browser=safari`` on the command line when running your tests/scripts with SeleniumBase.

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pip>=8.1.2
2-
setuptools>=27.3.0
2+
setuptools>=28.2.0
33
selenium>=2.53.6
44
nose>=1.3.7
55
pytest>=3.0.2
@@ -12,6 +12,6 @@ unittest2==1.1.0
1212
chardet==2.3.0
1313
simplejson==3.8.2
1414
boto==2.42.0
15-
ipdb==0.10.1
15+
ipdb==0.9.4
1616
pyvirtualdisplay==0.2
1717
-e .

seleniumbase/fixtures/base_case.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ def download_file(self, file_url, destination_folder=None):
389389
if not destination_folder:
390390
destination_folder = constants.Files.DOWNLOADS_FOLDER
391391
page_utils._download_file_to(file_url, destination_folder)
392-
return True
393392

394393
def save_file_as(self, file_url, new_file_name, destination_folder=None):
395394
""" Similar to self.download_file(), except that you get to rename the
@@ -398,7 +397,6 @@ def save_file_as(self, file_url, new_file_name, destination_folder=None):
398397
destination_folder = constants.Files.DOWNLOADS_FOLDER
399398
page_utils._download_file_to(
400399
file_url, destination_folder, new_file_name)
401-
return True
402400

403401
def convert_xpath_to_css(self, xpath):
404402
return xpath_to_css.convert_xpath_to_css(xpath)

server_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pip>=8.1.2
2-
setuptools>=27.3.0
2+
setuptools>=28.2.0
33
selenium>=2.53.6
44
nose>=1.3.7
55
pytest>=3.0.2
@@ -12,7 +12,7 @@ unittest2==1.1.0
1212
chardet==2.3.0
1313
simplejson==3.8.2
1414
boto==2.42.0
15-
ipdb==0.10.1
15+
ipdb==0.9.4
1616
pyvirtualdisplay==0.2
1717
MySQL-python==1.2.5
1818
-e .

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
setup(
88
name='seleniumbase',
9-
version='1.2.11',
9+
version='1.2.12',
1010
url='http://seleniumbase.com',
1111
author='Michael Mintz',
1212
author_email='@mintzworld',
@@ -15,7 +15,7 @@
1515
license='The MIT License',
1616
install_requires=[
1717
'pip>=8.1.2',
18-
'setuptools>=27.3.0',
18+
'setuptools>=28.2.0',
1919
'selenium>=2.53.6',
2020
'nose>=1.3.7',
2121
'pytest>=3.0.2',
@@ -28,7 +28,7 @@
2828
'chardet==2.3.0',
2929
'simplejson==3.8.2',
3030
'boto==2.42.0',
31-
'ipdb==0.10.1',
31+
'ipdb==0.9.4',
3232
'pyvirtualdisplay==0.2',
3333
],
3434
packages=['seleniumbase',

0 commit comments

Comments
 (0)