Fix smells + coverage (#43)

* Fix smells + coverage

* coverage

* add fixtures

* Exclude tests from duplications

sonar-project.properties

@@ -11,6 +11,8 @@ sonar.organization=kurkle
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
 
-sonar.javascript.lcov.reportPaths=coverage/lcov.info
+sonar.javascript.lcov.reportPaths=coverage/chrome/lcov.info,coverage/firefox/lcov.info
 
 sonar.coverage.exclusions=**/test/**, **/types/**, **/*.config.js, **/*.conf.js
+
+sonar.cpd.exclusions=**/test/**

src/controller.js

@@ -28,8 +28,8 @@ export default class MatrixController extends DatasetController {
       const options = me.resolveDataElementOptions(i, mode);
       const {width, height, anchorX, anchorY} = options;
       const properties = {
-        x: anchorX === 'left' ? x : x - width / (anchorX === 'right' ? 1 : 2),
-        y: anchorY === 'top' ? y : y - height / (anchorY === 'bottom' ? 1 : 2),
+        x: resolveX(anchorX, x, width),
+        y: resolveY(anchorY, y, height),
         width,
         height,
         options
@@ -51,6 +51,26 @@ export default class MatrixController extends DatasetController {
   }
 }
 
+function resolveX(anchorX, x, width) {
+  if (anchorX === 'left' || anchorX === 'start') {
+    return x;
+  }
+  if (anchorX === 'right' || anchorX === 'end') {
+    return x - width;
+  }
+  return x - width / 2;
+}
+
+function resolveY(anchorY, y, height) {
+  if (anchorY === 'top' || anchorY === 'start') {
+    return y;
+  }
+  if (anchorY === 'bottom' || anchorY === 'end') {
+    return y - height;
+  }
+  return y - height / 2;
+}
+
 MatrixController.id = 'matrix';
 
 MatrixController.version = version;

test/fixtures/anchor/center-center.js

@@ -0,0 +1,38 @@
+module.exports = {
+  config: {
+    type: 'matrix',
+    data: {
+      datasets: [{
+        data: [
+          {x: 1, y: 1, v: 1},
+        ],
+        backgroundColor: 'red',
+        borderColor: 'black',
+        borderWidth: 2,
+        width: 50,
+        height: 50
+      }]
+    },
+    options: {
+      plugins: {
+        legend: false
+      },
+      scales: {
+        x: {
+          type: 'linear',
+          display: false
+        },
+        y: {
+          type: 'linear',
+          display: false
+        }
+      }
+    }
+  },
+  options: {
+    canvas: {
+      height: 256,
+      width: 256
+    }
+  }
+};

test/fixtures/anchor/left-bottom.js

@@ -0,0 +1,40 @@
+module.exports = {
+  config: {
+    type: 'matrix',
+    data: {
+      datasets: [{
+        anchorX: 'left',
+        anchorY: 'bottom',
+        data: [
+          {x: 1, y: 1, v: 1},
+        ],
+        backgroundColor: 'red',
+        borderColor: 'black',
+        borderWidth: 2,
+        width: 50,
+        height: 50
+      }]
+    },
+    options: {
+      plugins: {
+        legend: false
+      },
+      scales: {
+        x: {
+          type: 'linear',
+          display: false
+        },
+        y: {
+          type: 'linear',
+          display: false
+        }
+      }
+    }
+  },
+  options: {
+    canvas: {
+      height: 256,
+      width: 256
+    }
+  }
+};

test/fixtures/anchor/left-top.js

@@ -0,0 +1,40 @@
+module.exports = {
+  config: {
+    type: 'matrix',
+    data: {
+      datasets: [{
+        anchorX: 'left',
+        anchorY: 'top',
+        data: [
+          {x: 1, y: 1, v: 1},
+        ],
+        backgroundColor: 'red',
+        borderColor: 'black',
+        borderWidth: 2,
+        width: 50,
+        height: 50
+      }]
+    },
+    options: {
+      plugins: {
+        legend: false
+      },
+      scales: {
+        x: {
+          type: 'linear',
+          display: false
+        },
+        y: {
+          type: 'linear',
+          display: false
+        }
+      }
+    }
+  },
+  options: {
+    canvas: {
+      height: 256,
+      width: 256
+    }
+  }
+};

test/fixtures/anchor/right-bottom.js

@@ -0,0 +1,40 @@
+module.exports = {
+  config: {
+    type: 'matrix',
+    data: {
+      datasets: [{
+        anchorX: 'right',
+        anchorY: 'bottom',
+        data: [
+          {x: 1, y: 1, v: 1},
+        ],
+        backgroundColor: 'red',
+        borderColor: 'black',
+        borderWidth: 2,
+        width: 50,
+        height: 50
+      }]
+    },
+    options: {
+      plugins: {
+        legend: false
+      },
+      scales: {
+        x: {
+          type: 'linear',
+          display: false
+        },
+        y: {
+          type: 'linear',
+          display: false
+        }
+      }
+    }
+  },
+  options: {
+    canvas: {
+      height: 256,
+      width: 256
+    }
+  }
+};

test/fixtures/anchor/right-top.js

@@ -0,0 +1,40 @@
+module.exports = {
+  config: {
+    type: 'matrix',
+    data: {
+      datasets: [{
+        anchorX: 'right',
+        anchorY: 'top',
+        data: [
+          {x: 1, y: 1, v: 1},
+        ],
+        backgroundColor: 'red',
+        borderColor: 'black',
+        borderWidth: 2,
+        width: 50,
+        height: 50
+      }]
+    },
+    options: {
+      plugins: {
+        legend: false
+      },
+      scales: {
+        x: {
+          type: 'linear',
+          display: false
+        },
+        y: {
+          type: 'linear',
+          display: false
+        }
+      }
+    }
+  },
+  options: {
+    canvas: {
+      height: 256,
+      width: 256
+    }
+  }
+};

test/specs/scales.spec.js → test/specs/fixtures.spec.js

@@ -1 +1,2 @@
+describe('auto', jasmine.fixtures('anchor'));
 describe('auto', jasmine.fixtures('scales'));