fix some docs and tests

CHANGELOG.md

@@ -31,6 +31,7 @@ That changes are private and internal specific. They should not break most of `K
 * You can configure what mouse buttons can be used for drag&drop. To enable right button you can use `Konva.dragButtons = [0, 1]`.
 * Now you can hide stage `stage.visible(false)`. It will set its container display style to "none".
 * New method `stage.setPointersPositions(event)`. Usually you don't need to use it manually.
+* New method `layer.toggleHitCanvas()` to show and debug hit areas
 
 ### Changed
 * Full rewrite to Typescript with tons of refactoring and small optimizations. The public API should be 100% the same
@@ -48,6 +49,7 @@ That changes are private and internal specific. They should not break most of `K
 * Fixed some caching behavior when a node has `globalCompositeOperation`.
 * Fixed automatic updates for `Konva.Transformer`
 * Fixed container change for a stage.
+* Fixed warning for `width` and `height` attributes for `Konva.Text`
 
 ## [2.6.0][2018-12-14]
 

src/Factory.ts

@@ -21,27 +21,29 @@ export const Factory = {
         return val === undefined ? def : val;
       };
   },
+
   addSetter(constructor, attr, validator?, after?) {
-    // if (!validator && validator !== null) {
-    //   console.error(constructor, attr, 'has no validator.');
-    // }
     var method = SET + Util._capitalize(attr);
 
-    constructor.prototype[method] =
+    if (!constructor.prototype[method]) {
-      constructor.prototype[method] ||
+      Factory.overWriteSetter(constructor, attr, validator, after);
-      function(val) {
+    }
-        if (validator && val !== undefined && val !== null) {
+  },
-          val = validator.call(this, val, attr);
+  overWriteSetter(constructor, attr, validator?, after?) {
-        }
+    var method = SET + Util._capitalize(attr);
+    constructor.prototype[method] = function(val) {
+      if (validator && val !== undefined && val !== null) {
+        val = validator.call(this, val, attr);
+      }
 
-        this._setAttr(attr, val);
+      this._setAttr(attr, val);
 
-        if (after) {
+      if (after) {
-          after.call(this);
+        after.call(this);
-        }
+      }
 
-        return this;
+      return this;
-      };
+    };
   },
   addComponentsGetterSetter(constructor, attr, components, validator?, after?) {
     var len = components.length,

src/Layer.ts

@@ -61,9 +61,9 @@ export class Layer extends BaseLayer {
   /**
    * get visible intersection shape. This is the preferred
    * method for determining if a point intersects a shape or not
-   * also you may pass optional selector parametr to return ancestor of intersected shape
+   * also you may pass optional selector parameter to return ancestor of intersected shape
    * @method
-   * @memberof Konva.Layer.prototype
+   * @name Konva.Layer#getIntersection
    * @param {Object} pos
    * @param {Number} pos.x
    * @param {Number} pos.y
@@ -200,7 +200,6 @@ export class Layer extends BaseLayer {
    * disable hit graph
    * @name Konva.Layer#disableHitGraph
    * @method
-   * @memberof Konva.Layer.prototype
    * @returns {Layer}
    */
   disableHitGraph() {
@@ -208,7 +207,11 @@ export class Layer extends BaseLayer {
     return this;
   }
 
-  // document it:
+  /**
+   * Show or hide hit canvas over the stage. May be useful for debugging custom hitFunc
+   * @name Konva.Layer#toggleHitCanvas
+   * @method
+   */
   toggleHitCanvas() {
     if (!this.parent) {
       return;

src/Shape.ts

@@ -533,7 +533,6 @@ export class Shape extends Node {
       cachedHitCanvas = cachedCanvas && cachedCanvas.hit;
 
     if (!this.colorKey) {
-      console.log(this);
       Util.warn(
         'Looks like your canvas has a destroyed shape in it. Do not reuse shape after you destroyed it. See the shape in logs above. If you want to reuse shape you should call remove() instead of destroy()'
       );

src/Stage.ts

@@ -804,7 +804,6 @@ export class Stage extends Container {
 
 Stage.prototype.nodeType = STAGE;
 
-// TODO: test for replacing container
 /**
  * get/set container DOM element
  * @method

src/Tween.ts

@@ -394,44 +394,41 @@ export class Tween {
     }
   }
   _addListeners() {
-    var that = this;
-
     // start listeners
-    this.tween.onPlay = function() {
+    this.tween.onPlay = () => {
-      that.anim.start();
+      this.anim.start();
     };
-    this.tween.onReverse = function() {
+    this.tween.onReverse = () => {
-      that.anim.start();
+      this.anim.start();
     };
 
     // stop listeners
-    this.tween.onPause = function() {
+    this.tween.onPause = () => {
-      that.anim.stop();
+      this.anim.stop();
     };
-    this.tween.onFinish = function() {
+    this.tween.onFinish = () => {
-      // TODO: remove that any
+      var node = this.node as Node;
-      var node = that.node as any;
 
       // after tweening  points of line we need to set original end
-      var attrs = Tween.attrs[node._id][that._id];
+      var attrs = Tween.attrs[node._id][this._id];
       if (attrs.points && attrs.points.trueEnd) {
-        node.points(attrs.points.trueEnd);
+        node.setAttr('points', attrs.points.trueEnd);
       }
 
-      if (that.onFinish) {
+      if (this.onFinish) {
-        that.onFinish.call(that);
+        this.onFinish.call(this);
       }
     };
-    this.tween.onReset = function() {
+    this.tween.onReset = () => {
-      var node = that.node as any;
+      var node = this.node as any;
       // after tweening  points of line we need to set original start
-      var attrs = Tween.attrs[node._id][that._id];
+      var attrs = Tween.attrs[node._id][this._id];
       if (attrs.points && attrs.points.trueStart) {
         node.points(attrs.points.trueStart);
       }
 
-      if (that.onReset) {
+      if (this.onReset) {
-        that.onReset();
+        this.onReset();
       }
     };
   }

src/Util.ts

@@ -84,7 +84,7 @@ Collection.prototype = [] as any;
  * @param {Function} func
  * @example
  * // get all nodes with name foo inside layer, and set x to 10 for each
- * layer.get('.foo').each(function(shape, n) {
+ * layer.find('.foo').each(function(shape, n) {
  *   shape.setX(10);
  * });
  */
@@ -806,6 +806,9 @@ export const Util = {
     console.error(KONVA_ERROR + str);
   },
   warn(str) {
+    if (!getGlobalKonva().showWarnings) {
+      return;
+    }
     console.warn(KONVA_WARNING + str);
   },
   extend(child, parent) {

src/shapes/Label.ts

@@ -343,7 +343,7 @@ Factory.addGetterSetter(
 /**
  * get/set pointer height
  * @method
- * @memberof Konva.Tag.prototype
+ * @name Konva.Tag#pointerHeight
  * @param {Number} pointerHeight
  * @returns {Number}
  * @example

src/shapes/Path.ts

@@ -20,7 +20,8 @@ import { GetSet } from '../types';
  *   y: 40,
  *   data: 'M12.582,9.551C3.251,16.237,0.921,29.021,7.08,38.564l-2.36,1.689l4.893,2.262l4.893,2.262l-0.568-5.36l-0.567-5.359l-2.365,1.694c-4.657-7.375-2.83-17.185,4.352-22.33c7.451-5.338,17.817-3.625,23.156,3.824c5.337,7.449,3.625,17.813-3.821,23.152l2.857,3.988c9.617-6.893,11.827-20.277,4.935-29.896C35.591,4.87,22.204,2.658,12.582,9.551z',
  *   fill: 'green',
- *   scale: 2
+ *   scaleX: 2,
+ *   scaleY: 2
  * });
  */
 export class Path extends Shape {

src/shapes/Text.ts

@@ -524,12 +524,7 @@ Text.prototype._attrsAffectingSize = [
  * text.width('auto');
  * text.width() // will return calculated width, and not "auto"
  */
-Factory.addGetterSetter(
+Factory.overWriteSetter(Text, 'width', Validators.getNumberOrAutoValidator());
-  Text,
-  'width',
-  undefined,
-  Validators.getNumberOrAutoValidator()
-);
 
 /**
  * get/set the height of the text area, which takes into account multi-line text, line heights, and padding.
@@ -549,12 +544,7 @@ Factory.addGetterSetter(
  * text.height() // will return calculated height, and not "auto"
  */
 
-Factory.addGetterSetter(
+Factory.overWriteSetter(Text, 'height', Validators.getNumberOrAutoValidator());
-  Text,
-  'height',
-  undefined,
-  Validators.getNumberOrAutoValidator()
-);
 
 /**
  * get/set font family

src/shapes/TextPath.ts

@@ -175,12 +175,10 @@ export class TextPath extends Shape {
   getTextWidth() {
     return this.textWidth;
   }
-  /**
-   * get text line height in pixels
-   * @method
-   * @name Konva.TextPath#getTextHeight
-   */
   getTextHeight() {
+    Util.warn(
+      'text.getTextHeight() method is deprecated. Use text.height() - for full height and text.fontSize() - for one line height.'
+    );
     return this.textHeight;
   }
   setText(text) {

test/functional/MouseEvents-test.js

@@ -380,7 +380,6 @@ suite('MouseEvents', function() {
     });
     Konva.DD._endDragAfter({ dragEndNode: text });
 
-    //TODO: can't get this to pass
     assert.equal(
       click,
       true,

test/unit/Container-test.js

@@ -940,7 +940,7 @@ suite('Container', function() {
       strokeWidth: 2,
       shadowColor: 'black',
       shadowBlur: 2,
-      shadowOffset: [10, 10],
+      shadowOffset: { x: 10, y: 10 },
       shadowOpacity: 0.5
     });
 
@@ -1338,40 +1338,6 @@ suite('Container', function() {
     );
   });
 
-  // ======================================================
-  test('test deprecated get() method', function() {
-    var stage = addStage();
-    var layer = new Konva.Layer({
-      name: 'layerName',
-      id: 'layerId'
-    });
-    var group = new Konva.Group({
-      name: 'groupName',
-      id: 'groupId'
-    });
-    var rect = new Konva.Rect({
-      x: 200,
-      y: 20,
-      width: 100,
-      height: 50,
-      fill: 'red',
-      stroke: 'black',
-      strokeWidth: 4,
-      name: 'rectName',
-      id: 'rectId'
-    });
-
-    layer.add(group);
-    group.add(rect);
-    stage.add(layer);
-
-    assert.equal(
-      stage.get('.rectName')[0].attrs.id,
-      'rectId',
-      'problem with shape name selector'
-    );
-  });
-
   // ======================================================
   test('test find() selector by adding group, then layer, then shape', function() {
     var stage = addStage();

test/unit/Layer-test.js

@@ -239,7 +239,7 @@ suite('Layer', function() {
       fill: 'green',
       stroke: 'black',
       strokeWidth: 4,
-      scale: [3, 1],
+      scale: { x: 3, y: 1 },
       draggable: true,
       strokeScaleEnabled: false
     });

test/unit/Node-cache-test.js

@@ -709,9 +709,7 @@ suite('Caching', function() {
     var circle = new Konva.Circle({
       radius: 10,
       // fill: 'white',
-      fillRadialGradientStartPoint: 0,
       fillRadialGradientStartRadius: 0,
-      fillRadialGradientEndPoint: 0,
       fillRadialGradientEndRadius: 10,
       fillRadialGradientColorStops: [0, 'red', 0.5, 'yellow', 1, 'black'],
       opacity: 0.4,
@@ -739,9 +737,7 @@ suite('Caching', function() {
 
     var circle = new Konva.Circle({
       radius: 10,
-      fillRadialGradientStartPoint: 0,
       fillRadialGradientStartRadius: 0,
-      fillRadialGradientEndPoint: 0,
       fillRadialGradientEndRadius: 10,
       fillRadialGradientColorStops: [0, 'red', 0.5, 'yellow', 1, 'black'],
       opacity: 0.4,

test/unit/Node-test.js

@@ -208,7 +208,7 @@ suite('Node', function() {
     // shadow cache
     assert.equal(circle._cache.get('hasShadow'), false);
     circle.setShadowColor('red');
-    circle.setShadowOffset(10);
+    circle.setShadowOffsetX(10);
     assert.equal(circle._cache.get('hasShadow'), undefined);
     layer.draw();
     assert.equal(circle._cache.get('hasShadow'), true);
@@ -1177,43 +1177,6 @@ suite('Node', function() {
     assert.equal(stage.children[0], layer);
   });
 
-  // ======================================================
-  test('scale shape by half', function() {
-    var stage = addStage();
-    var layer = new Konva.Layer();
-    var circle = new Konva.Circle({
-      x: stage.getWidth() / 2,
-      y: stage.getHeight() / 2,
-      radius: 70,
-      fill: 'green',
-      stroke: 'black',
-      strokeWidth: 4
-    });
-
-    circle.setScale(0.5, 1);
-    layer.add(circle);
-    stage.add(layer);
-  });
-
-  // ======================================================
-  test('scale shape by half then back to 1', function() {
-    var stage = addStage();
-    var layer = new Konva.Layer();
-    var circle = new Konva.Circle({
-      x: stage.getWidth() / 2,
-      y: stage.getHeight() / 2,
-      radius: 70,
-      fill: 'green',
-      stroke: 'black',
-      strokeWidth: 4
-    });
-
-    circle.setScale(0.5, 1);
-    circle.setScale(1, 1);
-    layer.add(circle);
-    stage.add(layer);
-  });
-
   // ======================================================
   test('set offset offset after instantiation', function() {
     var stage = addStage();
@@ -3132,7 +3095,7 @@ suite('Node', function() {
     stage.add(layer);
 
     assert.equal(stage.content.style.display, 'none');
-    
+
     stage.show();
     stage.draw();
     assert.equal(stage.content.style.display, '');
@@ -3140,10 +3103,6 @@ suite('Node', function() {
     stage.hide();
     stage.draw();
     assert.equal(stage.content.style.display, 'none');
-    
-    
-
-    // TODO: stage hide() fails.  also need to find a good way to test this
   });
 
   // ======================================================

test/unit/Shape-test.js

@@ -81,7 +81,7 @@ suite('Shape', function() {
       stroke: 'blue',
       strokeWidth: 5,
       shadowColor: 'black',
-      shadowOffset: 10,
+      shadowOffsetX: 10,
       shadowOpacity: 0
     });
 
@@ -327,7 +327,7 @@ suite('Shape', function() {
       circle.setFillLinearGradientEndPoint({ x: 35, y: 35 });
       circle.setFillLinearGradientColorStops([0, 'red', 1, 'blue']);
 
-      circle.setFillLinearGradientStartPoint(null);
+      circle.setFillLinearGradientStartPoint({ x: 0, y: 0 });
       circle.setFillPatternImage(imageObj);
       circle.setFillPatternRepeat('repeat');
       circle.setFillPatternOffset({ x: 0, y: 0 });
@@ -890,7 +890,7 @@ suite('Shape', function() {
         draggable: true,
         shadowColor: 'black',
         shadowBlur: 10,
-        shadowOffset: 20,
+        shadowOffsetX: 20,
         shadowOpacity: 0.2
       });
 

test/unit/Stage-test.js

@@ -186,8 +186,7 @@ suite('Stage', function() {
       radius: 70,
       strokeWidth: 4,
       fill: 'red',
-      stroke: 'black',
+      stroke: 'black'
-      id: 'redCircle'
     });
     layer.add(shape);
     layer.draw();
@@ -215,8 +214,7 @@ suite('Stage', function() {
       radius: 70,
       strokeWidth: 4,
       fill: 'red',
-      stroke: 'black',
+      stroke: 'black'
-      id: 'redCircle'
     });
 
     var greenCircle = new Konva.Circle({
@@ -225,8 +223,7 @@ suite('Stage', function() {
       radius: 70,
       strokeWidth: 4,
       fill: 'green',
-      stroke: 'black',
+      stroke: 'black'
-      id: 'greenCircle'
     });
 
     layer.add(redCircle);
@@ -234,13 +231,13 @@ suite('Stage', function() {
     stage.add(layer);
 
     assert.equal(
-      stage.getIntersection({ x: 300, y: 100 }).getId(),
+      stage.getIntersection({ x: 300, y: 100 }),
-      'greenCircle',
+      greenCircle,
       'shape should be greenCircle'
     );
     assert.equal(
-      stage.getIntersection({ x: 380, y: 100 }).getId(),
+      stage.getIntersection({ x: 380, y: 100 }),
-      'redCircle',
+      redCircle,
       'shape should be redCircle'
     );
     assert.equal(
@@ -311,8 +308,7 @@ suite('Stage', function() {
       radius: 70,
       strokeWidth: 4,
       fill: 'red',
-      stroke: 'black',
+      stroke: 'black'
-      id: 'redCircle'
     });
 
     var greenCircle = new Konva.Circle({
@@ -321,8 +317,7 @@ suite('Stage', function() {
       radius: 70,
       strokeWidth: 4,
       fill: 'green',
-      stroke: 'black',
+      stroke: 'black'
-      id: 'greenCircle'
     });
 
     stage.on('contentMousemove', function() {
@@ -338,19 +333,20 @@ suite('Stage', function() {
     stage.add(layer);
 
     assert.equal(
-      stage.getIntersection({ x: 370, y: 93 }).getId(),
+      stage.getIntersection({ x: 370, y: 93 }),
-      'greenCircle',
+      greenCircle,
       'shape should be greenCircle'
     );
-    // TODO: this passes in the browser but fails in phantomjs.  no idea why.
-    //assert.equal(stage.getIntersection(371, 93).getId(), 'greenCircle', 'shape should be greenCircle');
     assert.equal(
-      stage.getIntersection({ x: 372, y: 93 }).getId(),
+      stage.getIntersection({ x: 371, y: 93 }),
-      'redCircle',
+      greenCircle,
+      'shape should be greenCircle'
+    );
+    assert.equal(
+      stage.getIntersection({ x: 372, y: 93 }),
+      redCircle,
       'shape should be redCircle'
     );
-
-    //console.log(layer.hitCanvas.context._context.getImageData(1, 1, 1, 1).data)
   });
 
   // ======================================================
@@ -684,7 +680,7 @@ suite('Stage', function() {
     var layer = new Konva.Layer();
 
     stage.add(layer);
-    stage.setScale(0.5);
+    stage.setScaleX(0.5);
 
     stage.draw();
   });

test/unit/shapes/Image-test.js

@@ -125,7 +125,7 @@ suite('Image', function() {
         height: 75,
         crop: { x: 186, y: 211, width: 106, height: 74 },
         draggable: true,
-        scale: [0.5, 0.5]
+        scale: { x: 0.5, y: 0.5 }
       });
 
       layer.add(darth);
@@ -186,7 +186,7 @@ suite('Image', function() {
         y: 0,
         image: imageObj,
         draggable: true,
-        scale: 0.25
+        scale: { x: 0.25, y: 0.25 }
       });
 
       layer.add(tiger);
@@ -218,7 +218,7 @@ suite('Image', function() {
         y: 0,
         image: imageObj,
         draggable: true,
-        scale: 0.25,
+        scaleX: 0.25,
         opacity: 0.5
       });
 

test/unit/shapes/Label-test.js

@@ -16,7 +16,7 @@ suite('Label', function() {
         fill: '#bbb',
         shadowColor: 'black',
         shadowBlur: 10,
-        shadowOffset: [10, 10],
+        shadowOffset: { x: 10, y: 10 },
         shadowOpacity: 0.2,
         lineJoin: 'round',
         pointerDirection: 'up',
@@ -124,7 +124,7 @@ suite('Label', function() {
         lineJoin: 'round',
         shadowColor: 'black',
         shadowBlur: 10,
-        shadowOffset: 10,
+        shadowOffsetX: 10,
         shadowOpacity: 0.5
       })
     );
@@ -152,7 +152,7 @@ suite('Label', function() {
         lineJoin: 'round',
         shadowColor: 'black',
         shadowBlur: 10,
-        shadowOffset: 10,
+        shadowOffsetX: 10,
         shadowOpacity: 0.5
       })
     );

test/unit/shapes/Line-test.js

@@ -320,7 +320,7 @@ suite('Line', function() {
       x: 50,
       y: 50,
       points: [-25, 50, 250, -30, 150, 50, 250, 110],
-      stroke: 'blue',
+      stroke: 'black',
       strokeWidth: 10,
       draggable: true,
       closed: true
@@ -334,7 +334,7 @@ suite('Line', function() {
     stage.add(layer);
     stage.add(layer2);
     layer2.hide();
-    compareLayers(layer, layer2, 100);
+    compareLayers(layer, layer2, 150);
     // Konva.pixelRatio = undefined;
   });
 

test/unit/shapes/Path-test.js

@@ -12,7 +12,7 @@ suite('Path', function() {
       strokeWidth: 2,
       shadowColor: 'black',
       shadowBlur: 2,
-      shadowOffset: [10, 10],
+      shadowOffset: { x: 10, y: 10 },
       shadowOpacity: 0.5,
       draggable: true
     });

test/unit/shapes/Star-test.js

@@ -56,7 +56,7 @@ suite('Star', function() {
       lineJoin: 'round',
       shadowColor: 'black',
       shadowBlur: 10,
-      shadowOffset: [20, 20],
+      shadowOffset: { x: 20, y: 20 },
       shadowOpacity: 0.5,
       draggable: true
     });
@@ -90,7 +90,7 @@ suite('Star', function() {
       lineJoin: 'round',
       shadowColor: 'black',
       shadowBlur: 10,
-      shadowOffset: [20, 20],
+      shadowOffset: { x: 20, y: 20 },
       shadowOpacity: 0.5,
       draggable: true
     });
@@ -123,12 +123,12 @@ suite('Star', function() {
       innerRadius: 30,
       outerRadius: 50,
       fill: 'green',
-      stroke: 'blue',
+      stroke: 'black',
       strokeWidth: 5,
       lineJoin: 'round',
       shadowColor: 'black',
       shadowBlur: 10,
-      shadowOffset: [20, 20],
+      shadowOffset: { x: 20, y: 20 },
       shadowOpacity: 0.5,
       draggable: true
     });
@@ -143,6 +143,6 @@ suite('Star', function() {
       height: 100,
       width: 100
     });
-    cloneAndCompareLayer(layer, 50);
+    cloneAndCompareLayer(layer, 100);
   });
 });

test/unit/shapes/Text-test.js

@@ -41,7 +41,7 @@ suite('Text', function() {
       height: 100,
       shadowColor: 'black',
       shadowBlur: 1,
-      shadowOffset: [10, 10],
+      shadowOffset: { x: 10, y: 10 },
       shadowOpacity: 0.2,
       cornerRadius: 10
     });
@@ -62,7 +62,7 @@ suite('Text', function() {
       padding: 10,
       shadowColor: 'red',
       shadowBlur: 1,
-      shadowOffset: [10, 10],
+      shadowOffset: { x: 10, y: 10 },
       shadowOpacity: 0.2
     });
 
@@ -71,8 +71,7 @@ suite('Text', function() {
     });
 
     // center text box
-    rect.offset(text.getWidth() / 2, text.getHeight() / 2);
+    rect.offsetX(text.getWidth() / 2, text.getHeight() / 2);
-    text.offset(text.getWidth() / 2, text.getHeight() / 2);
 
     group.add(rect);
     group.add(text);
@@ -223,13 +222,13 @@ suite('Text', function() {
       padding: 10,
       shadowColor: 'black',
       shadowBlur: 1,
-      shadowOffset: [10, 10],
+      shadowOffset: { X: 10, y: 10 },
       shadowOpacity: 0.2,
       draggable: true
     });
 
     // center text box
-    text.offset(text.getWidth() / 2, text.getHeight() / 2);
+    text.offsetX(text.getWidth() / 2, text.getHeight() / 2);
 
     layer.add(text);
     stage.add(layer);
@@ -257,7 +256,7 @@ suite('Text', function() {
     assert.equal(text.getWidth(), 400);
     assert.equal(text.getHeight(), 100);
     assert(text.getTextWidth() > 0, 'text width should be greater than 0');
-    assert(text.getTextHeight() > 0, 'text height should be greater than 0');
+    assert(text.fontSize() > 0, 'text height should be greater than 0');
 
     text.setX(1);
     text.setY(2);
@@ -505,7 +504,7 @@ suite('Text', function() {
       align: 'center',
       shadowColor: 'red',
       shadowBlur: 1,
-      shadowOffset: [10, 10],
+      shadowOffset: { x: 10, y: 10 },
       shadowOpacity: 0.5,
       draggable: true
     });
@@ -801,10 +800,7 @@ suite('Text', function() {
 
     ctx.fillText(text.text(), text.x(), text.y() + text.fontSize() / 2);
 
-    // TODO: fails on CI, so tol is very large
+    compareLayerAndCanvas(layer, canvas, 200);
-    // TODO: how to make it smaller or skip in CI?
-    compareLayerAndCanvas(layer, canvas, 256);
-    // delete Konva.pixelRatio;
   });
 
   // TODO: how to make correct behavior?

test/unit/shapes/TextPath-test.js

@@ -419,7 +419,7 @@ suite('TextPath', function() {
       text: 'AV',
       fontSize: 60,
       data: 'M0,0 L200,0',
-      getKerning: function(leftChar, rightChar) {
+      kerningFunc: function(leftChar, rightChar) {
         return pairs.hasOwnProperty(leftChar)
           ? pairs[leftChar][rightChar] || 0
           : 0;
@@ -460,7 +460,7 @@ suite('TextPath', function() {
       text: 'AV',
       fontSize: 60,
       data: 'M0,0 L200,0',
-      getKerning: function(leftChar, rightChar) {
+      kerningFunc: function(leftChar, rightChar) {
         // getter that fails
         throw new Error('something went wrong');
       }

test/unit/shapes/Transformer-test.js

@@ -1702,7 +1702,6 @@ suite('Transformer', function() {
     assert.equal(rect.height(), 100);
   });
 
-  // TODO: current I am not sure how to better resolve that task
   test.skip('transformer should skip scale on stroke if strokeScaleEnabled = false', function() {
     var stage = addStage();
     var layer = new Konva.Layer();