Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #810 from cdriscol/menus_service_issue
Browse files Browse the repository at this point in the history 
Fixing Menus service remove bugs.
  • Loading branch information
@lirantal
lirantal committed Aug 18, 2015
2 parents 5b78706 + ec3af65 commit 793187c
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 100 deletions.
10 changes: 5 additions & 5 deletions modules/core/client/services/menus.client.service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ angular.module('core').service('Menus', [
// Add submenu items
if (options.items) {
for (var i in options.items) {
this.addSubMenuItem(menuId, options.link, options.items[i]);
this.addSubMenuItem(menuId, options.state, options.items[i]);
}
}

Expand Down Expand Up @@ -133,13 +133,13 @@ angular.module('core').service('Menus', [
};

// Remove existing menu object by menu id
this.removeMenuItem = function (menuId, menuItemURL) {
this.removeMenuItem = function (menuId, menuItemState) {
// Validate that the menu exists
this.validateMenuExistance(menuId);

// Search for menu item to remove
for (var itemIndex in this.menus[menuId].items) {
if (this.menus[menuId].items[itemIndex].link === menuItemURL) {
if (this.menus[menuId].items[itemIndex].state === menuItemState) {
this.menus[menuId].items.splice(itemIndex, 1);
}
}
Expand All @@ -149,14 +149,14 @@ angular.module('core').service('Menus', [
};

// Remove existing menu object by menu id
this.removeSubMenuItem = function (menuId, submenuItemURL) {
this.removeSubMenuItem = function (menuId, submenuItemState) {
// Validate that the menu exists
this.validateMenuExistance(menuId);

// Search for menu item to remove
for (var itemIndex in this.menus[menuId].items) {
for (var subitemIndex in this.menus[menuId].items[itemIndex].items) {
if (this.menus[menuId].items[itemIndex].items[subitemIndex].link === submenuItemURL) {
if (this.menus[menuId].items[itemIndex].items[subitemIndex].state === submenuItemState) {
this.menus[menuId].items[itemIndex].items.splice(subitemIndex, 1);
}
}
Expand Down
169 changes: 74 additions & 95 deletions modules/core/tests/client/menus.client.service.tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@
it('should render if menu is public', function() {
expect(menu.shouldRender()).toBeTruthy();
});

it('should not render if menu is private', function() {
menu = Menus.addMenu('menu1', {
isPublic: false
});
expect(menu.shouldRender()).toBeFalsy();
});
});

describe('when logged in', function() {
Expand Down Expand Up @@ -174,7 +181,6 @@
class: 'class',
isPublic: false,
roles: ['a', 'b'],
link: 'link',
position: 2,
items: [subMenuItem1, subMenuItem2]
},
Expand Down Expand Up @@ -229,8 +235,8 @@
});

it('should call addSubMenuItem for each item in options', function() {
expect(Menus.addSubMenuItem).toHaveBeenCalledWith(menuId, menuItemOptions.link, subMenuItem1);
expect(Menus.addSubMenuItem).toHaveBeenCalledWith(menuId, menuItemOptions.link, subMenuItem2);
expect(Menus.addSubMenuItem).toHaveBeenCalledWith(menuId, menuItemOptions.state, subMenuItem1);
expect(Menus.addSubMenuItem).toHaveBeenCalledWith(menuId, menuItemOptions.state, subMenuItem2);
});
});

Expand Down Expand Up @@ -264,22 +270,16 @@

describe('removeMenuItem', function() {
var menuId = 'menuId',
menuItemURL = 'url',
menuItem1 = {
link: menuItemURL
},
menuItem2 = {
link: ''
},
newMenu = {
items: [menuItem1, menuItem2]
},
menu = null;
menuItemState = 'menu.state1',
menuItemState2 = 'menu.state2',
menu;

beforeEach(function() {
Menus.menus.menuId = newMenu;
Menus.addMenu(menuId);
Menus.addMenuItem(menuId, { state: menuItemState });
Menus.addMenuItem(menuId, { state: menuItemState2 });
Menus.validateMenuExistance = jasmine.createSpy();
menu = Menus.removeMenuItem(menuId, menuItemURL);
menu = Menus.removeMenuItem(menuId, menuItemState);
});

it('should return menu object', function() {
Expand All @@ -290,55 +290,60 @@
expect(Menus.validateMenuExistance).toHaveBeenCalledWith(menuId);
});

it('should remove sub menu items with same link', function() {
it('should remove sub menu items with same state', function() {
expect(menu.items.length).toBe(1);
expect(menu.items[0]).toBe(menuItem2);
expect(menu.items[0].state).toBe(menuItemState2);
});
});

describe('addSubMenuItem', function() {
var subItemOptions = {
title: 'title',
state: 'state',
state: 'sub.state',
isPublic: false,
roles: ['a', 'b'],
position: 4
};
var menuId = 'menu1',
menuItem1 = {
state: 'state',
menuItem1Options = {
state: 'item1.state',
items: [],
isPublic: false
},
menuItem2 = {
state: 'state2',
menuItem2Options = {
state: 'item2.state2',
items: [],
isPublic: true,
roles: ['a']
},
menuItem3 = {
state: 'state3',
items: []
},
newMenu = {
items: [menuItem1, menuItem2, menuItem3]
},
menuItem1,
menuItem2,
menuItem3,
subItem1,
subItem2,
menu;

beforeEach(function() {
Menus.validateMenuExistance = jasmine.createSpy();
Menus.menus[menuId] = newMenu;
Menus.addSubMenuItem(menuId, menuItem1.state, subItemOptions);
menu = Menus.addSubMenuItem(menuId, menuItem2.state);
Menus.addMenu(menuId);
Menus.addMenuItem(menuId, menuItem1Options);
Menus.addMenuItem(menuId, menuItem2Options);
Menus.addMenuItem(menuId, {state:'something.else'});
Menus.addSubMenuItem(menuId, menuItem1Options.state, subItemOptions);
menu = Menus.addSubMenuItem(menuId, menuItem1Options.state);
menuItem1 = menu.items[0];
menuItem2 = menu.items[1];
menuItem3 = menu.items[2];
subItem1 = menuItem1.items[0];
subItem2 = menuItem1.items[1];
});

afterEach(function() {
menuItem1.items = [];
menuItem2.items = [];
Menus.removeMenu(menuId);
});

it('should return menu object', function() {
expect(menu).toEqual(newMenu);
expect(menu).not.toBeNull();
});

it('should validate menu existance', function() {
Expand All @@ -350,101 +355,75 @@
});

it('should set shouldRender', function() {
expect(menuItem1.items[0].shouldRender).toBeDefined();
expect(subItem1.shouldRender).toBeDefined();
});

describe('with options set', function() {
var subMenuItem;
beforeEach(function() {
subMenuItem = menuItem1.items[0];
});

it('should add sub menu item to menu item', function() {
expect(menuItem1.items.length).toBe(1);
expect(subItem1).toBeDefined();
});

it('should set title to options title', function() {
expect(subMenuItem.title).toBe(subItemOptions.title);
expect(subItem1.title).toBe(subItemOptions.title);
});

it('should set state to options state', function() {
expect(subMenuItem.state).toBe(subItemOptions.state);
expect(subItem1.state).toBe(subItemOptions.state);
});

it('should set roles to options roles', function() {
expect(subMenuItem.roles).toEqual(subItemOptions.roles);
expect(subItem1.roles).toEqual(subItemOptions.roles);
});

it('should set position to options position', function() {
expect(subMenuItem.position).toEqual(subItemOptions.position);
expect(subItem1.position).toEqual(subItemOptions.position);
});
});

describe('without optoins set', function() {
var subMenuItem;
beforeEach(function() {
subMenuItem = menuItem2.items[0];
it('should add sub menu item to menu item', function() {
expect(subItem2).toBeDefined();
});

it('should add sub menu item to menu item', function() {
expect(menuItem2.items.length).toBe(1);
it('should set isPublic to parent isPublic', function() {
expect(subItem2.isPublic).toBe(menuItem1.isPublic);
});

it('should set title to blank', function() {
expect(subMenuItem.title).toBe('');
expect(subItem2.title).toBe('');
});

it('should set state to blank', function() {
expect(subMenuItem.state).toBe('');
expect(subItem2.state).toBe('');
});

it('should set roles to parent roles', function() {
expect(subMenuItem.roles).toEqual(menuItem2.roles);
expect(subItem2.roles).toEqual(menuItem1.roles);
});

it('should set position to 0', function() {
expect(subMenuItem.position).toBe(0);
expect(subItem2.position).toBe(0);
});
});
});

describe('removeSubMenuItem', function() {
var menuId = 'menu1',
subMenuItem1 = {
link: 'link1'
},
subMenuItem2 = {
link: 'link2'
},
menuItem1 = {
state: 'state',
items: [subMenuItem1, subMenuItem2],
},
menuItem2 = {
state: 'state2',
items: [],
},
newMenu = {
items: [menuItem1, menuItem2]
},
menu;
beforeEach(function() {
Menus.validateMenuExistance = jasmine.createSpy();
Menus.menus[menuId] = newMenu;
menu = Menus.removeSubMenuItem(menuId, subMenuItem1.link);
});

it('should validate menu existance', function() {
expect(Menus.validateMenuExistance).toHaveBeenCalledWith(menuId);
});

it('should return menu object', function() {
expect(menu).toEqual(newMenu);
});

it('should remove sub menu item', function() {
expect(menuItem1.items.length).toBe(1);
expect(menuItem1.items[0]).toEqual(subMenuItem2);

describe('then removeSubMenuItem', function() {
beforeEach(function() {
Menus.validateMenuExistance = jasmine.createSpy();
menu = Menus.removeSubMenuItem(menuId, subItem1.state);
});

it('should validate menu existance', function() {
expect(Menus.validateMenuExistance).toHaveBeenCalledWith(menuId);
});

it('should return menu object', function() {
expect(menu).toBeDefined();
});

it('should remove sub menu item', function() {
expect(menuItem1.items.length).toBe(1);
expect(menuItem1.items[0].state).toEqual(subItem2.state);
});
});
});
});
Expand Down

0 comments on commit 793187c

Please sign in to comment.