Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dustjs:Removed PhantomJS Dependency #792

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: node_js
node_js:
- "0.12"
- "5"
- "6"
- "8"
- "9"
- "10"
matrix:
include:
- node_js: "0.10"
- node_js: "11"
env:
- TEST="all"
- CXX=g++-4.8
Expand Down
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ module.exports = function(grunt) {
},
lib_test: {
files: ['<%= jshint.libs.src %>', '<%= jasmine.options.specs %>'],
tasks: ['testPhantom']
tasks: ['testChrome']
}
},
bump: {
Expand Down Expand Up @@ -287,7 +287,7 @@ module.exports = function(grunt) {
//test tasks
grunt.registerTask('testNode', ['jasmine_nodejs:templates', 'jasmine_nodejs:core', 'jasmine_nodejs:cjs']);
grunt.registerTask('testRhino', ['build', 'execute:testRhino']);
grunt.registerTask('testPhantom', ['build', 'jasmine:testProd']);
grunt.registerTask('testChrome', ['build', 'jasmine:testProd']);
grunt.registerTask('testCli', ['jasmine_nodejs:dustc']);
grunt.registerTask('test', ['build', 'jasmine:testProd', 'testCli', 'testNode', 'execute:testRhino', 'jasmine:coverage']);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"grunt-contrib-concat": "~1.0.1",
"grunt-contrib-connect": "~1.0.2",
"grunt-contrib-copy": "~1.0.0",
"grunt-contrib-jasmine": "~1.0.3",
"grunt-contrib-jasmine": "~2.0.3",
"grunt-contrib-jshint": "~1.0.0",
"grunt-contrib-uglify": "~1.0.1",
"grunt-contrib-watch": "~1.0.0",
Expand Down