Skip to content

Commit 9b255d9

Browse files
committed
chore(travis): cleanup the configuration
1 parent 8e92aa7 commit 9b255d9

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ env:
3535
CHANNEL=dev
3636
BROWSERS=DartiumWithWebPlatform,SL_Chrome
3737
global:
38-
- FIREFOX_VERSION="30.0"
39-
- CHROME_VERSION="35.0"
4038
- secure: AKoqpZ699egF0i4uT/FQ5b4jIc0h+KVbhtVCql0uFxwFIl2HjOYgDayrUCAf6USfpW0LghZxJJhBamWOl/505eNSe9HvEd8JLg/to+1Fo9xi9llsu5ehmNH31/5pue4EvsrVuEap1qqL6/BNwI2cAryayU0p5tV0g8gL5h4IxG8=
4139
- LOGS_DIR=/tmp/angular-build/logs
40+
# Sauce
4241
- BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
4342
- SAUCE_USERNAME=angular-ci
4443
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
44+
# E2E tests
45+
- SELENIUM_VERSION="2.42"
46+
- CHROMEDRIVER_VERSION="2.10"
4547

4648
branches:
4749
except:

scripts/run-e2e-test.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,14 @@ esac
7373

7474

7575
install_deps() {(
76-
SELENIUM_VER="2.42"
77-
SELENIUM_ZIP="selenium-server-standalone-$SELENIUM_VER.0.jar"
78-
CHROMEDRIVER_VER="2.10"
76+
SELENIUM_ZIP="selenium-server-standalone-$SELENIUM_VERSION.0.jar"
77+
7978
mkdir -p e2e_bin && cd e2e_bin
8079
if [[ ! -e "$SELENIUM_ZIP" ]]; then
81-
curl -O "http://selenium-release.storage.googleapis.com/$SELENIUM_VER/$SELENIUM_ZIP"
80+
curl -O "http://selenium-release.storage.googleapis.com/$SELENIUM_VERSION/$SELENIUM_ZIP"
8281
fi
8382
if [[ ! -e "$CHROMEDRIVER_ZIP" ]]; then
84-
curl -O "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VER/$CHROMEDRIVER_ZIP"
83+
curl -O "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/$CHROMEDRIVER_ZIP"
8584
unzip "$CHROMEDRIVER_ZIP"
8685
fi
8786
)}

scripts/sauce/sauce_connect_block.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#!/bin/bash
22

33
# Wait for Connect to be ready before exiting
4+
printf "Connecting to Sauce."
45
while [ ! -f $BROWSER_PROVIDER_READY_FILE ]; do
5-
echo "...";
6-
sleep .5; #dart2js takes longer than the travis 10 min timeout to complete
7-
done
6+
printf "."
7+
#dart2js takes longer than the travis 10 min timeout to complete
8+
sleep .5
9+
done
10+
echo "Connected"

0 commit comments

Comments
 (0)