Skip to content

Commit

Permalink
fix(*): Karma unit port changed to 9019
Browse files Browse the repository at this point in the history
Karma has been updated to the latest version and the various Karma hanging issues have been
resolved. Thanks to @roychoo and @ToucheSir.

Closes ngbp#153.
  • Loading branch information
Josh David Miller committed Apr 15, 2014
1 parent 5568231 commit 0c354e9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ module.exports = function ( grunt ) {
configFile: '<%= build_dir %>/karma-unit.js'
},
unit: {
runnerPort: 9101,
port: 9019,
background: true
},
continuous: {
Expand Down
4 changes: 2 additions & 2 deletions karma/karma-unit.tpl.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = function ( karma ) {
karma.configure({
karma.set({
/**
* From where to look for files, starting with the location of this file.
*/
Expand All @@ -18,7 +18,7 @@ module.exports = function ( karma ) {
'src/assets/**/*.js'
],
frameworks: [ 'jasmine' ],
plugins: [ 'karma-jasmine', 'karma-firefox-launcher', 'karma-chrome-launcher', 'karma-phantomjs-launcher', 'karma-coffee-preprocessor' ],
plugins: [ 'karma-jasmine', 'karma-firefox-launcher', 'karma-coffee-preprocessor' ],
preprocessors: {
'**/*.coffee': 'coffee',
},
Expand Down
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-watch": "~0.4.0",
"grunt-contrib-uglify": "~0.2.0",
"grunt-karma": "~0.5.0",
"grunt-ngmin": "0.0.2",
"grunt-html2js": "~0.1.3",
"grunt-contrib-coffee": "~0.7.0",
"grunt-coffeelint": "0.0.6",
"grunt-conventional-changelog": "~0.1.1",
"grunt-bump": "0.0.6"
"grunt-bump": "0.0.6",
"karma-firefox-launcher": "^0.1.3",
"karma-jasmine": "^0.1.5",
"grunt-karma": "^0.8.2",
"karma-coffee-preprocessor": "^0.2.1",
"karma": "^0.12.9"
}
}

0 comments on commit 0c354e9

Please sign in to comment.