From dd54ec76e71eb9e76b329fadc9b828d0ef97e6e4 Mon Sep 17 00:00:00 2001
From: Elastic Jasper <elastic-jasper@users.noreply.github.com>
Date: Wed, 15 Feb 2017 12:11:37 -0500
Subject: [PATCH] fixing broken group bar chart

Backports PR #10313

**Commit 1:**
fixing broken group bar chart

* Original sha: 37f3abee5bc5956e2d3774644547d977c6187c8d
* Authored by ppisljar <peter.pisljar@gmail.com> on 2017-02-13T16:21:05Z

**Commit 2:**
fixing test

* Original sha: 51aaecdb94cfce0016d26dd71c91d21270fc3fcb
* Authored by ppisljar <peter.pisljar@gmail.com> on 2017-02-13T17:48:07Z

**Commit 3:**
updating based on last review

* Original sha: 5d37d20fb8e24cf67757892aea21d3d872a8f2d2
* Authored by ppisljar <peter.pisljar@gmail.com> on 2017-02-15T09:15:08Z
---
 .../vislib/__tests__/visualizations/column_chart.js  | 12 ++++++++++--
 src/ui/public/vislib/lib/axis/axis_config.js         |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/ui/public/vislib/__tests__/visualizations/column_chart.js b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
index 35466967c8df9..b4c873d7c2771 100644
--- a/src/ui/public/vislib/__tests__/visualizations/column_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
@@ -69,8 +69,16 @@ dataTypesArray.forEach(function (dataType, i) {
         });
       });
 
-      it('should stack values', function () {
-        expect(isStacked).to.be(true);
+      it('should stack values when mode is stacked', function () {
+        if (mode === 'stacked') {
+          expect(isStacked).to.be(true);
+        }
+      });
+
+      it('should stack values when mode is percentage', function () {
+        if (mode === 'percentage') {
+          expect(isStacked).to.be(true);
+        }
       });
     });
 
diff --git a/src/ui/public/vislib/lib/axis/axis_config.js b/src/ui/public/vislib/lib/axis/axis_config.js
index 0a766f9687d00..4a08503554781 100644
--- a/src/ui/public/vislib/lib/axis/axis_config.js
+++ b/src/ui/public/vislib/lib/axis/axis_config.js
@@ -138,6 +138,7 @@ export default function AxisConfigFactory() {
           break;
         case SCALE_MODES.GROUPED:
           offset = 'group';
+          stacked = false;
           break;
         case SCALE_MODES.PERCENTAGE:
           offset = 'expand';