Merge pull request #1037 from pbassut/master

fix(karma) - phantomjs component was missing, thus failing tests
textAngular · Mar 27, 2016 · 5dcd231 · 5dcd231
2 parents 742e811 + c2edba3
commit 5dcd231
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/karma-jqlite.conf.js b/karma-jqlite.conf.js
@@ -12,6 +12,7 @@ module.exports = function (config) {
 		],
 
 		files: [
+            'node_modules/phantomjs-polyfill/bind-polyfill.js',
 			'bower_components/rangy/rangy-core.js',
 			'bower_components/rangy/rangy-selectionsaverestore.js',
 			'bower_components/angular/angular.min.js',

diff --git a/karma-jquery.conf.js b/karma-jquery.conf.js
@@ -12,6 +12,7 @@ module.exports = function (config) {
 		],
 
 		files: [
+            'node_modules/phantomjs-polyfill/bind-polyfill.js',
 			'bower_components/jquery/jquery.min.js',
 			'bower_components/rangy/rangy-core.js',
 			'bower_components/rangy/rangy-selectionsaverestore.js',

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   ],
   "license": "MIT",
   "homepage": "http://textangular.com",
-  "main": "./dist/textAngular.min.js", 
+  "main": "./dist/textAngular.min.js",
   "dependencies": {
     "rangy": "^1.3.0"
   },
@@ -51,7 +51,8 @@
     "karma-jasmine": "~0.1.5",
     "karma-phantomjs-launcher": "~0.1.2",
     "karma-script-launcher": "~0.1.0",
-    "phantomjs": "^1.9.8"
+    "phantomjs": "^1.9.8",
+    "phantomjs-polyfill": "0.0.2"
   },
   "scripts": {
     "test": "bower install && grunt travis-test --verbose"