Skip to content

Commit

Permalink
Update to Karma 0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
vojtajina committed Aug 6, 2013
1 parent 864d500 commit 4ced0e3
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 80 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ karma start

[AngularJS]: http://angularjs.org
[angular homepage]: http://angularjs.org/#create-components
[Karma]: https://karma-runner.github.com
[Karma]: https://karma-runner.github.io
108 changes: 33 additions & 75 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,76 +1,34 @@
// Testacular configuration
// Generated on Tue Aug 14 2012 20:05:21 GMT-0700 (PDT)


// base path, that will be used to resolve files and exclude
basePath = '';


// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,

// libraries
'lib/jquery-1.8.1.min.js',
'lib/angular.js',
'lib/angular-mocks.js',

// our app
'js/*.js',

// tests
'test/*.js',

// templates
'tpl/*.html'
];

// generate js files from html templates
preprocessors = {
'tpl/*.html': 'html2js'
// Karma configuration file
// See http://karma-runner.github.io/0.10/config/configuration-file.html
module.exports = function(config) {
config.set({
basePath: '',

frameworks: ['jasmine'],

// list of files / patterns to load in the browser
files: [
// libraries
'lib/jquery-1.8.1.min.js',
'lib/angular.js',
'lib/angular-mocks.js',

// our app
'js/*.js',

// tests
'test/*.js',

// templates
'tpl/*.html'
],

// generate js files from html templates
preprocessors: {
'tpl/*.html': 'ng-html2js'
},

autoWatch: true,
browsers: ['Chrome']
});
};

// list of files to exclude
exclude = [];


// test results reporter to use
// possible values: dots || progress
reporters = ['progress'];


// web server port
port = 9876;


// cli runner port
runnerPort = 9100;


// enable / disable colors in the output (reporters and logs)
colors = true;


// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_INFO;


// enable / disable watching file and executing tests whenever any file changes
autoWatch = true;


// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
browsers = ['Chrome'];


// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun = false;
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ng-directive-testing",
"version": "0.0.0",
"description": "An example of testing AngularJS directives with Karma.",
"main": "\"\"",
"main": "",
"scripts": {
"test": "karma start --single-run --no-auto-watch"
},
Expand All @@ -12,9 +12,11 @@
},
"author": "Vojta Jina <[email protected]>",
"license": "MIT",
"readmeFilename": "README.md",
"gitHead": "f5d7ad2369e0ae0eaf9f3df4117c8d38f0a80631",
"devDependencies": {
"karma": "~0.8"
"karma": "~0.10",
"karma-jasmine": "*",
"karma-chrome-launcher": "*",
"karma-firefox-launcher": "*",
"karma-ng-html2js-preprocessor": "*"
}
}

0 comments on commit 4ced0e3

Please sign in to comment.