mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

Merge pull request #4675 from atom/report-error-in-enumerate-devices-spec

Browse source 
Always call done callback in enumerateDevices spec
This commit is contained in:
Kevin Sawicki 2016-03-04 14:42:21 -08:00
commit ee1f69062e
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spec/chromium-spec.js
View file

@ -7,6 +7,8 @@ const remote = require('electron').remote;
const BrowserWindow = remote.require('electron').BrowserWindow; const BrowserWindow = remote.require('electron').BrowserWindow;
const session = remote.require('electron').session; const session = remote.require('electron').session;
const isCI = remote.getGlobal('isCi');
describe('chromium feature', function() { describe('chromium feature', function() {
var fixtures = path.resolve(__dirname, 'fixtures'); var fixtures = path.resolve(__dirname, 'fixtures');
var listener = null; var listener = null;
@ -91,13 +93,19 @@ describe('chromium feature', function() {
if (process.env.TRAVIS === 'true') { if (process.env.TRAVIS === 'true') {
return; return;
} }
if (isCI && process.platform === 'linux') {
return;
}
it('can return labels of enumerated devices', function(done) { it('can return labels of enumerated devices', function(done) {
navigator.mediaDevices.enumerateDevices().then((devices) => { navigator.mediaDevices.enumerateDevices().then((devices) => {
const result = devices.some((device) => !!device.label); const labels = devices.map((device) => device.label);
if (result) const labelFound = labels.some((label) => !!label);
if (labelFound)
done(); done();
}); else
done('No device labels found: ' + JSON.stringify(labels));
}).catch(done);
}); });
}); });