Skip to content

Commit

Permalink
chore(grunt): Added angular 1.3 karma config
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Sep 13, 2014
1 parent 2ec8196 commit 210ba61
Show file tree
Hide file tree
Showing 6 changed files with 28,596 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ module.exports = function (grunt) {
unstable: {
configFile: 'config/karma-1.1.5.js'
},
future: {
configFile: 'config/karma-1.3.0-rc.1.js'
},
background: {
background: true,
browsers: [ grunt.option('browser') || 'PhantomJS' ]
Expand Down
26 changes: 26 additions & 0 deletions config/karma-1.3.0-rc.1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Karma configuration file
module.exports = function (karma) {

var files = require('../files').files;

karma.set({
// base path, that will be used to resolve files and exclude
basePath: '..',

// list of files / patterns to load in the browser
files: [].concat(files.angular('1.3.0-rc.1'), files.testUtils, files.src, files.test),

// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel: karma.LOG_DEBUG,

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
browsers: [ 'PhantomJS' ]
})
};
2 changes: 1 addition & 1 deletion files.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ routerFiles = {
return [
'lib/angular-' + version + '/angular.js',
'lib/angular-' + version + '/angular-mocks.js'
].concat(version === '1.2.14' ? ['lib/angular-' + version + '/angular-animate.js'] : []);
].concat(['1.2.14', '1.3.0-rc.1'].indexOf(version) !== -1 ? ['lib/angular-' + version + '/angular-animate.js'] : []);
}
};

Expand Down
Loading

0 comments on commit 210ba61

Please sign in to comment.