Merge pull request #67 from seleniumbase/phantomjs-update

Phantomjs update

Dockerfile

@@ -76,11 +76,11 @@ RUN apt-get -qy --no-install-recommends install \
 #===================
 # Install PhantomJS
 #===================
-RUN cd /usr/local/share && wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2
-RUN cd /usr/local/share && tar xjf phantomjs-1.9.7-linux-x86_64.tar.bz2
-RUN ln -s /usr/local/share/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/share/phantomjs
-RUN ln -s /usr/local/share/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
-RUN ln -s /usr/local/share/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/bin/phantomjs
+RUN cd /usr/local/share && wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+RUN cd /usr/local/share && tar xjf phantomjs-2.1.1-linux-x86_64.tar.bz2
+RUN ln -s /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/share/phantomjs
+RUN ln -s /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
+RUN ln -s /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs
 
 #===========================
 # Configure Virtual Display
@@ -106,6 +106,7 @@ RUN cd /SeleniumBase && ls && pip install -r requirements.txt
 COPY integrations/docker/docker-entrypoint.sh /
 COPY integrations/docker/run_docker_test_in_firefox.sh /
 COPY integrations/docker/run_docker_test_in_chrome.sh /
+COPY integrations/docker/run_docker_test_in_phantomjs.sh /
 COPY integrations/docker/docker_config.cfg /SeleniumBase/examples/
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/bin/bash"]

integrations/docker/run_docker_test_in_phantomjs.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+# Run example test from inside Docker image
+echo "Running example SeleniumBase test from Docker with PhantomJS..."
+cd /SeleniumBase/examples/ && nosetests my_first_test.py --config=docker_config.cfg --browser=phantomjs
+exec "$@"

integrations/linux/Linuxfile.sh

@@ -62,7 +62,7 @@ sudo apt-get install -y --force-yes python-MySQLdb
 
 # Install PhantomJS
 cd ~
-export PHANTOM_JS="phantomjs-1.9.8-linux-x86_64"
+export PHANTOM_JS="phantomjs-2.1.1-linux-x86_64"
 sudo wget https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOM_JS.tar.bz2
 sudo tar xvjf $PHANTOM_JS.tar.bz2
 sudo mv -f $PHANTOM_JS /usr/local/share

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.2.9',
+    version='1.2.10',
     url='http://seleniumbase.com',
     author='Michael Mintz',
     author_email='@mintzworld',