Skip to content

Commit cd7ad14

Browse files
committed
Split unit and e2e tests into two jobs on Travis
Also try to show errors in e2e testing quickly.
1 parent b2da6a9 commit cd7ad14

File tree

3 files changed

+32
-23
lines changed

3 files changed

+32
-23
lines changed

.travis.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ notifications:
1212
on_start: false # default: false
1313

1414
env:
15-
# matrix:
16-
# - JOB=unit
17-
# - JOB=e2e
15+
matrix:
16+
- JOB=unit
17+
- JOB=e2e
1818
global:
19-
- SAUCE_USERNAME=nggrid
20-
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
21-
- LOGS_DIR=/tmp/angular-build/logs
22-
- secure: PEQFPTi8DRVrj6dEl6tQ+QTI07N8A3XST9eu5uHyW9YuDErDpn6rE8iEI2bd6nU5jldF9cCaGprpEi6aTP71jxFkm2Yjk1PRxtSVo5Cvu7sEwaFOnZi2KBgpKAdv8T3GB4rcjePe3oPwSkw1i/s9THSe18KSzZdgwP2LMctlCyA=
23-
- secure: A4ur05WzvEsExKuAR81MmxNldgYbpc8VwI/9hC2v+IWAAaFClWDH6OdlbfO8gNaWJVnLmvMS8emA7zkBuKgQhuMP0u8RoSwn7TOObaCICEM7mbFPRwCX1td0/4FyUdUUAE/jw3Cx4SBdrb0qGkMmdg36W4II1BBzkMnJblUfnNU=
24-
- secure: W2QpRQppqS1wMhbiOTOzJmaUXZtjUQdoWj+IKuyX6m7/A2A4YDXfNj+vzXfffbVqnBFDzrYRtcZ6IMmHn9QDs4gJaAaQDc1104UEd/sbVEujDn+9YOE3tTdRLE13FgdwwrLNcpypiPZ+rpWvEizRAlwoMXIiVhL8pUc1hysX9qM=
25-
- secure: IaTLpsLUet/9al3Lg9n1k+M+5zIEnCwx7fwOjNoUmHYrYRImDUVmtymb9HSdzozn8cV1z+k6V62wghjK0b8c5tZ0mE9PRtEN8Nv1CjVmrbURpQaypC2A1HT3xg3/MDRwvAoiHILPxTo4k5jw1wgNrYKxCLbb7vmvoPwVv7seTT8=
26-
- secure: PWz5cYdlrucjbJxUj9WUGo55V8+z/fDST7ihx9uLuhllqaQ+fkdTX5ccn8sv+dp9OPs0ov3Gunv/GIWKB3E6HCsHQJsyZ1Tde3IvyWwz72YeQ5/IZVolX0T1dmX9sLYJxqKjO1/D/Zfj4NkCEjFQmyIB+47tgBTV1OA9h/4TiMk=
19+
- SAUCE_USERNAME=nggrid
20+
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
21+
- LOGS_DIR=/tmp/angular-build/logs
22+
- secure: PEQFPTi8DRVrj6dEl6tQ+QTI07N8A3XST9eu5uHyW9YuDErDpn6rE8iEI2bd6nU5jldF9cCaGprpEi6aTP71jxFkm2Yjk1PRxtSVo5Cvu7sEwaFOnZi2KBgpKAdv8T3GB4rcjePe3oPwSkw1i/s9THSe18KSzZdgwP2LMctlCyA=
23+
- secure: A4ur05WzvEsExKuAR81MmxNldgYbpc8VwI/9hC2v+IWAAaFClWDH6OdlbfO8gNaWJVnLmvMS8emA7zkBuKgQhuMP0u8RoSwn7TOObaCICEM7mbFPRwCX1td0/4FyUdUUAE/jw3Cx4SBdrb0qGkMmdg36W4II1BBzkMnJblUfnNU=
24+
- secure: W2QpRQppqS1wMhbiOTOzJmaUXZtjUQdoWj+IKuyX6m7/A2A4YDXfNj+vzXfffbVqnBFDzrYRtcZ6IMmHn9QDs4gJaAaQDc1104UEd/sbVEujDn+9YOE3tTdRLE13FgdwwrLNcpypiPZ+rpWvEizRAlwoMXIiVhL8pUc1hysX9qM=
25+
- secure: IaTLpsLUet/9al3Lg9n1k+M+5zIEnCwx7fwOjNoUmHYrYRImDUVmtymb9HSdzozn8cV1z+k6V62wghjK0b8c5tZ0mE9PRtEN8Nv1CjVmrbURpQaypC2A1HT3xg3/MDRwvAoiHILPxTo4k5jw1wgNrYKxCLbb7vmvoPwVv7seTT8=
26+
- secure: PWz5cYdlrucjbJxUj9WUGo55V8+z/fDST7ihx9uLuhllqaQ+fkdTX5ccn8sv+dp9OPs0ov3Gunv/GIWKB3E6HCsHQJsyZ1Tde3IvyWwz72YeQ5/IZVolX0T1dmX9sLYJxqKjO1/D/Zfj4NkCEjFQmyIB+47tgBTV1OA9h/4TiMk=
2727

2828
branches:
2929
only:
30-
- master
31-
- /^3\.0$/
32-
- /^release-.*$/
30+
- master
31+
- /^3\.0$/
32+
- /^release-.*$/
3333

3434
before_install:
3535
- "export CHROME_BIN=chromium-browser"

test/protractor.ci.conf.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ exports.config = {
3232
defaultTimeoutInterval: 60000,
3333

3434
// Don't show the stack trace, it's mostly useless
35-
includeStackTrace: false
35+
includeStackTrace: false,
36+
37+
realtimeFailure: true
3638
}
3739
};

travis_build.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,23 @@ set -e
66
# In this case just do normal local tests
77
if [ $TRAVIS_PULL_REQUEST != "false" ]
88
then
9-
# Run default task
10-
grunt
11-
# Run e2e tests
12-
# echo "travis_fold:start:Tests"
13-
grunt test:ci-e2e
14-
# echo "travis_fold:end:Tests"
9+
if [ $JOB = "unit" ]; then
10+
# Run default task
11+
grunt
12+
elif [ $JOB = "e2e" ]; then
13+
# Run e2e tests
14+
echo "travis_fold:start:Tests"
15+
grunt test:ci-e2e
16+
echo "travis_fold:end:Tests"
17+
fi
18+
# Not a pull request, run the full unit test CI suite
1519
else
1620
echo "travis_fold:start:Tests"
17-
grunt test:ci
18-
grunt test:ci-e2e
21+
if [ $JOB -eq "unit" ]; then
22+
grunt test:ci
23+
elif [ $JOB -eq "e2e" ]; then
24+
grunt test:ci-e2e
25+
fi
1926
echo "travis_fold:end:Tests"
2027

2128
# Send coverage data to coveralls.io

0 commit comments

Comments
 (0)