infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 2017-06-01 10:26:55 +02:00
parent bd3dcebf1f 6eb3b6800f
commit 26251a5c9c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -5,7 +5,8 @@ env:
- "BROWSER='chrome::Windows 10'" - "BROWSER='chrome::Windows 10'"
- "BROWSER='MicrosoftEdge:14.14393:Windows 10'" - "BROWSER='MicrosoftEdge:14.14393:Windows 10'"
- "BROWSER='internet explorer:11.103:Windows 10'" - "BROWSER='internet explorer:11.103:Windows 10'"
- "BROWSER='safari:10.0:macOS 10.12'" #- "BROWSER='safari:10.0:macOS 10.12'"
- "BROWSER='safari:9.0:OS X 10.11'"
branches: branches:
only: only:
- master - master

1
TestSelenium.js
View File

@ -7,6 +7,7 @@ if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'fals
return; return;
} }
// https://wiki.saucelabs.com/display/DOCS/Platform+Configurator#/
var driver; var driver;
if (process.env.SAUCE_USERNAME !== undefined) { if (process.env.SAUCE_USERNAME !== undefined) {
var browserArray = process.env.BROWSER.split(':'); var browserArray = process.env.BROWSER.split(':');