factorise axis generation

src/axes.js

@@ -3,19 +3,23 @@ import reduce from 'lodash/reduce'
 import {arc} from 'd3-shape'
 import logger from './logger'
 
+const _buildAxisDta = (value, axesGroup, conf) => {
+  return {
+    value: value,
+    thickness: axesGroup.thickness || 1,
+    color: axesGroup.color || '#d3d3d3',
+    opacity: axesGroup.opacity || conf.opacity
+  }
+}
+
 const _buildAxesData = (conf) => {
   return reduce(conf.axes, (aggregator, axesGroup) => {
     if (!axesGroup.position && !axesGroup.spacing) {
       logger.warn('Skipping axe group with no position and spacing defined')
       return aggregator
     }
     if (axesGroup.position) {
-      aggregator.push({
-        value: axesGroup.position,
-        thickness: axesGroup.thickness || 1,
-        color: axesGroup.color || '#d3d3d3',
-        opacity: axesGroup.opacity || conf.opacity
-      })
+      aggregator.push(_buildAxisDta(axesGroup.position, axesGroup, conf))
     }
     if (axesGroup.spacing) {
       const builtAxes = range(
@@ -24,12 +28,7 @@ const _buildAxesData = (conf) => {
         axesGroup.spacing
       )
         .map((value) => {
-          return {
-            value: value,
-            thickness: axesGroup.thickness || 1,
-            color: axesGroup.color || '#d3d3d3',
-            opacity: axesGroup.opacity || conf.opacity
-          }
+          return _buildAxisDta(value, axesGroup, conf)
         })
       return aggregator.concat(builtAxes)
     }

src/axes.test.js

@@ -1,11 +1,12 @@
 import { describe, it } from 'mocha'
-import { expect, use } from 'chai'
+import chai from 'chai'
 import { spy } from 'sinon'
 import sinonChai from 'sinon-chai'
 import forEach from 'lodash/forEach'
 import { _buildAxesData } from './axes'
 
-use(sinonChai)
+const expect = chai.expect
+chai.use(sinonChai)
 
 describe('Axes', () => {
   it('should log an warning if no position and spacing are defined', () => {