Skip to content

Commit

Permalink
updated karma
Browse files Browse the repository at this point in the history
  • Loading branch information
mwasiluk committed Apr 9, 2017
1 parent 8a37229 commit 8e86c50
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion dist/form-builder-bootstrap-tpls.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/form-builder-material-tpls.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ module.exports = function(config) {
'bower_components/angular-translate/angular-translate.min.js',
'bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js',
'bower_components/Sortable/Sortable.min.js',
'bower_components/Sortable/ng-sortable.js',
'vendor/angular-legacy-sortable.js',
'bower_components/angular-elastic/elastic.js',
'dist/form-utils.js',
'dist/form-builder.min.js',
'dist/form-builder-bootstrap-tpls.min.js',
'dist/form-viewer.min.js',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"gulp-uglify": "^1.5.1",
"gulp-util": "^3.0.4",
"jasmine-core": "^2.4.1",
"karma": "^0.13.15",
"karma-jasmine": "^0.3.6",
"karma-phantomjs-launcher": "^0.2.1",
"karma": "^1.3.0",
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.2",
"merge-stream": "^1.0.0",
"phantomjs": "^1.9.19",
"yargs": "^6.0.0"
Expand Down

0 comments on commit 8e86c50

Please sign in to comment.