diff --git a/.gitignore b/.gitignore index da56bf45..cb1355b9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ # Generated by Cargo /target/ +# Used in selenium tests +node_modules diff --git a/.travis.yml b/.travis.yml index daace7d7..75528192 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,19 @@ language: rust rust: - nightly + +before_script: + - "sh -e /etc/init.d/xvfb start" + - "export DISPLAY=:99.0" + - "wget http://selenium-release.storage.googleapis.com/2.50/selenium-server-standalone-2.50.1.jar" + - "java -jar selenium-server-standalone-2.50.1.jar > /dev/null &" + - sleep 5 + - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash + - nvm install 4.2 + - nvm use 4.2 + - npm install selenium-webdriver + script: - cargo build - RUST_BACKTRACE=1 cargo test + - ((cargo run ; true) > /dev/null & node test/selenium/ftu_test.js && killall -HUP foxbox) || (killall -HUP foxbox ; exit 1) diff --git a/static/index.html b/static/index.html index 15749f5d..9cb7bc40 100644 --- a/static/index.html +++ b/static/index.html @@ -1,9 +1,9 @@
-