diff --git a/.travis.yml b/.travis.yml index f2c257a..e258aef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,5 @@ node_js: - "0.8" - "0.10" before_install: - - npm install -g grunt-cli \ No newline at end of file + - npm install -g npm + - npm install -g grunt-cli diff --git a/tasks/jasmine.js b/tasks/jasmine.js index 8e606ad..800e1db 100644 --- a/tasks/jasmine.js +++ b/tasks/jasmine.js @@ -360,7 +360,7 @@ module.exports = function(grunt) { } function writeJunitXml(testsuites){ - var template = grunt.file.read(junitTemplate); + var template = grunt.file.read(options.junit.template || junitTemplate); if (options.junit.consolidate) { var xmlFile = path.join(options.junit.path, 'TEST-' + testsuites.suite1.name.replace(/[^\w]/g, '') + '.xml'); grunt.file.write(xmlFile, grunt.util._.template(template, { testsuites: _.values(testsuites)})); diff --git a/tasks/jasmine/templates/DefaultRunner.tmpl b/tasks/jasmine/templates/DefaultRunner.tmpl index 454e3f9..7fa17a3 100644 --- a/tasks/jasmine/templates/DefaultRunner.tmpl +++ b/tasks/jasmine/templates/DefaultRunner.tmpl @@ -3,6 +3,7 @@ Jasmine Spec Runner + <% css.forEach(function(style){ %> <% }) %> diff --git a/tasks/lib/jasmine.js b/tasks/lib/jasmine.js index bd91db0..401b13d 100644 --- a/tasks/lib/jasmine.js +++ b/tasks/lib/jasmine.js @@ -53,7 +53,7 @@ exports.init = function(grunt, phantomjs) { exports.copyTempFile(__dirname + '/../jasmine/reporters/PhantomReporter.js', 'reporter.js'); - ['jasmine.css', 'jasmine.js', 'jasmine-html.js', 'boot.js'].forEach(function(name){ + ['jasmine.css', 'jasmine.js', 'jasmine-html.js', 'boot.js', 'jasmine_favicon.png'].forEach(function(name){ var path = __dirname + '/../../vendor/jasmine-' + options.version + '/' + name; if (fs.existsSync(path)) exports.copyTempFile(path, name); }); diff --git a/test/expected/defaultTemplate.html b/test/expected/defaultTemplate.html index 6530ea8..a1dc71a 100644 --- a/test/expected/defaultTemplate.html +++ b/test/expected/defaultTemplate.html @@ -3,6 +3,7 @@ Jasmine Spec Runner + diff --git a/test/jasmine_test.js b/test/jasmine_test.js index 3ec634d..b26c2bd 100644 --- a/test/jasmine_test.js +++ b/test/jasmine_test.js @@ -31,6 +31,7 @@ exports.jasmine = { reporters : ['R1.js'], boot : ['BOOT.js'] }, + temp: 'path/to/temp/folder', options : {} };