web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't repeat travis calling npm install but do use https for https urls

Browse Source
This commit is contained in:
Caleb James DeLisle 2016-04-20 20:20:29 +02:00
parent 2d7309b04f
commit eadca92e98
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -14,7 +14,6 @@ node_js:
before_script: before_script:
- npm run-script lint - npm run-script lint
- cp config.js.dist config.js - cp config.js.dist config.js
- npm install
- npm install bower - npm install bower
- ./node_modules/bower/bin/bower install - ./node_modules/bower/bin/bower install
- node ./server.js & - node ./server.js &

4
TestSelenium.js
View File

@ -1,6 +1,6 @@
/* global process */ /* global process */
var WebDriver = require("selenium-webdriver"); var WebDriver = require("selenium-webdriver");
var Http = require("http"); var Https = require("https");
var driver; var driver;
if (process.env.SAUCE_USERNAME !== undefined) { if (process.env.SAUCE_USERNAME !== undefined) {
@ -18,7 +18,7 @@ if (process.env.SAUCE_USERNAME !== undefined) {
} }
var logSauceLink = function (cb) { var logSauceLink = function (cb) {
Http.request("https://saucelabs.com/rest/v1.1/" + process.env.SAUCE_USERNAME + Https.request("https://saucelabs.com/rest/v1.1/" + process.env.SAUCE_USERNAME +
"/jobs?auto_only=true&full=true&limit=50&subaccounts=true", function (resp) { "/jobs?auto_only=true&full=true&limit=50&subaccounts=true", function (resp) {
var str = ''; var str = '';
resp.on('data', function (chunk) { str += chunk; }); resp.on('data', function (chunk) { str += chunk; });