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

Clean up no-unused-vars lint errors

Browse source
This commit is contained in:
Kevin Sawicki 2016-01-19 14:49:40 -08:00
parent ccce284a5b
commit 70bcb0ac5a
36 changed files with 228 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

25
spec/api-browser-window-spec.js
View file

@ -1,22 +1,15 @@
var BrowserWindow, assert, fs, http, ipcMain, isCI, os, path, ref, ref1, remote, screen, url;
const assert = require('assert');
const fs = require('fs');
const path = require('path');
const os = require('os');
assert = require('assert');
const remote = require('electron').remote;
const screen = require('electron').screen;
fs = require('fs');
const ipcMain = remote.require('electron').ipcMain;
const BrowserWindow = remote.require('electron').BrowserWindow;
path = require('path');
http = require('http');
url = require('url');
os = require('os');
ref = require('electron'), remote = ref.remote, screen = ref.screen;
ref1 = remote.require('electron'), ipcMain = ref1.ipcMain, BrowserWindow = ref1.BrowserWindow;
isCI = remote.getGlobal('isCi');
const isCI = remote.getGlobal('isCi');
describe('browser-window module', function() {
var fixtures, w;

2
spec/api-crash-reporter-spec.js
View file

@ -41,7 +41,7 @@ describe('crash-reporter module', function() {
var form;
server.close();
form = new multiparty.Form();
return form.parse(req, function(error, fields, files) {
return form.parse(req, function(error, fields) {
if (called) {
return;
}

10
spec/api-ipc-spec.js
View file

@ -84,12 +84,10 @@ describe('ipc module', function() {
return it('can be used as promise in each side', function(done) {
var promise;
promise = remote.require(path.join(fixtures, 'module', 'promise.js'));
return promise.twicePromise(Promise.resolve(1234)).then((function(_this) {
return function(value) {
assert.equal(value, 2468);
return done();
};
})(this));
return promise.twicePromise(Promise.resolve(1234)).then(function(value) {
assert.equal(value, 2468);
return done();
});
});
});
describe('ipc.sender.send', function() {

63
spec/api-protocol-spec.js
View file

@ -1,16 +1,9 @@
var assert, http, path, protocol, qs, remote;
assert = require('assert');
http = require('http');
path = require('path');
qs = require('querystring');
remote = require('electron').remote;
protocol = remote.require('electron').protocol;
const assert = require('assert');
const http = require('http');
const path = require('path');
const qs = require('querystring');
const remote = require('electron').remote;
const protocol = remote.require('electron').protocol;
describe('protocol module', function() {
var postData, protocolName, text;
@ -44,11 +37,10 @@ describe('protocol module', function() {
it('does not crash when handler is called twice', function(done) {
var doubleHandler;
doubleHandler = function(request, callback) {
var error1;
try {
callback(text);
return callback();
} catch (error1) {
} catch (error) {
// Ignore error
}
};
@ -75,10 +67,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -175,7 +167,7 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data, statux, request) {
success: function(data) {
assert.equal(data, text);
return done();
},
@ -196,10 +188,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -267,7 +259,7 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data, statux, request) {
success: function(data) {
assert.equal(data, text);
return done();
},
@ -288,10 +280,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -361,7 +353,7 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data, statux, request) {
success: function(data) {
assert.equal(data, String(fileContent));
return done();
},
@ -404,10 +396,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -425,10 +417,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -483,10 +475,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -504,10 +496,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: protocolName + "://fake-host",
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}
@ -584,11 +576,10 @@ describe('protocol module', function() {
it('does not crash when handler is called twice', function(done) {
var doubleHandler;
doubleHandler = function(request, callback) {
var error1;
try {
callback(text);
return callback();
} catch (error1) {
} catch (error) {
// Ignore error
}
};
@ -618,10 +609,10 @@ describe('protocol module', function() {
}
return $.ajax({
url: 'http://fake-host',
success: function(data) {
success: function() {
return done('request succeeded but it should not');
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
assert.equal(errorType, 'error');
return done();
}

20
spec/api-session-spec.js
View file

@ -1,16 +1,14 @@
var BrowserWindow, app, assert, fs, http, ipcMain, ipcRenderer, path, ref, remote, session;
const assert = require('assert');
const http = require('http');
const path = require('path');
const fs = require('fs');
assert = require('assert');
const ipcRenderer = require('electron').ipcRenderer;
const remote = require('electron').remote;
http = require('http');
path = require('path');
fs = require('fs');
ref = require('electron'), ipcRenderer = ref.ipcRenderer, remote = ref.remote;
app = remote.app, ipcMain = remote.ipcMain, session = remote.session, BrowserWindow = remote.BrowserWindow;
const ipcMain = remote.ipcMain;
const session = remote.session;
const BrowserWindow = remote.BrowserWindow;
describe('session module', function() {
var fixtures, url, w;

55
spec/api-web-request-spec.js
View file

@ -1,12 +1,7 @@
var assert, http, remote, session;
assert = require('assert');
http = require('http');
remote = require('electron').remote;
session = remote.session;
const assert = require('assert');
const http = require('http');
const remote = require('electron').remote;
const session = remote.session;
describe('webRequest module', function() {
var defaultURL, server, ses;
@ -44,10 +39,10 @@ describe('webRequest module', function() {
});
return $.ajax({
url: defaultURL,
success: function(data) {
success: function() {
return done('unexpected success');
},
error: function(xhr, errorType, error) {
error: function() {
return done();
}
});
@ -68,15 +63,15 @@ describe('webRequest module', function() {
assert.equal(data, '/nofilter/test');
return $.ajax({
url: defaultURL + "filter/test",
success: function(data) {
success: function() {
return done('unexpected success');
},
error: function(xhr, errorType, error) {
error: function() {
return done();
}
});
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -96,7 +91,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -117,7 +112,7 @@ describe('webRequest module', function() {
assert.equal(data, '/redirect');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -138,7 +133,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -154,11 +149,11 @@ describe('webRequest module', function() {
});
return $.ajax({
url: defaultURL,
success: function(data, textStatus, request) {
success: function(data) {
assert.equal(data, '/header/received');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -179,7 +174,7 @@ describe('webRequest module', function() {
});
return $.ajax({
url: defaultURL,
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -199,7 +194,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -222,7 +217,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -243,7 +238,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -259,7 +254,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -283,7 +278,7 @@ describe('webRequest module', function() {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -314,11 +309,11 @@ describe('webRequest module', function() {
});
return $.ajax({
url: defaultURL,
success: function(data, status, xhr) {
success: function(data) {
assert.equal(data, '/redirect');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -336,11 +331,11 @@ describe('webRequest module', function() {
});
return $.ajax({
url: defaultURL,
success: function(data, status, xhr) {
success: function(data) {
assert.equal(data, '/');
return done();
},
error: function(xhr, errorType, error) {
error: function(xhr, errorType) {
return done(errorType);
}
});
@ -363,7 +358,7 @@ describe('webRequest module', function() {
});
return $.ajax({
url: defaultURL,
success: function(data) {
success: function() {
return done('unexpected success');
}
});

84
spec/asar-spec.js
View file

@ -1,16 +1,13 @@
var BrowserWindow, assert, child_process, fs, ipcMain, nativeImage, path, ref, ref1, remote;
const assert = require('assert');
const child_process = require('child_process');
const fs = require('fs');
const path = require('path');
assert = require('assert');
const nativeImage = require('electron').nativeImage;
const remote = require('electron').remote;
child_process = require('child_process');
fs = require('fs');
path = require('path');
ref = require('electron'), nativeImage = ref.nativeImage, remote = ref.remote;
ref1 = remote.require('electron'), ipcMain = ref1.ipcMain, BrowserWindow = ref1.BrowserWindow;
const ipcMain = remote.require('electron').ipcMain;
const BrowserWindow = remote.require('electron').BrowserWindow;
describe('asar package', function() {
var fixtures;
@ -18,12 +15,11 @@ describe('asar package', function() {
describe('node api', function() {
describe('fs.readFileSync', function() {
it('does not leak fd', function() {
var i, j, results;
results = [];
for (i = j = 1; j <= 10000; i = ++j) {
results.push(fs.readFileSync(path.join(process.resourcesPath, 'atom.asar', 'renderer', 'api', 'lib', 'ipc.js')));
var readCalls = 1;
while(readCalls <= 10000) {
fs.readFileSync(path.join(process.resourcesPath, 'atom.asar', 'renderer', 'api', 'lib', 'ipc.js'));
readCalls++;
}
return results;
});
it('reads a normal file', function() {
var file1, file2, file3;
@ -117,7 +113,7 @@ describe('asar package', function() {
return it('throws ENOENT error when can not find file', function(done) {
var p;
p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
return fs.readFile(p, function(err, content) {
return fs.readFile(p, function(err) {
assert.equal(err.code, 'ENOENT');
return done();
});
@ -221,9 +217,8 @@ describe('asar package', function() {
return fs.lstat(p + '/', done);
});
it('returns information of root', function(done) {
var p, stats;
p = path.join(fixtures, 'asar', 'a.asar');
return stats = fs.lstat(p, function(err, stats) {
var p = path.join(fixtures, 'asar', 'a.asar');
fs.lstat(p, function(err, stats) {
assert.equal(err, null);
assert.equal(stats.isFile(), false);
assert.equal(stats.isDirectory(), true);
@ -233,9 +228,8 @@ describe('asar package', function() {
});
});
it('returns information of a normal file', function(done) {
var p, stats;
p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'file1');
return stats = fs.lstat(p, function(err, stats) {
var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'file1');
fs.lstat(p, function(err, stats) {
assert.equal(err, null);
assert.equal(stats.isFile(), true);
assert.equal(stats.isDirectory(), false);
@ -245,9 +239,8 @@ describe('asar package', function() {
});
});
it('returns information of a normal directory', function(done) {
var p, stats;
p = path.join(fixtures, 'asar', 'a.asar', 'dir1');
return stats = fs.lstat(p, function(err, stats) {
var p = path.join(fixtures, 'asar', 'a.asar', 'dir1');
fs.lstat(p, function(err, stats) {
assert.equal(err, null);
assert.equal(stats.isFile(), false);
assert.equal(stats.isDirectory(), true);
@ -257,9 +250,8 @@ describe('asar package', function() {
});
});
it('returns information of a linked file', function(done) {
var p, stats;
p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link1');
return stats = fs.lstat(p, function(err, stats) {
var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link1');
fs.lstat(p, function(err, stats) {
assert.equal(err, null);
assert.equal(stats.isFile(), false);
assert.equal(stats.isDirectory(), false);
@ -269,9 +261,8 @@ describe('asar package', function() {
});
});
it('returns information of a linked directory', function(done) {
var p, stats;
p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2');
return stats = fs.lstat(p, function(err, stats) {
var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2');
fs.lstat(p, function(err, stats) {
assert.equal(err, null);
assert.equal(stats.isFile(), false);
assert.equal(stats.isDirectory(), false);
@ -281,9 +272,8 @@ describe('asar package', function() {
});
});
return it('throws ENOENT error when can not find file', function(done) {
var p, stats;
p = path.join(fixtures, 'asar', 'a.asar', 'file4');
return stats = fs.lstat(p, function(err, stats) {
var p = path.join(fixtures, 'asar', 'a.asar', 'file4');
fs.lstat(p, function(err) {
assert.equal(err.code, 'ENOENT');
return done();
});
@ -390,7 +380,7 @@ describe('asar package', function() {
var p, parent;
parent = fs.realpathSync(path.join(fixtures, 'asar'));
p = path.join('a.asar', 'not-exist');
return fs.realpath(path.join(parent, p), function(err, stats) {
return fs.realpath(path.join(parent, p), function(err) {
assert.equal(err.code, 'ENOENT');
return done();
});
@ -426,27 +416,24 @@ describe('asar package', function() {
});
describe('fs.readdir', function() {
it('reads dirs from root', function(done) {
var dirs, p;
p = path.join(fixtures, 'asar', 'a.asar');
return dirs = fs.readdir(p, function(err, dirs) {
var p = path.join(fixtures, 'asar', 'a.asar');
fs.readdir(p, function(err, dirs) {
assert.equal(err, null);
assert.deepEqual(dirs, ['dir1', 'dir2', 'dir3', 'file1', 'file2', 'file3', 'link1', 'link2', 'ping.js']);
return done();
});
});
it('reads dirs from a normal dir', function(done) {
var dirs, p;
p = path.join(fixtures, 'asar', 'a.asar', 'dir1');
return dirs = fs.readdir(p, function(err, dirs) {
var p = path.join(fixtures, 'asar', 'a.asar', 'dir1');
fs.readdir(p, function(err, dirs) {
assert.equal(err, null);
assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
return done();
});
});
it('reads dirs from a linked dir', function(done) {
var dirs, p;
p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2');
return dirs = fs.readdir(p, function(err, dirs) {
var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2');
fs.readdir(p, function(err, dirs) {
assert.equal(err, null);
assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
return done();
@ -455,7 +442,7 @@ describe('asar package', function() {
return it('throws ENOENT error when can not find file', function(done) {
var p;
p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
return fs.readdir(p, function(err, stats) {
return fs.readdir(p, function(err) {
assert.equal(err.code, 'ENOENT');
return done();
});
@ -504,7 +491,7 @@ describe('asar package', function() {
return it('throws ENOENT error when can not find file', function(done) {
var p;
p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
return fs.open(p, 'r', function(err, stats) {
return fs.open(p, 'r', function(err) {
assert.equal(err.code, 'ENOENT');
return done();
});
@ -559,8 +546,7 @@ describe('asar package', function() {
ref2 = require('child_process'), execFile = ref2.execFile, execFileSync = ref2.execFileSync;
echo = path.join(fixtures, 'asar', 'echo.asar', 'echo');
it('executes binaries', function(done) {
var child;
return child = execFile(echo, ['test'], function(error, stdout) {
execFile(echo, ['test'], function(error, stdout) {
assert.equal(error, null);
assert.equal(stdout, 'test\n');
return done();

26
spec/chromium-spec.js
View file

@ -1,18 +1,11 @@
var BrowserWindow, assert, http, https, path, ref, remote, session, ws;
const assert = require('assert');
const http = require('http');
const path = require('path');
const ws = require('ws');
const remote = require('electron').remote;
assert = require('assert');
http = require('http');
https = require('https');
path = require('path');
ws = require('ws');
remote = require('electron').remote;
ref = remote.require('electron'), BrowserWindow = ref.BrowserWindow, session = ref.session;
const BrowserWindow = remote.require('electron').BrowserWindow;
const session = remote.require('electron').session;
describe('chromium feature', function() {
var fixtures, listener;
@ -310,8 +303,7 @@ describe('chromium feature', function() {
return it('has user agent', function(done) {
server = http.createServer();
return server.listen(0, '127.0.0.1', function() {
var port, websocket;
port = server.address().port;
var port = server.address().port;
wss = new WebSocketServer({
server: server
});
@ -323,7 +315,7 @@ describe('chromium feature', function() {
return done('user agent is empty');
}
});
return websocket = new WebSocket("ws://127.0.0.1:" + port);
new WebSocket("ws://127.0.0.1:" + port);
});
});
});

12
spec/modules-spec.js
View file

@ -1,12 +1,6 @@
var assert, fs, path, temp;
assert = require('assert');
fs = require('fs');
path = require('path');
temp = require('temp');
const assert = require('assert');
const path = require('path');
const temp = require('temp');
describe('third-party module', function() {
var fixtures;

20
spec/node-spec.js
View file

@ -1,16 +1,8 @@
var assert, child_process, fs, os, path, remote;
assert = require('assert');
child_process = require('child_process');
fs = require('fs');
path = require('path');
os = require('os');
remote = require('electron').remote;
const assert = require('assert');
const child_process = require('child_process');
const path = require('path');
const os = require('os');
const remote = require('electron').remote;
describe('node feature', function() {
var fixtures;
@ -103,7 +95,7 @@ describe('node feature', function() {
error = new Error('boo!');
lsts = process.listeners('uncaughtException');
process.removeAllListeners('uncaughtException');
process.on('uncaughtException', function(err) {
process.on('uncaughtException', function() {
var i, len, lst;
process.removeAllListeners('uncaughtException');
for (i = 0, len = lsts.length; i < len; i++) {

23
spec/webview-spec.js
View file

@ -31,8 +31,7 @@ describe('<webview> tag', function() {
return document.body.appendChild(webview);
});
return it('navigates to new page when changed', function(done) {
var listener;
listener = function(e) {
var listener = function() {
webview.src = "file://" + fixtures + "/pages/b.html";
webview.addEventListener('console-message', function(e) {
assert.equal(e.message, 'b');
@ -74,11 +73,9 @@ describe('<webview> tag', function() {
});
if (process.platform !== 'win32' || process.execPath.toLowerCase().indexOf('\\out\\d\\') === -1) {
return it('loads native modules when navigation happens', function(done) {
var listener;
listener = function(e) {
var listener2;
var listener = function() {
webview.removeEventListener('did-finish-load', listener);
listener2 = function(e) {
var listener2 = function(e) {
assert.equal(e.message, 'function');
return done();
};
@ -123,7 +120,7 @@ describe('<webview> tag', function() {
webview.removeEventListener('ipc-message', listener);
return done();
};
listener2 = function(e) {
listener2 = function() {
webview.send('ping', message);
return webview.removeEventListener('did-finish-load', listener2);
};
@ -459,7 +456,7 @@ describe('<webview> tag', function() {
webview.removeEventListener('ipc-message', listener);
return done();
};
listener2 = function(e) {
listener2 = function() {
webview.reload();
return webview.removeEventListener('did-finish-load', listener2);
};
@ -520,7 +517,7 @@ describe('<webview> tag', function() {
describe('dom-ready event', function() {
return it('emits when document is loaded', function(done) {
var server;
server = http.createServer(function(req) {});
server = http.createServer(function() {});
return server.listen(0, '127.0.0.1', function() {
var port;
port = server.address().port;
@ -538,11 +535,11 @@ describe('<webview> tag', function() {
}
return it('should support user gesture', function(done) {
var listener, listener2;
listener = function(e) {
listener = function() {
webview.removeEventListener('enter-html-full-screen', listener);
return done();
};
listener2 = function(e) {
listener2 = function() {
var jsScript;
jsScript = 'document.getElementsByTagName("video")[0].webkitRequestFullScreen()';
webview.executeJavaScript(jsScript, true);
@ -618,7 +615,7 @@ describe('<webview> tag', function() {
return done();
}
};
listener2 = function(e) {
listener2 = function() {
return requestId = webview.findInPage("virtual");
};
webview.addEventListener('found-in-page', listener);
@ -629,7 +626,7 @@ describe('<webview> tag', function() {
});
return xdescribe('did-change-theme-color event', function() {
return it('emits when theme color changes', function(done) {
webview.addEventListener('did-change-theme-color', function(e) {
webview.addEventListener('did-change-theme-color', function() {
return done();
});
webview.src = "file://" + fixtures + "/pages/theme-color.html";