Fix tests on OSX with retina screen

* Fix retina unit test failures
* Honor config file formatting
* Prevent gulp error on non-zero karma result

diff --git a/.editorconfig b/.editorconfig
index 4e0d877efceb1abcb411828be849eaf1ca46b06b..8cea3b4f020b46fb682fe3511bc4d055b11f8b6e 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,3 +8,11 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = false
+
+[gulpfile.js]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2

diff --git a/gulpfile.js b/gulpfile.js
index 2ae49d77d0579f1a21ef2073987732818798bfbf..bb42ea9d3b8b92f3710f3547ac4a25b090c9043c 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -188,7 +188,12 @@ function unittestTask(done) {
     args: {
       coverage: !!argv.coverage
     }
-  }, done).start();
+  },
+  // https://github.com/karma-runner/gulp-karma/issues/18
+  function(error) {
+    error = error ? new Error('Karma returned with the error code: ' + error) : undefined;
+    done(error);
+  }).start();
 }
 
 function librarySizeTask() {

diff --git a/test/jasmine.index.js b/test/jasmine.index.js
index 10e2e617704f589219bf46a5d77863eeeeddc282..7e5fd67bee04b8473468cef79516386d0e6aaa8e 100644 (file)
--- a/test/jasmine.index.js
+++ b/test/jasmine.index.js
@@ -22,6 +22,10 @@ var utils = require('./jasmine.utils');
                return new Context();
        }
 
+       // force ratio=1 for tests on high-res/retina devices
+       // fixes https://github.com/chartjs/Chart.js/issues/4515
+       window.devicePixelRatio = 1;
+
        window.acquireChart = acquireChart;
        window.releaseChart = releaseChart;
        window.waitForResize = utils.waitForResize;

diff --git a/test/specs/platform.dom.tests.js b/test/specs/platform.dom.tests.js
index 4358b9b3521801745f0f240cde04244508651189..d765109c49a493d6b70e1979f6205a9923fd7219 100644 (file)
--- a/test/specs/platform.dom.tests.js
+++ b/test/specs/platform.dom.tests.js
@@ -394,8 +394,8 @@ describe('Platform.dom', function() {
                        expect(notifiedEvent.type).toBe(evt.type);
 
                        // Relative Position
-                       expect(notifiedEvent.x).toBe(chart.width / 2);
-                       expect(notifiedEvent.y).toBe(chart.height / 2);
+                       expect(notifiedEvent.x).toBeCloseToPixel(chart.width / 2);
+                       expect(notifiedEvent.y).toBeCloseToPixel(chart.height / 2);
                });
        });
 });