Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

WIP: chore(dependencies): use karma-runner 0.11.x #1544

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.8"
- "0.10"

before_script:
- export DISPLAY=:99.0
Expand Down
12 changes: 11 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,17 @@ module.exports = function(grunt) {
},
karma: {
options: {
configFile: 'karma.conf.js'
frameworks: ['jasmine'],
files: [
'misc/test-lib/jquery-1.8.2.min.js',
'misc/test-lib/angular.js',
'misc/test-lib/angular-mocks.js',
'misc/test-lib/helpers.js',
'src/**/*.js',
'template/**/*.js'
],
browsers: ['Chrome'],
reporters: ['progress']
},
watch: {
background: true
Expand Down
55 changes: 0 additions & 55 deletions karma.conf.js

This file was deleted.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@
"grunt-contrib-watch": "~0.3.1",
"grunt-contrib-jshint": "~0.4.0",
"grunt-html2js": "~0.1.3",
"grunt-karma": "~0.4.4",
"karma": "~0.11.12 ",
"grunt-karma": "~0.7.2",
"node-markdown": "0.1.1",
"semver": "~1.1.4",
"shelljs": "~0.1.4"
"shelljs": "~0.1.4",
"karma-jasmine": "~0.1.5",
"karma-chrome-launcher": "~0.1.2",
"karma-firefox-launcher": "~0.1.3",
"karma-script-launcher": "~0.1.0"
},
"license": "MIT"
}