Merge pull request #2783 from strongloop/fix/windows-ci-2x
Temporarily disable Karma tests on Windows CI
This commit is contained in:
commit
5ee43fec83
|
@ -224,6 +224,10 @@ module.exports = function(grunt) {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
grunt.registerTask('skip-karma-on-windows', function() {
|
||||||
|
console.log('*** SKIPPING PHANTOM-JS BASED TESTS ON WINDOWS ***');
|
||||||
|
});
|
||||||
|
|
||||||
grunt.registerTask('e2e', ['e2e-server', 'karma:e2e']);
|
grunt.registerTask('e2e', ['e2e-server', 'karma:e2e']);
|
||||||
|
|
||||||
// Default task.
|
// Default task.
|
||||||
|
@ -233,7 +237,9 @@ module.exports = function(grunt) {
|
||||||
'jscs',
|
'jscs',
|
||||||
'jshint',
|
'jshint',
|
||||||
process.env.JENKINS_HOME ? 'mochaTest:unit-xml' : 'mochaTest:unit',
|
process.env.JENKINS_HOME ? 'mochaTest:unit-xml' : 'mochaTest:unit',
|
||||||
'karma:unit-once']);
|
process.env.JENKINS_HOME && /^win/.test(process.platform) ?
|
||||||
|
'skip-karma-on-windows' : 'karma:unit-once',
|
||||||
|
]);
|
||||||
|
|
||||||
// alias for sl-ci-run and `npm test`
|
// alias for sl-ci-run and `npm test`
|
||||||
grunt.registerTask('mocha-and-karma', ['test']);
|
grunt.registerTask('mocha-and-karma', ['test']);
|
||||||
|
|
Loading…
Reference in New Issue