Skip to content

Commit

Permalink
Merge pull request #69 from seleniumbase/framework-updates
Browse files Browse the repository at this point in the history
Framework updates
  • Loading branch information
mdmintz authored Oct 6, 2016
2 parents 3f60c2e + 195004b commit 6bbc537
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SeleniumBase makes it easy to automate tedious business tasks. (*To learn about

(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.

* 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.)
* 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.)

* 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)

Expand Down
18 changes: 18 additions & 0 deletions help_docs/using_safari_driver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
### Info about using Safari Driver for running automated tests on a MAC

(NOTE: SafariDriver requires Safari 10 running on OSX El Capitan or greater)

You can find a nice overview on using Safari Driver [here on GitHub](https://github.com/SeleniumHQ/selenium/wiki/SafariDriver).

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/).

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).

Next, configure the Selenium Server JAR file into your PATH like this:

```bash
export SELENIUM_SERVER_JAR=/usr/local/bin/selenium-server-standalone.jar
export PATH=$PATH:/usr/local/bin/selenium-server-standalone.jar
```

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.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pip>=8.1.2
setuptools>=27.3.0
setuptools>=28.2.0
selenium>=2.53.6
nose>=1.3.7
pytest>=3.0.2
Expand All @@ -12,6 +12,6 @@ unittest2==1.1.0
chardet==2.3.0
simplejson==3.8.2
boto==2.42.0
ipdb==0.10.1
ipdb==0.9.4
pyvirtualdisplay==0.2
-e .
2 changes: 0 additions & 2 deletions seleniumbase/fixtures/base_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ def download_file(self, file_url, destination_folder=None):
if not destination_folder:
destination_folder = constants.Files.DOWNLOADS_FOLDER
page_utils._download_file_to(file_url, destination_folder)
return True

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

def convert_xpath_to_css(self, xpath):
return xpath_to_css.convert_xpath_to_css(xpath)
Expand Down
4 changes: 2 additions & 2 deletions server_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pip>=8.1.2
setuptools>=27.3.0
setuptools>=28.2.0
selenium>=2.53.6
nose>=1.3.7
pytest>=3.0.2
Expand All @@ -12,7 +12,7 @@ unittest2==1.1.0
chardet==2.3.0
simplejson==3.8.2
boto==2.42.0
ipdb==0.10.1
ipdb==0.9.4
pyvirtualdisplay==0.2
MySQL-python==1.2.5
-e .
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='seleniumbase',
version='1.2.11',
version='1.2.12',
url='http://seleniumbase.com',
author='Michael Mintz',
author_email='@mintzworld',
Expand All @@ -15,7 +15,7 @@
license='The MIT License',
install_requires=[
'pip>=8.1.2',
'setuptools>=27.3.0',
'setuptools>=28.2.0',
'selenium>=2.53.6',
'nose>=1.3.7',
'pytest>=3.0.2',
Expand All @@ -28,7 +28,7 @@
'chardet==2.3.0',
'simplejson==3.8.2',
'boto==2.42.0',
'ipdb==0.10.1',
'ipdb==0.9.4',
'pyvirtualdisplay==0.2',
],
packages=['seleniumbase',
Expand Down

0 comments on commit 6bbc537

Please sign in to comment.