aboutsummaryrefslogtreecommitdiffstats
path: root/spec/javascripts/spec_helper.js
diff options
context:
space:
mode:
authorVlatka Pavisic2017-01-04 14:00:39 +0100
committerVlatka Pavisic2017-01-04 14:00:39 +0100
commitaf34cb854255f2893a27e28b11a2601d6af8a725 (patch)
tree4da1c8de8b34069a2d816869c46576dc3d98e5a4 /spec/javascripts/spec_helper.js
parentd1e76469119acd0d92cdb65fa8e9a5b61803b3a3 (diff)
parentc11be6d012dd77101721900168b9acc64db66e49 (diff)
downloadchouette-core-af34cb854255f2893a27e28b11a2601d6af8a725.tar.bz2
Merge master
Diffstat (limited to 'spec/javascripts/spec_helper.js')
-rw-r--r--spec/javascripts/spec_helper.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
index 71d30ff8d..a2fde3860 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascripts/spec_helper.js
@@ -4,6 +4,7 @@
// require support/jasmine-jquery-2.1.0
// require support/sinon
// require support/your-support-file
+require('es6-object-assign').polyfill();
//
// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
// Use this polyfill to avoid the confusion.