Permalink
Browse files
WIP: run only unit tests on BS
- Loading branch information
Showing
with
12 additions
and
12 deletions.
-
+6
−6
.travis.yml
-
+2
−2
karma-shared.conf.js
-
+2
−2
package.json
-
+2
−2
scripts/travis/build.sh
|
|
@@ -9,11 +9,11 @@ branches: |
|
|
env: |
|
|
matrix: |
|
|
- JOB=unit |
|
|
- JOB=e2e TEST_TARGET=jqlite |
|
|
- JOB=e2e TEST_TARGET=jquery |
|
|
# - JOB=e2e TEST_TARGET=jqlite |
|
|
# - JOB=e2e TEST_TARGET=jquery |
|
|
global: |
|
|
- SAUCE_USERNAME=angular-ci |
|
|
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 |
|
|
- BROWSER_STACK_USERNAME=VojtaJina |
|
|
- BROWSER_STACK_ACCESS_KEY=ve8DdEwSkBpXWpZ1JQCQ |
|
|
- LOGS_DIR=/tmp/angular-build/logs |
|
|
- BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready |
|
|
|
|
|
@@ -28,10 +28,10 @@ install: |
|
|
|
|
|
before_script: |
|
|
- mkdir -p $LOGS_DIR |
|
|
- ./lib/sauce/sauce_connect_setup.sh |
|
|
# - ./lib/sauce/sauce_connect_setup.sh |
|
|
- npm install -g grunt-cli |
|
|
- grunt package |
|
|
- ./scripts/travis/wait_for_browser_provider.sh |
|
|
# - ./scripts/travis/wait_for_browser_provider.sh |
|
|
|
|
|
script: |
|
|
- ./scripts/travis/build.sh |
|
|
|
|
|
@@ -114,11 +114,11 @@ module.exports = function(config, specificOptions) { |
|
|
var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'; |
|
|
|
|
|
config.logLevel = config.LOG_DEBUG; |
|
|
config.transports = ['websocket', 'xhr-polling']; |
|
|
// config.transports = ['websocket', 'xhr-polling']; |
|
|
config.captureTimeout = 0; // rely on SL timeout |
|
|
|
|
|
config.browserStack.build = buildLabel; |
|
|
config.browserStack.startTunnel = false; |
|
|
// config.browserStack.startTunnel = false; |
|
|
|
|
|
config.sauceLabs.build = buildLabel; |
|
|
config.sauceLabs.startConnect = false; |
|
|
|
|
|
@@ -38,8 +38,8 @@ |
|
|
"jasmine-node": "~1.14.5", |
|
|
"jasmine-reporters": "~1.0.1", |
|
|
"jshint-stylish": "~1.0.0", |
|
|
"karma": "^0.12.0", |
|
|
"karma-browserstack-launcher": "0.1.1", |
|
|
"karma": "vojtajina/karma#socketio_10", |
|
|
"karma-browserstack-launcher": "0.1.2", |
|
|
"karma-chrome-launcher": "0.1.5", |
|
|
"karma-firefox-launcher": "0.1.3", |
|
|
"karma-jasmine": "0.1.5", |
|
|
|
|
|
@@ -6,9 +6,9 @@ export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` |
|
|
|
|
|
if [ $JOB = "unit" ]; then |
|
|
grunt test:promises-aplus |
|
|
grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots |
|
|
grunt test:unit --browsers BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11 --reporters dots |
|
|
grunt ci-checks |
|
|
grunt tests:docs --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots |
|
|
grunt tests:docs --browsers BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11 --reporters dots |
|
|
grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js" |
|
|
elif [ $JOB = "e2e" ]; then |
|
|
if [ $TEST_TARGET = "jquery" ]; then |
|
|
|