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

Remove unneeded returns

Browse source
This commit is contained in:
Kevin Sawicki 2016-02-16 17:39:11 -08:00
parent e63c3c727a
commit 12adaa0570
14 changed files with 773 additions and 826 deletions
Download patch file Download diff file Expand all files Collapse all files

46
spec/api-menu-spec.js
View file

@ -15,12 +15,12 @@ describe('menu module', function() {
extra: 'field'
}
]);
return assert.equal(menu.items[0].extra, 'field');
assert.equal(menu.items[0].extra, 'field');
});
it('does not modify the specified template', function() {
var template = ipcRenderer.sendSync('eval', "var template = [{label: 'text', submenu: [{label: 'sub'}]}];\nrequire('electron').Menu.buildFromTemplate(template);\ntemplate;");
return assert.deepStrictEqual(template, [
assert.deepStrictEqual(template, [
{
label: 'text',
submenu: [
@ -32,7 +32,7 @@ describe('menu module', function() {
]);
});
return describe('Menu.buildFromTemplate should reorder based on item position specifiers', function() {
describe('Menu.buildFromTemplate should reorder based on item position specifiers', function() {
it('should position before existing item', function() {
var menu = Menu.buildFromTemplate([
{
@ -49,7 +49,7 @@ describe('menu module', function() {
]);
assert.equal(menu.items[0].label, '1');
assert.equal(menu.items[1].label, '2');
return assert.equal(menu.items[2].label, '3');
assert.equal(menu.items[2].label, '3');
});
it('should position after existing item', function() {
@ -68,7 +68,7 @@ describe('menu module', function() {
]);
assert.equal(menu.items[0].label, '1');
assert.equal(menu.items[1].label, '2');
return assert.equal(menu.items[2].label, '3');
assert.equal(menu.items[2].label, '3');
});
it('should position at endof existing separator groups', function() {
@ -112,7 +112,7 @@ describe('menu module', function() {
assert.equal(menu.items[4].id, 'letters');
assert.equal(menu.items[5].label, 'a');
assert.equal(menu.items[6].label, 'b');
return assert.equal(menu.items[7].label, 'c');
assert.equal(menu.items[7].label, 'c');
});
it('should create separator group if endof does not reference existing separator group', function() {
@ -150,10 +150,10 @@ describe('menu module', function() {
assert.equal(menu.items[4].id, 'numbers');
assert.equal(menu.items[5].label, '1');
assert.equal(menu.items[6].label, '2');
return assert.equal(menu.items[7].label, '3');
assert.equal(menu.items[7].label, '3');
});
return it('should continue inserting items at next index when no specifier is present', function() {
it('should continue inserting items at next index when no specifier is present', function() {
var menu = Menu.buildFromTemplate([
{
label: '4',
@ -177,13 +177,13 @@ describe('menu module', function() {
assert.equal(menu.items[1].label, '2');
assert.equal(menu.items[2].label, '3');
assert.equal(menu.items[3].label, '4');
return assert.equal(menu.items[4].label, '5');
assert.equal(menu.items[4].label, '5');
});
});
});
describe('Menu.insert', function() {
return it('should store item in @items by its index', function() {
it('should store item in @items by its index', function() {
var menu = Menu.buildFromTemplate([
{
label: '1'
@ -200,27 +200,27 @@ describe('menu module', function() {
assert.equal(menu.items[0].label, '1');
assert.equal(menu.items[1].label, 'inserted');
assert.equal(menu.items[2].label, '2');
return assert.equal(menu.items[3].label, '3');
assert.equal(menu.items[3].label, '3');
});
});
describe('MenuItem.click', function() {
return it('should be called with the item object passed', function(done) {
it('should be called with the item object passed', function(done) {
var menu = Menu.buildFromTemplate([
{
label: 'text',
click: function(item) {
assert.equal(item.constructor.name, 'MenuItem');
assert.equal(item.label, 'text');
return done();
done();
}
}
]);
return menu.delegate.executeCommand(menu.items[0].commandId);
menu.delegate.executeCommand(menu.items[0].commandId);
});
});
return describe('MenuItem with checked property', function() {
describe('MenuItem with checked property', function() {
it('clicking an checkbox item should flip the checked property', function() {
var menu = Menu.buildFromTemplate([
{
@ -230,7 +230,7 @@ describe('menu module', function() {
]);
assert.equal(menu.items[0].checked, false);
menu.delegate.executeCommand(menu.items[0].commandId);
return assert.equal(menu.items[0].checked, true);
assert.equal(menu.items[0].checked, true);
});
it('clicking an radio item should always make checked property true', function() {
@ -243,7 +243,7 @@ describe('menu module', function() {
menu.delegate.executeCommand(menu.items[0].commandId);
assert.equal(menu.items[0].checked, true);
menu.delegate.executeCommand(menu.items[0].commandId);
return assert.equal(menu.items[0].checked, true);
assert.equal(menu.items[0].checked, true);
});
it('at least have one item checked in each group', function() {
@ -267,7 +267,7 @@ describe('menu module', function() {
menu = Menu.buildFromTemplate(template);
menu.delegate.menuWillShow();
assert.equal(menu.items[0].checked, true);
return assert.equal(menu.items[12].checked, true);
assert.equal(menu.items[12].checked, true);
});
it('should assign groupId automatically', function() {
@ -293,14 +293,12 @@ describe('menu module', function() {
for (i = l = 0; l <= 10; i = ++l) {
assert.equal(menu.items[i].groupId, groupId);
}
results = [];
for (i = m = 12; m <= 20; i = ++m) {
results.push(assert.equal(menu.items[i].groupId, groupId + 1));
assert.equal(menu.items[i].groupId, groupId + 1);
}
return results;
});
return it("setting 'checked' should flip other items' 'checked' property", function() {
it("setting 'checked' should flip other items' 'checked' property", function() {
var i, j, k, l, m, menu, n, o, p, q, results, template;
template = [];
for (i = j = 0; j <= 10; i = ++j) {
@ -341,11 +339,9 @@ describe('menu module', function() {
assert.equal(menu.items[i].checked, false);
}
assert.equal(menu.items[12].checked, true);
results = [];
for (i = q = 13; q <= 20; i = ++q) {
results.push(assert.equal(menu.items[i].checked, false));
assert.equal(menu.items[i].checked, false);
}
return results;
});
});
});