GUI -- Updated Equalize Master glyph. SVG practice progress - better algorithm for changing button position. Various other small edits.
Change-Id: I4d04a31b3cf5b329b2227c6ccf494de0b5603455
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 989fb9d..8f5728d 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
@@ -53,7 +53,7 @@
intentTraffic: 'M14.7,71.5h',
allTraffic: 'M15.7,64.5h-7v',
flows: 'M93.8,46.1c',
- eqMaster: 'M94.6,80.1c0,5.7',
+ eqMaster: 'M100.1,46.9l',
// badges
uiAttached: 'M2,2.5a.5,.5',
diff --git a/web/gui/src/main/webapp/tests/app/fw/widget/tooltip-spec.js b/web/gui/src/main/webapp/tests/app/fw/widget/tooltip-spec.js
index f5a8cef..a817dbc 100644
--- a/web/gui/src/main/webapp/tests/app/fw/widget/tooltip-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/widget/tooltip-spec.js
@@ -55,12 +55,24 @@
});
// testing mouse events is tough
-
+ // showTooltip needs a d3 event, which currently has no test backend
+ // .each is a workaround, which provides this, d, and i
xit('should show a tooltip', function () {
var btn = d3.select('body').append('div').attr('id', 'foo');
- // each is used to trigger a "mouse" event, providing this, d, and i
btn.each(function () {
tts.showTooltip(this, 'yay a tooltip');
});
+ // tests here
+ });
+
+ // can't cancel a tooltip until we show one
+ // because currElemId isn't set otherwise
+ xit('should cancel an existing tooltip', function () {
+ var btn = d3.select('body').append('div').attr('id', 'foo');
+ btn.each(function () {
+ tts.cancelTooltip(this);
+ });
+ expect(d3Elem.text()).toBe('');
+ expect(d3Elem.style('display')).toBe('none');
});
});