Skip to content
This repository has been archived by the owner on Dec 30, 2018. It is now read-only.

Commit

Permalink
fixing karma configuration fixes # 20
Browse files Browse the repository at this point in the history
  • Loading branch information
vesparny committed Jan 15, 2015
1 parent 5bd28b3 commit 98a0e91
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 36 deletions.
5 changes: 3 additions & 2 deletions build/karma.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = {
baseDir + '/src/vendor/angular/angular.js',
baseDir + '/src/vendor/angular-mocks/angular-mocks.js',
baseDir + '/src/vendor/angular-ui-router/release/angular-ui-router.js',
baseDir + '/src/**/*.js',
baseDir + '/src/app/**/*.js',
baseDir + '/src/common/**/*.js',
'build/tmp/*.js',
baseDir + '/test/unit/**/*.spec.js'
],
Expand Down Expand Up @@ -47,5 +48,5 @@ module.exports = {
urlRoot: '/__test/',

//used browsers (overriding in some gulp task)
browsers: ['Chrome']
browsers: ['PhantomJS']
};
68 changes: 34 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,40 @@
"url": "[email protected]:vesparny/angular-kickstart.git"
},
"devDependencies": {
"browser-sync": "^1.1.2",
"del": "^0.1.3",
"gulp": "^3.8.9",
"gulp-changed": "^1.0.0",
"gulp-concat": "^2.4.1",
"gulp-csso": "^0.2.9",
"gulp-header": "^1.2.2",
"gulp-html2js": "^0.2.0",
"gulp-if": "^1.2.5",
"gulp-imagemin": "^1.2.1",
"gulp-jshint": "^1.8.5",
"gulp-load-plugins": "^0.7.0",
"gulp-minify-html": "^0.1.6",
"gulp-ng-annotate": "^0.3.3",
"gulp-ng-html2js": "^0.1.8",
"gulp-protractor": "0.0.11",
"gulp-rev": "^2.0.1",
"gulp-rev-replace": "^0.3.1",
"gulp-ruby-sass": "^0.7.1",
"gulp-size": "^1.1.0",
"gulp-sourcemaps": "^1.2.4",
"gulp-uglify": "^1.0.1",
"gulp-useref": "^1.0.2",
"jshint-stylish": "^1.0.0",
"karma": "^0.12.24",
"karma-chrome-launcher": "^0.1.5",
"karma-coverage": "^0.2.6",
"karma-html-reporter": "^0.2.4",
"karma-jasmine": "^0.2.3",
"karma-mocha-reporter": "^0.3.1",
"karma-phantomjs-launcher": "^0.1.4",
"lodash": "^2.4.1",
"protractor": "~1.4.0",
"run-sequence": "^1.0.1"
"browser-sync": "~1.1.2",
"del": "~0.1.3",
"gulp": "~3.8.9",
"gulp-changed": "~1.0.0",
"gulp-concat": "~2.4.1",
"gulp-csso": "~0.2.9",
"gulp-header": "~1.2.2",
"gulp-html2js": "~0.2.0",
"gulp-if": "~1.2.5",
"gulp-imagemin": "~2.1.0",
"gulp-jshint": "~1.8.5",
"gulp-load-plugins": "~0.8.0",
"gulp-minify-html": "~0.1.6",
"gulp-ng-annotate": "~0.4.4",
"gulp-ng-html2js": "~0.1.8",
"gulp-protractor": "0.0.12",
"gulp-rev": "~2.0.1",
"gulp-rev-replace": "~0.3.1",
"gulp-ruby-sass": "~0.7.1",
"gulp-size": "~1.1.0",
"gulp-sourcemaps": "~1.2.4",
"gulp-uglify": "~1.0.1",
"gulp-useref": "~1.0.2",
"jshint-stylish": "~1.0.0",
"karma": "~0.12.24",
"karma-chrome-launcher": "~0.1.5",
"karma-coverage": "~0.2.6",
"karma-html-reporter": "~0.2.4",
"karma-jasmine": "~0.3.4",
"karma-mocha-reporter": "~0.3.1",
"karma-phantomjs-launcher": "~0.1.4",
"lodash": "~2.4.1",
"protractor": "~1.6.1",
"run-sequence": "~1.0.1"
},
"engines": {
"node": ">=0.10.x"
Expand Down

0 comments on commit 98a0e91

Please sign in to comment.