Skip to content

Commit

Permalink
[D] still Tons of Bug
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasduteil committed May 2, 2013
1 parent d48e575 commit b85c14b
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 13 deletions.
16 changes: 4 additions & 12 deletions gruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ module.exports = function (grunt) {

// Default task.
grunt.registerTask('build', ['x_concat', 'concat', 'uglify']);
//grunt.registerTask('build', ['concat', 'uglify'])
grunt.registerTask('default', ['jshint', 'karma:unit', 'build']);
grunt.registerTask('default', [/*'jshint',*/ 'karma']);


var testConfig = function(configFile, customOptions) {
Expand All @@ -27,12 +26,6 @@ module.exports = function (grunt) {
grunt.initConfig({
dist: 'build',
pkg: grunt.file.readJSON('package.json'),
watch: {
karma: {
files: ['modules/*/*.js', 'modules/*/test/*Spec.js'],
tasks: ['karma:unitBackground:run'] //NOTE the :run flag
}
},
karma: {
unit: testConfig('test/karma.conf.js')
},
Expand All @@ -57,11 +50,10 @@ module.exports = function (grunt) {
uglify: {
options: {
banner: ['/**',
' * <%= pkg.description %>',
' * @version v<%= pkg.version %> - ',
'<%= grunt.template.today("yyyy-mm-dd") %>',
' * <%= pkg.name %> - <%= pkg.description %>',
' * @version v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>',
' * @link <%= pkg.homepage %>',
' * @license MIT License, http://www.opensource.org/licenses/MIT',
' * @license <%= pkg.license %>',
' */'].join('\n')
},
build: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "Swiss-Army-Knife of AngularJS tools (with no external dependencies!)",
"author": "https://github.com/angular-ui/ui-utils/graphs/contributors",
"license": "MIT",
"license": "MIT License, http://www.opensource.org/licenses/MIT",
"homepage": "http://angular-ui.github.com",
"dependencies": {},
"devDependencies": {
Expand Down
62 changes: 62 additions & 0 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Karma configuration
// Generated on Thu May 02 2013 23:29:14 GMT+0200 (CEST)


// 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,
'components/jquery/jquery.js',
'components/angular/angular.js',
'components/angular-mocks/angular-mocks.js',
'modules/*/*.js',
'modules/*/test/*Spec.js'
];


// list of files to exclude
exclude = [

];


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


// 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 = false;


// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers = ['Firefox'];


// If browser does not capture in given timeout [ms], kill it
captureTimeout = 60000;


// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun = false;

0 comments on commit b85c14b

Please sign in to comment.