You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2015/07/28 22:44:36 UTC
[2/2] fauxton commit: updated refs/heads/master to 390e902
grunt: remove grunt-mocha-phantomjs
it makes it hard to update phantomjs to a recent version and there
is no win for using this second layer of abstraction for us.
PR: #487
PR-URL: https://github.com/apache/couchdb-fauxton/pull/487
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/cb175d13
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/cb175d13
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/cb175d13
Branch: refs/heads/master
Commit: cb175d13a96a3f73551405a89243a2bdeb0c113e
Parents: eb201de
Author: Robert Kowalski <ro...@apache.org>
Authored: Mon Jul 27 17:40:48 2015 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Tue Jul 28 22:46:19 2015 +0200
----------------------------------------------------------------------
Gruntfile.js | 12 ++++++------
package.json | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cb175d13/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 7955f1a..36c8e01 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -380,10 +380,6 @@ module.exports = function (grunt) {
}
},
- mocha_phantomjs: {
- all: ['test/runner.html']
- },
-
shell: {
'build-jsx': {
command: 'node ./node_modules/react-tools/bin/jsx -x jsx app/addons/ app/addons/ --no-cache-dir',
@@ -403,6 +399,11 @@ module.exports = function (grunt) {
stylecheckSingleFile: {
command: '' // populated dynamically
+ },
+
+ phantomjs: {
+ command: './node_modules/mocha-phantomjs/bin/mocha-phantomjs ' +
+ '-p ./node_modules/phantomjs/bin/phantomjs test/runner.html'
}
},
@@ -525,7 +526,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-cssmin');
- grunt.loadNpmTasks('grunt-mocha-phantomjs');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-md5');
@@ -543,7 +543,7 @@ module.exports = function (grunt) {
grunt.registerTask('test', ['clean:release', 'dependencies', 'jsx', 'jshint', 'shell:stylecheck', 'gen_initialize:development', 'test_inline']);
// lighter weight test task for use inside dev/watch
- grunt.registerTask('test_inline', ['mochaSetup', 'jst', 'concat:test_config_js', 'mocha_phantomjs']);
+ grunt.registerTask('test_inline', ['mochaSetup', 'jst', 'concat:test_config_js', 'shell:phantomjs']);
// Fetch dependencies (from git or local dir), lint them and make load_addons
grunt.registerTask('dependencies', ['get_deps', 'gen_load_addons:default']);
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cb175d13/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 0613d86..a3aa679 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
},
"devDependencies": {
"nightwatch": "^0.6.0",
- "grunt-mocha-phantomjs": "~0.3.0",
+ "mocha-phantomjs": "~3.2.x",
+ "phantomjs": "~1.9.1",
"grunt-contrib-watch": "~0.6.1"
},
"dependencies": {