terribleplan
/
Typertext
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4 from terribleplan/add-testing 

Update package.json to only use PhantomJS in travis
This commit is contained in:
Kegan Myers 2014-03-03 17:45:33 -06:00
parent c4a9e35f22 1fffc1bc9f
commit 04de30d573
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gruntfile.js
View File

@ -4,10 +4,15 @@ module.exports = function (grunt) {
grunt.initConfig({ grunt.initConfig({
karma: { karma: {
unit: { phantom: {
configFile: "karma.conf.js", configFile: "karma.conf.js",
singleRun: true, singleRun: true,
browsers: ["PhantomJS", "Chrome"] browsers: ["PhantomJS"]
},
chrome: {
configFile: "karma.conf.js",
singleRun: true,
browsers: ["Chrome"]
}, },
watch: { watch: {
configFile: "karma.conf.js", configFile: "karma.conf.js",
@ -28,5 +33,6 @@ module.exports = function (grunt) {
grunt.registerTask('default', ['typescript']); grunt.registerTask('default', ['typescript']);
grunt.registerTask('test', ['typescript', 'karma:unit']) grunt.registerTask('test', ['typescript', 'karma:phantom', 'karma:chrome']);
grunt.registerTask('test:travis', ['typescript', 'karma:phantom']);
}; };

2
package.json
View File

@ -25,6 +25,6 @@
}, },
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"test": "./node_modules/.bin/grunt test" "test": "./node_modules/.bin/grunt test:travis"
} }
} }