Commit 001e41e8 authored by Stefan Penner's avatar Stefan Penner

cleanup config

parent 0a0866c0
...@@ -4,7 +4,8 @@ module.exports = function(grunt) { ...@@ -4,7 +4,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-microlib'); grunt.loadNpmTasks('grunt-microlib');
// Custom phantomjs test task // Custom phantomjs test task
this.registerTask('test:phantom', "Runs tests through the command line using PhantomJS", ['build', 'tests', 'mocha_phantomjs']); this.registerTask('test:phantom', "Runs tests through the command line using PhantomJS", [
'build', 'tests', 'mocha_phantomjs']);
// Custom Node test task // Custom Node test task
this.registerTask('test:node', ['build', 'tests', 'mochaTest']); this.registerTask('test:node', ['build', 'tests', 'mochaTest']);
...@@ -25,31 +26,9 @@ module.exports = function(grunt) { ...@@ -25,31 +26,9 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'), pkg: grunt.file.readJSON('package.json'),
browserify: { mochaTest: require('./options/mocha_test.js'),
tests: { browserify: require('./options/browserify.js'),
src: ['test/test-adapter.js', mocha_phantomjs: require('./options/mocha_phantom.js')
'node_modules/promises-aplus-tests/lib/tests/**/*.js',
'node_modules/promises-aplus-tests/node_modules/sinon/lib/{sinon.js,sinon/*.js}'],
dest: 'tmp/tests-bundle.js'
}
},
mocha_phantomjs: {
phantom: {
options: {
urls: ["test/index.html"],
}
}
},
mochaTest: {
test: {
src: ['test/vendor/assert.js', 'test/test-adapter.js', 'node_modules/promises-aplus-tests/lib/tests/**/*.js', 'tmp/tests.cjs.js'],
options: {
reporter: 'spec'
},
}
}
}; };
// Merge config into emberConfig, overwriting existing settings // Merge config into emberConfig, overwriting existing settings
......
module.exports = {
tests: {
src: ['test/test-adapter.js',
'node_modules/promises-aplus-tests/lib/tests/**/*.js',
'node_modules/promises-aplus-tests/node_modules/sinon/lib/{sinon.js,sinon/*.js}'],
dest: 'tmp/tests-bundle.js'
}
};
module.exports = {
phantom: {
options: {
urls: ["test/index.html"]
}
}
};
module.exports = {
test: {
src: [
'test/vendor/assert.js',
'test/test-adapter.js',
'node_modules/promises-aplus-tests/lib/tests/**/*.js',
'tmp/tests.cjs.js'
],
options: {
reporter: 'spec'
}
}
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment