GUI -- Garbage can icon added to app view, fixed broken unit tests.
Change-Id: I1efdf764b242cc020049d31d569e8956aed6719c
diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
index d796ae3..9709ec7 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
@@ -20,7 +20,7 @@
describe('factory: fw/svg/glyph.js', function() {
var $log, fs, gs, d3Elem, svg;
- var numBaseGlyphs = 41,
+ var numBaseGlyphs = 42,
vbBird = '352 224 113 112',
vbGlyph = '0 0 110 110',
vbBadge = '0 0 10 10',
@@ -43,6 +43,7 @@
lock: 'M79.4,48.6h',
topo: 'M97.2,76.3H86.6',
refresh: 'M102.6,40.8L88.4',
+ garbage: 'M94.6,20.2c',
// navigation specific glyphs
flowTable: tablePrefix + 'M102.2,23.6H7.9v',
@@ -86,6 +87,7 @@
glyphIds = [
'unknown', 'node', 'switch', 'roadm', 'endstation', 'router',
'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh',
+ 'garbage',
'flowTable', 'portTable', 'groupTable',
'summary', 'details', 'ports', 'map', 'cycleLabels',
'oblique', 'filters', 'resetZoom', 'relatedIntents', 'nextIntent',
diff --git a/web/gui/src/main/webapp/tests/app/fw/widget/tableBuilder-spec.js b/web/gui/src/main/webapp/tests/app/fw/widget/tableBuilder-spec.js
index 3353805..0372a25 100644
--- a/web/gui/src/main/webapp/tests/app/fw/widget/tableBuilder-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/widget/tableBuilder-spec.js
@@ -19,7 +19,7 @@
*/
describe('factory: fw/widget/tableBuilder.js', function () {
- var $log, $rootScope, fs, tbs;
+ var $log, $rootScope, fs, tbs, is;
var mockObj,
mockWss = {
@@ -28,7 +28,7 @@
unbindHandlers: function () {}
};
- beforeEach(module('onosWidget', 'onosUtil', 'onosRemote'));
+ beforeEach(module('onosWidget', 'onosUtil', 'onosRemote', 'onosSvg'));
beforeEach(function () {
module(function ($provide) {
@@ -37,11 +37,12 @@
});
beforeEach(inject(function (_$log_, _$rootScope_,
- FnService, TableBuilderService) {
+ FnService, TableBuilderService, IconService) {
$log = _$log_;
$rootScope = _$rootScope_;
fs = FnService;
tbs = TableBuilderService;
+ is = IconService;
}));
function mockSelCb(event, sel) {}