Merge pull request #128 from seleniumbase/firefox-deploy-script

Update the deploy script and the ReadMe

.travis.yml

@@ -3,12 +3,12 @@ sudo: false
 python:
   - "2.7"
 addons:
-  firefox: "46.0.1"
+  firefox: "56.0"
   chrome: stable
 install:
   - "pip install --upgrade pip"
-  - "pip install -r server_requirements.txt"
-  - "python server_setup.py install"
+  - "pip install -r requirements.txt"
+  - "python setup.py install"
   - "sudo rm -f /etc/boto.cfg"
 before_script:
   - "flake8 seleniumbase/*.py"
@@ -17,6 +17,7 @@ before_script:
   - "flake8 seleniumbase/*/*/*/*.py"
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - "wget https://github.com/mozilla/geckodriver/releases/download/v0.19.0/geckodriver-v0.19.0-linux64.tar.gz -O /tmp/geckodriver.tar.gz && tar -C /opt -xzf /tmp/geckodriver.tar.gz && sudo chmod 755 /opt/geckodriver && sudo ln -fs /opt/geckodriver /usr/bin/geckodriver && sudo ln -fs /opt/geckodriver /usr/local/bin/geckodriver"
   - "wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2;"
   - "tar -xvf ./phantomjs-2.1.1-linux-x86_64.tar.bz2;"
   - "export PATH=$PWD/phantomjs-2.1.1-linux-x86_64/bin:$PATH;"

README.md

@@ -2,7 +2,7 @@
 
 <b>All-in-One Test Automation Framework</b>
 
-Easily run Selenium/WebDriver automation in *[Python](https://www.python.org/)* with [Pytest](https://docs.pytest.org/en/latest/) or [Nosetests](http://nose.readthedocs.io/en/latest/).
+Easily build & run Selenium/WebDriver scripts in [Python](https://www.python.org/) with [Pytest](https://docs.pytest.org/en/latest/) & [Nosetests](http://nose.readthedocs.io/en/latest/)!
 
 [![pypi](https://img.shields.io/pypi/v/seleniumbase.svg)](https://pypi.python.org/pypi/seleniumbase) [![Build Status](https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master)](https://travis-ci.org/seleniumbase/SeleniumBase) [![Python version](https://img.shields.io/badge/python-2.7,_3.*-22AADD.svg "Python version")](https://docs.python.org/2/) [![MIT License](http://img.shields.io/badge/license-MIT-22BBCC.svg "MIT License")](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [![Join the chat at https://gitter.im/seleniumbase/SeleniumBase](https://badges.gitter.im/seleniumbase/SeleniumBase.svg)](https://gitter.im/seleniumbase/SeleniumBase?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GitHub stars](https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg "GitHub stars")](https://github.com/seleniumbase/SeleniumBase/stargazers)
 
@@ -31,10 +31,12 @@ Easily run Selenium/WebDriver automation in *[Python](https://www.python.org/)*
 
 <b>Customize scripts from the command line:</b>
 ```bash
-pytest my_first_test.py --demo_mode -s
+pytest my_first_test.py --browser=chrome
 
-nosetests my_first_test.py --demo_mode --with-selenium --browser=chrome -s
+nosetests my_first_test.py --with-selenium --demo_mode --browser=firefox -s
 ```
+(<i>The Selenium plugin, ``--with-selenium``, is enabled by default when using pytest to run test classes that inherit [BaseCase](#seleniumbase_basic_usage), thanks to [pytest.ini](https://github.com/seleniumbase/SeleniumBase/blob/master/pytest.ini). You can do the same for nosetests by adding ``with-selenium=1`` under ``[nosetests]`` in a [setup.cfg](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/setup.cfg) file located in the folder where you call nosetests.</i>)
+
 <b>Watch [my_first_test.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py) run in [Demo Mode](#seleniumbase_demo_mode):</b>
 
 ![](http://cdn2.hubspot.net/hubfs/100006/images/sb_demo.gif "SeleniumBase Demo")

_config.yml

@@ -1,3 +1,3 @@
 theme: jekyll-theme-cayman
 title: SeleniumBase
-description: A simple yet powerful test framework for fast & reliable web automation.
+description: Everything you need to automate website testing.