Fix up tests in the face of native Path2d implementations.

google · Apr 5, 2017 · dce8fad · dce8fad
1 parent c71e9bd
commit dce8fad
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/canvas.js b/canvas.js
@@ -2161,12 +2161,12 @@ if (typeof Path2D !== 'function' ||
     Path_.prototype['addPath'] = function(path, tr) {
       var hasTx = false;
       if (tr
-          && tr.hasOwnProperty('a')
-          && tr.hasOwnProperty('b')
-          && tr.hasOwnProperty('c')
-          && tr.hasOwnProperty('d')
-          && tr.hasOwnProperty('e')
-          && tr.hasOwnProperty('f')) {
+          && tr.a != undefined
+          && tr.b != undefined
+          && tr.c != undefined
+          && tr.d != undefined
+          && tr.e != undefined
+          && tr.f != undefined) {
         hasTx = true;
         this.ops_.push({type: 'save', args: []});
         this.ops_.push({type: 'transform', args: [tr.a, tr.b, tr.c, tr.d, tr.e, tr.f]});

diff --git a/canvasv5.js b/canvasv5.js
@@ -83,12 +83,12 @@ if (typeof Path2D !== 'function' ||
     Path_.prototype['addPath'] = function(path, tr) {
       var hasTx = false;
       if (tr
-          && tr.hasOwnProperty('a')
-          && tr.hasOwnProperty('b')
-          && tr.hasOwnProperty('c')
-          && tr.hasOwnProperty('d')
-          && tr.hasOwnProperty('e')
-          && tr.hasOwnProperty('f')) {
+          && tr.a != undefined
+          && tr.b != undefined
+          && tr.c != undefined
+          && tr.d != undefined
+          && tr.e != undefined
+          && tr.f != undefined) {
         hasTx = true;
         this.ops_.push({type: 'save', args: []});
         this.ops_.push({type: 'transform', args: [tr.a, tr.b, tr.c, tr.d, tr.e, tr.f]});

diff --git a/test/addpath.js b/test/addpath.js
@@ -5,6 +5,10 @@ describe('AddPath Test Suite.',
 
     it('should add paths w/o transform.', function() {
       var path = new Path2D();
+      if (path.ops_ == undefined) {
+        // Don't bother testing a native Path2D impl.
+        return
+      }
       var toadd = new Path2D();
       toadd.rect(0, 0, 100, 100);
 
@@ -15,6 +19,10 @@ describe('AddPath Test Suite.',
 
     it('should add paths with transform.', function() {
       var path = new Path2D();
+      if (path.ops_ == undefined) {
+        // Don't bother testing a native Path2D impl.
+        return
+      }
       var toadd = new Path2D();
       toadd.rect(0, 0, 100, 100);
 

diff --git a/test/path.js b/test/path.js
@@ -5,6 +5,10 @@ describe('Path constructors.',
 
     it('Path copy constructor.', function() {
       var path = new Path2D();
+      if (path.ops_ == undefined) {
+        // Don't bother testing a native Path2D impl.
+        return
+      }
       path.rect(0, 0, 100, 100);
       assert.equal(path.ops_[0].type, 'rect', 'Test the test.');
 
@@ -22,6 +26,10 @@ describe('Path simple methods.',
 
     it('Simple methods.', function() {
       var path = new Path2D();
+      if (path.ops_ == undefined) {
+        // Don't bother testing a native Path2D impl.
+        return
+      }
       path.rect(0, 1, 2, 3);
       assert.equal(path.ops_[0].type, 'rect');
       assert.equal(path.ops_[0].args[0], 0);