Skip to content

Commit

Permalink
inlcude
Browse files Browse the repository at this point in the history
  • Loading branch information
Danny Blue committed Aug 4, 2015
1 parent 2f63759 commit dc0cdf8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module.exports = function(config) {
// base path, that will be used to resolve files and exclude
basePath: '',

// testing framework to use (jasmine/mocha/qunit/...)
frameworks: ['jasmine'],

// list of files / patterns to load in the browser
Expand All @@ -26,7 +25,7 @@ module.exports = function(config) {
// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,

browsers: ['Chrome', 'Firefox', 'IE', 'Safari'],
browsers: ['Chrome', 'Firefox', 'Safari'],

reporters: ['coverage', 'progress'],

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"karma-chrome-launcher": "^0.1.10",
"karma-coverage": "^0.3.1",
"karma-firefox-launcher": "^0.1.6",
"karma-ie-launcher": "^0.1.5",
"karma-jasmine": "^0.3.5",
"karma-safari-launcher": "^0.1.1",
"uglifyjs": "^2.4.10"
}
}

0 comments on commit dc0cdf8

Please sign in to comment.