You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2014/12/10 12:06:42 UTC
[1/3] fauxton commit: updated refs/heads/master to 7317173
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 3d2180f6d -> 731717379
build into main www dir
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c69bdce7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c69bdce7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c69bdce7
Branch: refs/heads/master
Commit: c69bdce76094c456cd8e9722dba869545cf9fdff
Parents: a0fc781
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 10 20:52:21 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Dec 9 13:11:05 2014 +0300
----------------------------------------------------------------------
Gruntfile.js | 20 ++++++++++----------
readme.md | 2 +-
settings.json.default | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c69bdce7/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index f6d2347..676e058 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -319,21 +319,21 @@ module.exports = function(grunt) {
couchdb: {
files: [
// this gets built in the template task
- {src: "dist/release/index.html", dest: "../../share/www/fauxton/index.html"},
- {src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/release/js/', expand: true},
- {src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/release/img/', expand: true},
- {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/release/fonts/', expand: true},
- {src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/release/css/", expand: true}
+ {src: "dist/release/index.html", dest: "../../share/www/index.html"},
+ {src: ["**"], dest: "../../share/www/js/", cwd:'dist/release/js/', expand: true},
+ {src: ["**"], dest: "../../share/www/img/", cwd:'dist/release/img/', expand: true},
+ {src: ["**"], dest: "../../share/www/fonts/", cwd:'dist/release/fonts/', expand: true},
+ {src: ["**"], dest: "../../share/www/css/", cwd:"dist/release/css/", expand: true}
]
},
couchdebug: {
files: [
// this gets built in the template task
- {src: "dist/debug/index.html", dest: "../../share/www/fauxton/index.html"},
- {src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/debug/js/', expand: true},
- {src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/debug/img/', expand: true},
- {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/debug/fonts/', expand: true},
- {src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/debug/css/", expand: true}
+ {src: "dist/debug/index.html", dest: "../../share/www/index.html"},
+ {src: ["**"], dest: "../../share/www/js/", cwd:"dist/debug/js/", expand: true},
+ {src: ["**"], dest: "../../share/www/img/", cwd:"dist/debug/img/", expand: true},
+ {src: ["**"], dest: "../../share/www/fonts/", cwd:"dist/debug/fonts/", expand: true},
+ {src: ["**"], dest: "../../share/www/css/", cwd:"dist/debug/css/", expand: true}
]
},
ace: {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c69bdce7/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index a48d0b8..e8e2da7 100644
--- a/readme.md
+++ b/readme.md
@@ -50,7 +50,7 @@ You should be able to access fauxton on `http://localhost:8000`
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/`
### 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://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c69bdce7/settings.json.default
----------------------------------------------------------------------
diff --git a/settings.json.default b/settings.json.default
index bc5a617..0e67404 100644
--- a/settings.json.default
+++ b/settings.json.default
@@ -41,7 +41,7 @@
"cachebuster": "?v1.0"
},
"app": {
- "root": "/_utils/fauxton/",
+ "root": "/_utils/",
"host": "../..",
"version": "1.0"
}
[3/3] fauxton commit: updated refs/heads/master to 7317173
Posted by kx...@apache.org.
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 <kx...@apache.org>
Authored: Wed Dec 10 14:05:25 2014 +0300
Committer: Alexander Shorin <kx...@apache.org>
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"
}
[2/3] fauxton commit: updated refs/heads/master to 7317173
Posted by kx...@apache.org.
fix link in readme
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/57a0c52a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/57a0c52a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/57a0c52a
Branch: refs/heads/master
Commit: 57a0c52a3ffdbbc6baca7109b1e1abf715fc04df
Parents: c69bdce
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Dec 8 11:50:24 2014 +0100
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Dec 9 13:11:10 2014 +0300
----------------------------------------------------------------------
readme.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/57a0c52a/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index e8e2da7..83026dc 100644
--- a/readme.md
+++ b/readme.md
@@ -44,7 +44,7 @@ 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/fauxton/"
+ Edit settings.json variable root where the document will live. eg. "/_utils/"
then: