From 078459c671b5ef5b237c201dc5b7d32f7be6acbc Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 21 Sep 2016 02:05:23 -0400 Subject: [PATCH 1/4] Use the latest PhantomJS in the Dockerfile --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1530c9c0..6421438e 100755 --- a/Dockerfile +++ b/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 From 52d956b3501726c685c0d82d20569b54bbf1e9c7 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 21 Sep 2016 02:06:35 -0400 Subject: [PATCH 2/4] Add PhantomJS Docker example --- Dockerfile | 1 + integrations/docker/run_docker_test_in_phantomjs.sh | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100755 integrations/docker/run_docker_test_in_phantomjs.sh diff --git a/Dockerfile b/Dockerfile index 6421438e..7c391245 100755 --- a/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/integrations/docker/run_docker_test_in_phantomjs.sh b/integrations/docker/run_docker_test_in_phantomjs.sh new file mode 100755 index 00000000..7e903e86 --- /dev/null +++ b/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 "$@" From d6b140943dd6323b0ed153e1e83bdd453d6ddc2f Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 21 Sep 2016 02:07:16 -0400 Subject: [PATCH 3/4] Use the latest PhantomJS in the Linuxfile --- integrations/linux/Linuxfile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/linux/Linuxfile.sh b/integrations/linux/Linuxfile.sh index 71984fd9..45c14cab 100755 --- a/integrations/linux/Linuxfile.sh +++ b/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 From 48843e6d0310396ca0796a1a8cae3c23db7d187d Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 21 Sep 2016 02:08:17 -0400 Subject: [PATCH 4/4] Version 1.2.10 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d9ea8f8b..3d20b427 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import setup, find_packages # noqa setup( name='seleniumbase', - version='1.2.9', + version='1.2.10', url='http://seleniumbase.com', author='Michael Mintz', author_email='@mintzworld',