GUI -- Reworked ButtonService unit tests (fixed logic error).
Change-Id: I793c02a327885b746ccf2345156f7a5fd1007bd2
diff --git a/web/gui/src/main/webapp/tests/app/fw/widget/toolbar-spec.js b/web/gui/src/main/webapp/tests/app/fw/widget/toolbar-spec.js
index 179c011..7350c1b 100644
--- a/web/gui/src/main/webapp/tests/app/fw/widget/toolbar-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/widget/toolbar-spec.js
@@ -36,13 +36,13 @@
// TODO: figure out solution for calling tests with new info instead of calling init
beforeEach(function () {
- d3Elem = d3.select('body').append('div').attr('id', 'floatpanels');
+ d3Elem = d3.select('body').append('div').attr('id', 'testToolbar');
tbs.init();
ps.init();
});
afterEach(function () {
- d3.select('#floatpanels').remove();
+ d3.select('#testToolbar').remove();
tbs.init();
ps.init();
});
@@ -61,11 +61,13 @@
it('should warn if createToolbar id is invalid', function () {
spyOn($log, 'warn');
expect(tbs.createToolbar()).toBeNull();
- expect($log.warn).toHaveBeenCalledWith('createToolbar: no ID given');
+ expect($log.warn).toHaveBeenCalledWith('createToolbar: ' +
+ 'no ID given: [undefined]');
expect(tbs.createToolbar('test')).toBeTruthy();
expect(tbs.createToolbar('test')).toBeNull();
- expect($log.warn).toHaveBeenCalledWith('createToolbar: ID already exists');
+ expect($log.warn).toHaveBeenCalledWith('createToolbar: ' +
+ 'duplicate ID given: [undefined]');
});
it('should create an unpopulated toolbar', function () {