jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'travis-lint' of https://github.com/CendioOssman/noVNC

This commit is contained in:
Pierre Ossman 2018-06-07 14:53:02 +02:00
parent 0342e4f489 127b63b79f
commit 13364d70dd
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -7,9 +7,15 @@ node_js:
- 6 - 6
env: env:
matrix: matrix:
- TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11' - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10'
- TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11' # FIXME Skip tests in Linux since Sauce Labs browser versions are ancient.
- TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10,Windows 7' # - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Linux'
- TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='OS X 10.11'
- TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10'
# - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Linux'
- TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='OS X 10.11'
- TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10'
- TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 7'
- TEST_BROWSER_NAME=microsoftedge TEST_BROWSER_OS='Windows 10' - TEST_BROWSER_NAME=microsoftedge TEST_BROWSER_OS='Windows 10'
- TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11' - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11'
before_script: npm install -g karma-cli before_script: npm install -g karma-cli
@ -19,11 +25,17 @@ addons:
jwt: jwt:
secure: "d3ekMYslpn6R4f0ajtRMt9SUFmNGDiItHpqaXC5T4KI0KMEsxgvEOfJot5PiFFJWg1DSpJZH6oaW2UxGZ3duJLZrXIEd/JePY8a6NtT35BNgiDPgcp+eu2Bu3rhrSNg7/HEsD1ma+JeUTnv18Ai5oMFfCCQJx2J6osIxyl/ZVxA=" secure: "d3ekMYslpn6R4f0ajtRMt9SUFmNGDiItHpqaXC5T4KI0KMEsxgvEOfJot5PiFFJWg1DSpJZH6oaW2UxGZ3duJLZrXIEd/JePY8a6NtT35BNgiDPgcp+eu2Bu3rhrSNg7/HEsD1ma+JeUTnv18Ai5oMFfCCQJx2J6osIxyl/ZVxA="
stages: stages:
- lint
- test - test
- name: deploy - name: deploy
if: tag is PRESENT if: tag is PRESENT
jobs: jobs:
include: include:
- stage: lint
env:
addons:
before_script:
script: npm run lint
- stage: deploy - stage: deploy
script: skip script: skip
before_script: skip before_script: skip

3
karma.conf.js
View File

@ -20,9 +20,6 @@ module.exports = function(config) {
for (let i = 0; i < names.length; i++) { for (let i = 0; i < names.length; i++) {
for (let j = 0; j < platforms.length; j++) { for (let j = 0; j < platforms.length; j++) {
// FIXME Skip tests in Linux since Sauce Labs browser versions are ancient.
// https://github.com/novnc/noVNC/pull/1013#issuecomment-382749805
if (platforms[j] === 'Linux') continue;
for (let k = 0; k < versions.length; k++) { for (let k = 0; k < versions.length; k++) {
let launcher_name = 'sl_' + platforms[j].replace(/[^a-zA-Z0-9]/g, '') + '_' + names[i]; let launcher_name = 'sl_' + platforms[j].replace(/[^a-zA-Z0-9]/g, '') + '_' + names[i];
if (versions[k]) { if (versions[k]) {