Merge pull request #498 from FormidableLabs/bug/chart-tick-format

Bug/chart tick format
FormidableLabs · Jul 17, 2017 · 330fa10 · 330fa10
2 parents 2828c21 + dade6db
commit 330fa10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/components/victory-chart/helper-methods.js b/src/components/victory-chart/helper-methods.js
@@ -139,7 +139,7 @@ export default {
       const dataTicks = ["", ...dataNames, ""];
       return (x) => dataTicks[x];
     } else {
-      return calculatedProps.scale[currentAxis].tickFormat() || identity;
+      return undefined;
     }
   },
 

diff --git a/test/client/spec/components/victory-chart/helper-methods.spec.js b/test/client/spec/components/victory-chart/helper-methods.spec.js
@@ -161,7 +161,6 @@ describe("victory-chart/helpers-methods", () => {
   describe("getTickFormat", () => {
     const stringMap = { x: { "a": 1, "b": 2, "c": 3 } };
     const nullStringMap = { x: null };
-    const scale = { x: { tickFormat: () => () => "scaleFormatTick" } };
 
     it("returns the identity function when tickValues are numerical", () => {
       const props = { tickValues: [1, 2, 3] };
@@ -179,12 +178,12 @@ describe("victory-chart/helpers-methods", () => {
       expect(formatResult(1)).to.equal("a");
     });
 
-    it("returns the tickFormat function from scale", () => {
+    it("returns undefined if no tickValues or stringMaps exist", () => {
       const victoryAxis = getVictoryAxis({});
       const formatResult = Helpers.getTickFormat(
-        victoryAxis, "x", { stringMap: nullStringMap, scale }
+        victoryAxis, "x", { stringMap: nullStringMap }
       );
-      expect(formatResult(1)).to.equal("scaleFormatTick");
+      expect(formatResult).to.equal(undefined);
     });
   });