diff --git a/.travis.yml b/.travis.yml index 680052c7437..d13e13dda8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,17 @@ node_js: services: - docker +install: + - "bin/installDeps.sh" + - "export GIT_HASH=$(git rev-parse --verify --short HEAD)" + - "npm install ep_test_line_attrib" + +before_script: + - "tests/frontend/travis/sauce_tunnel.sh" + +script: + - "tests/frontend/travis/runner.sh" + env: global: - secure: "WMGxFkOeTTlhWB+ChMucRtIqVmMbwzYdNHuHQjKCcj8HBEPdZLfCuK/kf4rG\nVLcLQiIsyllqzNhBGVHG1nyqWr0/LTm8JRqSCDDVIhpyzp9KpCJQQJG2Uwjk\n6/HIJJh/wbxsEdLNV2crYU/EiVO3A4Bq0YTHUlbhUqG3mSCr5Ec=" diff --git a/tests/frontend/travis/remote_runner.js b/tests/frontend/travis/remote_runner.js index 87311d905d1..b26915d2b6e 100644 --- a/tests/frontend/travis/remote_runner.js +++ b/tests/frontend/travis/remote_runner.js @@ -67,41 +67,39 @@ var sauceTestWorker = async.queue(function (testSettings, callback) { }); }, 5); //run 5 tests in parrallel -// Firefox +// 1) Firefox on Linux sauceTestWorker.push({ 'platform' : 'Linux' , 'browserName' : 'firefox' - , 'version' : '' + , 'version' : 'latest' }); -// Chrome +// 2) Chrome on Linux sauceTestWorker.push({ 'platform' : 'Linux' , 'browserName' : 'googlechrome' - , 'version' : '' + , 'version' : 'latest' }); -/* -// IE 8 +// 3) Safari on OSX 10.15 sauceTestWorker.push({ - 'platform' : 'Windows 2003' - , 'browserName' : 'iexplore' - , 'version' : '8' + 'platform' : 'OS X 10.15' + , 'browserName' : 'safari' + , 'version' : '13' }); -*/ -// IE 9 +// 4) IE 10 on Win 8 sauceTestWorker.push({ - 'platform' : 'Windows XP' + 'platform' : 'Windows 8' , 'browserName' : 'iexplore' - , 'version' : '9' + , 'version' : '10.0' }); -// IE 10 +// 5) Edge on Win 10 sauceTestWorker.push({ - 'platform' : 'Windows 2012' - , 'browserName' : 'iexplore' - , 'version' : '10' + 'platform' : 'Windows 10' + , 'browserName' : 'microsoftedge' + , 'version' : 'latest' }); sauceTestWorker.drain = function() { diff --git a/tests/frontend/travis/sauce_tunnel.sh b/tests/frontend/travis/sauce_tunnel.sh index d98a4083beb..f85d67e5971 100755 --- a/tests/frontend/travis/sauce_tunnel.sh +++ b/tests/frontend/travis/sauce_tunnel.sh @@ -6,12 +6,12 @@ # example https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz # Supported versions are currently listed at: # https://wiki.saucelabs.com/display/DOCS/Downloading+Sauce+Connect+Proxy -curl https://saucelabs.com/downloads/sc-latest-linux.tar.gz > /tmp/sauce.tar.gz +curl https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz > /tmp/sauce.tar.gz tar zxf /tmp/sauce.tar.gz --directory /tmp mv /tmp/sc-*-linux /tmp/sauce_connect # start the sauce connector in background and make sure it doesn't output the secret key -(/tmp/sauce_connect/bin/sc --user $SAUCE_USERNAME --key $SAUCE_ACCESS_KEY --pidfile /tmp/sauce.pid --readyfile /tmp/tunnel > /dev/null )& +(/tmp/sauce_connect/bin/sc --user "${SAUCE_USERNAME}" --key "${SAUCE_ACCESS_KEY}" --pidfile /tmp/sauce.pid --readyfile /tmp/tunnel > /dev/null )& # wait for the tunnel to build up while [ ! -e "/tmp/tunnel" ]