Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE1F210407 for ; Fri, 7 Feb 2014 13:13:37 +0000 (UTC) Received: (qmail 29108 invoked by uid 500); 7 Feb 2014 13:13:36 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 29063 invoked by uid 500); 7 Feb 2014 13:13:36 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 29047 invoked by uid 99); 7 Feb 2014 13:13:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Feb 2014 13:13:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9DD1591ED10; Fri, 7 Feb 2014 13:13:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Fri, 07 Feb 2014 13:13:35 -0000 Message-Id: <55ee5b146f084587b14bede1a2cd3ebc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] couchdb commit: updated refs/heads/master to b3bb78e Updated Branches: refs/heads/master 8ec4cbc11 -> b3bb78e7b Fix failing grunt test Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fb633cb2 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fb633cb2 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fb633cb2 Branch: refs/heads/master Commit: fb633cb2892ff06316b49a1549b804537beaf59e Parents: 8ec4cbc Author: Garren Smith Authored: Fri Feb 7 15:13:05 2014 +0200 Committer: Garren Smith Committed: Fri Feb 7 15:13:05 2014 +0200 ---------------------------------------------------------------------- src/fauxton/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb633cb2/src/fauxton/Gruntfile.js ---------------------------------------------------------------------- diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 9507a60..c087afa 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -426,7 +426,7 @@ module.exports = function(grunt) { */ // clean out previous build artefactsa and lint grunt.registerTask('lint', ['clean', 'jshint']); - grunt.registerTask('test', ['lint', 'dependencies', 'test_inline']); + grunt.registerTask('test', ['lint', 'dependencies', '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']); // Fetch dependencies (from git or local dir), lint them and make load_addons