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 61AA5C7F4 for ; Wed, 10 Dec 2014 11:06:48 +0000 (UTC) Received: (qmail 33354 invoked by uid 500); 10 Dec 2014 11:06:43 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 33300 invoked by uid 500); 10 Dec 2014 11:06:43 -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 33214 invoked by uid 99); 10 Dec 2014 11:06:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Dec 2014 11:06:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E8126A231EC; Wed, 10 Dec 2014 11:06:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Wed, 10 Dec 2014 11:06:44 -0000 Message-Id: <4c88d2197f5947b3b048fcafba083a54@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] fauxton commit: updated refs/heads/master to 7317173 Merge branch 'goodbye-futon' This closes #126 Conflicts: readme.md Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/73171737 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/73171737 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/73171737 Branch: refs/heads/master Commit: 73171737910d0cbf82ffbf9366372fd4dd680fff Parents: 3d2180f 57a0c52 Author: Alexander Shorin Authored: Wed Dec 10 14:05:25 2014 +0300 Committer: Alexander Shorin Committed: Wed Dec 10 14:05:25 2014 +0300 ---------------------------------------------------------------------- Gruntfile.js | 20 ++++++++++---------- readme.md | 4 ++-- settings.json.default | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/73171737/Gruntfile.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/73171737/readme.md ---------------------------------------------------------------------- diff --cc readme.md index 95300ee,83026dc..724ddf5 --- a/readme.md +++ b/readme.md @@@ -40,56 -40,21 +40,56 @@@ And then.. grunt dev -You should be able to access fauxton on `http://localhost:8000` +You should be able to access Fauxton on `http://localhost:8000` -### Prepare Fauxton Release - Follow the "Fauxton Setup" section, - Edit settings.json variable root where the document will live. eg. "/_utils/" +### Styleguide +We follow our coding-styleguide to make it easier for everyone to write, read and review code: [https://github.com/apache/couchdb-fauxton/blob/master/styleguide.md](https://github.com/apache/couchdb-fauxton/blob/master/styleguide.md) - then: +### Prepare Fauxton Release +Follow the "Fauxton Setup" section, edit settings.json variable root where the document will live, - e.g. "/_utils/fauxton/" then: ++e.g. "/_utils/" then: grunt couchdb - This will install the latest version of Fauxton into `/share/www/fauxton` - This will install the latest version of Fauxton into `/share/www/` ++This will install the latest version of Fauxton into `/share/www/` ### Running Tests - There are two ways to run the tests. `grunt test` will run the tests via the commandline. It is also possible to view them via the url - `http://localhost:8000/testrunner` when the dev server is running. Refreshing the url will rerun the tests via phantomjs and in the browser. + +You can run the tests either via the command line or your browser. + +Command line: + + grunt test + +Browser: make sure the dev server is running, and enter the path (not URL) to your `runner.html` file in your browser. + + file://path/to/couchdb-fauxton/test/runner.html + +Refreshing the URL will re-run the tests via PhantomJS and in the browser. + +#### Nightwatch Functional Browser Tests + +There is a bit of setup involved before you are able to run the Nightwatch tests. + +In your CouchDB admin accounts, add a user: + +> user: tester +password: testerpass + +Then on the command line: + + npm install + +Start fauxton with + + grunt dev + +And to run the tests (in another terminal tab): + + grunt nightwatch + + + ### To Deploy Fauxton http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/73171737/settings.json.default ---------------------------------------------------------------------- diff --cc settings.json.default index fcb3767,0e67404..4d91255 --- a/settings.json.default +++ b/settings.json.default @@@ -33,12 -35,13 +33,12 @@@ "src": "assets/index.underscore", "dest": "dist/debug/index.html", "variables": { - "requirejs": "./js/require.js", - "css": "./css/index.css", - "base": null, - "cachebuster": "?v1.0" + "requirejs": "./js/REQUIREJS_FILE", + "css": "./css/CSS_FILE", + "base": null }, "app": { - "root": "/_utils/fauxton/", + "root": "/_utils/", "host": "../..", "version": "1.0" }