travis update: should run soucelab tests now

This commit is contained in:
Vitaly Puzrin 2014-02-28 10:40:39 +04:00
parent 81331bb248
commit 0289460807
3 changed files with 19 additions and 14 deletions

View file

@ -2,4 +2,11 @@ language: node_js
node_js: node_js:
- "0.10" - "0.10"
before_script: "npm install" before_script: "npm install"
script: "make test" script: make $COMMAND
env:
matrix:
- COMMAND=test
- COMMAND=test-browser
global:
- secure: FsU9623CV4X1G3WHvq2H0XHjDYxvfSMdWdKrAuTSZB9TsJlQ0UAIKbHNBzxSBo6/1xv1ZYyuPZvJnrkHAqNOVGYr0MiIINPt0jDmM3anl03lbaVwwpWcwxgslFGbfVufKKKrYAPF0UDS6uNeZtYP4fs2xlao7F9BaanpARiK5TY=
- secure: PZeRlTvq67EBo1yXthMK2bKeCn5fVA3qCtFZ0m38XZDi8cj6wfXaLGoELrrtSNGFhZt2xU0DLQ+w0y2vC+gTOzWqbAw1Cedri97c514oX+QFvDqRKCbrKkGR9DHW6jUxOL1YrSfto21+CEsZEcQsYBTYFwnAKxmT3UIXCCgU+JI=

View file

@ -12,10 +12,12 @@ module.exports = function(grunt) {
version: '4.0' version: '4.0'
}, { }, {
browserName: 'firefox', browserName: 'firefox',
platform: 'XP' platform: 'XP',
version: '27'
}, { }, {
browserName: 'chrome', browserName: 'chrome',
platform: 'XP' platform: 'XP',
version: '32'
}, { }, {
browserName: 'internet explorer', browserName: 'internet explorer',
platform: 'WIN8', platform: 'WIN8',
@ -32,11 +34,11 @@ module.exports = function(grunt) {
browserName: 'internet explorer', browserName: 'internet explorer',
platform: 'XP', platform: 'XP',
version: '7' version: '7'
}, { }, {/*
browserName: 'opera', browserName: 'opera',
platform: 'Windows 2008', platform: 'Windows 2008',
version: '12' version: '12'
}, { }, {*/
browserName: 'safari', browserName: 'safari',
platform: 'OS X 10.8', platform: 'OS X 10.8',
version: '6' version: '6'
@ -56,12 +58,9 @@ module.exports = function(grunt) {
all: { all: {
options: { options: {
urls: ['http://127.0.0.1:9999/test/browser/test.html'], urls: ['http://127.0.0.1:9999/test/browser/test.html'],
tunnelTimeout: 5, build: process.env.TRAVIS_JOB_ID || ('local' + ~~(Math.random()*1000)),
build: process.env.TRAVIS_JOB_ID,
concurrency: 3,
browsers: browsers, browsers: browsers,
testname: process.env.SAUCE_PROJ || 'mocha tests', testname: process.env.SAUCE_PROJ || 'mocha tests'
tags: ['master']
} }
} }
}, },

View file

@ -28,9 +28,8 @@
"async": "0.2.10", "async": "0.2.10",
"grunt": "~0.4.0", "grunt": "~0.4.0",
"grunt-cli": "~0.1.6", "grunt-cli": "~0.1.13",
"grunt-saucelabs": "~4.0.2", "grunt-saucelabs": "~5.0.1",
"grunt-contrib-connect": "~0.1.2", "grunt-contrib-connect": "~0.7.1"
"grunt-contrib-watch": "~0.2.0"
} }
} }