Remove unneeded returns
This commit is contained in:
parent
e63c3c727a
commit
12adaa0570
14 changed files with 773 additions and 826 deletions
|
@ -12,7 +12,7 @@ const comparePaths = function(path1, path2) {
|
|||
path1 = path1.toLowerCase();
|
||||
path2 = path2.toLowerCase();
|
||||
}
|
||||
return assert.equal(path1, path2);
|
||||
assert.equal(path1, path2);
|
||||
};
|
||||
|
||||
describe('ipc module', function() {
|
||||
|
@ -23,27 +23,26 @@ describe('ipc module', function() {
|
|||
var dialog1, dialog2;
|
||||
dialog1 = remote.require('electron');
|
||||
dialog2 = remote.require('electron');
|
||||
return assert.equal(dialog1, dialog2);
|
||||
assert.equal(dialog1, dialog2);
|
||||
});
|
||||
|
||||
it('should work when object contains id property', function() {
|
||||
var a;
|
||||
a = remote.require(path.join(fixtures, 'module', 'id.js'));
|
||||
return assert.equal(a.id, 1127);
|
||||
var a = remote.require(path.join(fixtures, 'module', 'id.js'));
|
||||
assert.equal(a.id, 1127);
|
||||
});
|
||||
|
||||
return it('should search module from the user app', function() {
|
||||
it('should search module from the user app', function() {
|
||||
comparePaths(path.normalize(remote.process.mainModule.filename), path.resolve(__dirname, 'static', 'main.js'));
|
||||
return comparePaths(path.normalize(remote.process.mainModule.paths[0]), path.resolve(__dirname, 'static', 'node_modules'));
|
||||
comparePaths(path.normalize(remote.process.mainModule.paths[0]), path.resolve(__dirname, 'static', 'node_modules'));
|
||||
});
|
||||
});
|
||||
|
||||
describe('remote.createFunctionWithReturnValue', function() {
|
||||
return it('should be called in browser synchronously', function() {
|
||||
it('should be called in browser synchronously', function() {
|
||||
var buf = new Buffer('test');
|
||||
var call = remote.require(path.join(fixtures, 'module', 'call.js'));
|
||||
var result = call.call(remote.createFunctionWithReturnValue(buf));
|
||||
return assert.equal(result.constructor.name, 'Buffer');
|
||||
assert.equal(result.constructor.name, 'Buffer');
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -55,14 +54,14 @@ describe('ipc module', function() {
|
|||
assert.equal(property.property, 1007);
|
||||
var property2 = remote.require(path.join(fixtures, 'module', 'property.js'));
|
||||
assert.equal(property2.property, 1007);
|
||||
return property.property = 1127;
|
||||
property.property = 1127;
|
||||
});
|
||||
|
||||
return it('can construct an object from its member', function() {
|
||||
it('can construct an object from its member', function() {
|
||||
var call, obj;
|
||||
call = remote.require(path.join(fixtures, 'module', 'call.js'));
|
||||
obj = new call.constructor;
|
||||
return assert.equal(obj.test, 'test');
|
||||
assert.equal(obj.test, 'test');
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -72,48 +71,48 @@ describe('ipc module', function() {
|
|||
it('keeps its constructor name for objects', function() {
|
||||
var buf = new Buffer('test');
|
||||
var print_name = remote.require(print);
|
||||
return assert.equal(print_name.print(buf), 'Buffer');
|
||||
assert.equal(print_name.print(buf), 'Buffer');
|
||||
});
|
||||
|
||||
return it('supports instanceof Date', function() {
|
||||
it('supports instanceof Date', function() {
|
||||
var now = new Date();
|
||||
var print_name = remote.require(print);
|
||||
assert.equal(print_name.print(now), 'Date');
|
||||
return assert.deepEqual(print_name.echo(now), now);
|
||||
assert.deepEqual(print_name.echo(now), now);
|
||||
});
|
||||
});
|
||||
|
||||
describe('remote promise', function() {
|
||||
return it('can be used as promise in each side', function(done) {
|
||||
it('can be used as promise in each side', function(done) {
|
||||
var promise = remote.require(path.join(fixtures, 'module', 'promise.js'));
|
||||
return promise.twicePromise(Promise.resolve(1234)).then(function(value) {
|
||||
promise.twicePromise(Promise.resolve(1234)).then(function(value) {
|
||||
assert.equal(value, 2468);
|
||||
return done();
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('ipc.sender.send', function() {
|
||||
return it('should work when sending an object containing id property', function(done) {
|
||||
it('should work when sending an object containing id property', function(done) {
|
||||
var obj = {
|
||||
id: 1,
|
||||
name: 'ly'
|
||||
};
|
||||
ipcRenderer.once('message', function(event, message) {
|
||||
assert.deepEqual(message, obj);
|
||||
return done();
|
||||
done();
|
||||
});
|
||||
return ipcRenderer.send('message', obj);
|
||||
ipcRenderer.send('message', obj);
|
||||
});
|
||||
});
|
||||
|
||||
describe('ipc.sendSync', function() {
|
||||
it('can be replied by setting event.returnValue', function() {
|
||||
var msg = ipcRenderer.sendSync('echo', 'test');
|
||||
return assert.equal(msg, 'test');
|
||||
assert.equal(msg, 'test');
|
||||
});
|
||||
|
||||
return it('does not crash when reply is not sent and browser is destroyed', function(done) {
|
||||
it('does not crash when reply is not sent and browser is destroyed', function(done) {
|
||||
this.timeout(10000);
|
||||
|
||||
var w = new BrowserWindow({
|
||||
|
@ -122,20 +121,20 @@ describe('ipc module', function() {
|
|||
ipcMain.once('send-sync-message', function(event) {
|
||||
event.returnValue = null;
|
||||
w.destroy();
|
||||
return done();
|
||||
done();
|
||||
});
|
||||
return w.loadURL('file://' + path.join(fixtures, 'api', 'send-sync-message.html'));
|
||||
w.loadURL('file://' + path.join(fixtures, 'api', 'send-sync-message.html'));
|
||||
});
|
||||
});
|
||||
|
||||
return describe('remote listeners', function() {
|
||||
describe('remote listeners', function() {
|
||||
var w = null;
|
||||
|
||||
afterEach(function() {
|
||||
return w.destroy();
|
||||
w.destroy();
|
||||
});
|
||||
|
||||
return it('can be added and removed correctly', function() {
|
||||
it('can be added and removed correctly', function() {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
|
@ -143,7 +142,7 @@ describe('ipc module', function() {
|
|||
w.on('test', listener);
|
||||
assert.equal(w.listenerCount('test'), 1);
|
||||
w.removeListener('test', listener);
|
||||
return assert.equal(w.listenerCount('test'), 0);
|
||||
assert.equal(w.listenerCount('test'), 0);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue