Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Tests: Output tests reports in _tests & .gitignore it
Browse files Browse the repository at this point in the history
Fixes gh-7029
  • Loading branch information
gseguin committed Feb 5, 2014
1 parent 468d221 commit 5f34b77
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ branches
# node build dependencies
node_modules

# tests output
_tests/

# phantom junit output
build/test-results/

17 changes: 13 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,8 @@ module.exports = function( grunt ) {
"!js/requirejs.config.js"
],
instrumentedFiles: "temp/",
htmlReport: "build/report/coverage",
lcovReport: "build/report/lcov",
htmlReport: "_tests/reports/coverage",
lcovReport: "_tests/reports/lcov",
linesThresholdPct: 0
}
},
Expand Down Expand Up @@ -760,7 +760,7 @@ module.exports = function( grunt ) {
all: {

// LCOV coverage file relevant to every target
src: "build/report/lcov/lcov.info"
src: "_tests/reports/lcov/lcov.info"
}
},

Expand Down Expand Up @@ -834,6 +834,7 @@ module.exports = function( grunt ) {
dist: [ dist ],
git: [ path.join( dist, "git" ) ],
tmp: [ "<%= dirs.tmp %>" ],
testsOutput: [ "_tests" ],
"googleCDN": [ "<%= dirs.cdn.google %>" ],
"jqueryCDN": [ "<%= dirs.cdn.jquery %>" ]
}
Expand Down Expand Up @@ -889,7 +890,15 @@ module.exports = function( grunt ) {

grunt.registerTask( "updateDependencies", [ "bowercopy" ] );

grunt.registerTask( "test", [ "jshint", "config:fetchHeadHash", "js:release", "connect", "qunit:http" ] );
grunt.registerTask( "test",
[
"clean:testsOutput",
"jshint",
"config:fetchHeadHash",
"js:release",
"connect", "qunit:http"
]
);
grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] );

// Default grunt
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"node": ">= 0.8.0"
},
"scripts": {
"ci": "grunt test && grunt coveralls",
"ci": "grunt test coveralls",
"test": "grunt test",
"lint": "grunt jshint"
},
Expand Down

0 comments on commit 5f34b77

Please sign in to comment.