Merge pull request #8 from spenceralger/shelby_2803

Fix texts for elastic#2803
spalger · Feb 3, 2015 · 6b6fab3 · 6b6fab3
2 parents 0fe3d4f + ff1fdc2
commit 6b6fab3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/kibana/components/vislib/visualizations/column_chart.js b/src/kibana/components/vislib/visualizations/column_chart.js
@@ -77,7 +77,7 @@ define(function (require) {
       .data(layers)
       .enter().append('g')
       .attr('class', function (d, i) {
-        return i;
+        return 'series ' + i;
       });
 
       bars = layer.selectAll('rect')

diff --git a/test/unit/specs/vislib/visualizations/column_chart.js b/test/unit/specs/vislib/visualizations/column_chart.js
@@ -90,11 +90,7 @@ define(function (require) {
             numOfSeries = chart.chartData.series.length;
             numOfValues = chart.chartData.series[0].values.length;
             product = numOfSeries * numOfValues;
-
-            // remove brushing el before counting rects
-            $(chart.chartEl).find('g.brush').remove();
-
-            expect($(chart.chartEl).find('rect')).to.have.length(product);
+            expect($(chart.chartEl).find('.series rect')).to.have.length(product);
           });
         });
       });
@@ -112,13 +108,12 @@ define(function (require) {
 
       describe('addBarEvents method', function () {
         function checkChart(chart) {
-          var rect = $(chart.chartEl).find('rect')[4];
-          var d3selectedRect = d3.select(rect)[0][0];
+          var rect = $(chart.chartEl).find('.series rect').get(0);
 
           // check for existance of stuff and things
           return {
-            click: !!d3selectedRect.__onclick,
-            mouseOver: !!d3selectedRect.__onmouseover,
+            click: !!rect.__onclick,
+            mouseOver: !!rect.__onmouseover,
             // D3 brushing requires that a g element is appended that
             // listens for mousedown events. This g element includes
             // listeners, however, I was not able to test for the listener