You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2014/08/14 01:25:53 UTC
[05/50] couchdb commit: updated refs/heads/1.6.x to eeb31cb
Fauxton: fix loading of pouch
Added a red test which turned green
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ad8e28c8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ad8e28c8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ad8e28c8
Branch: refs/heads/1.6.x
Commit: ad8e28c8037416d56d2c527045063cb7cd927869
Parents: 95600b7
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Tue May 13 18:08:45 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Tue May 13 18:09:36 2014 +0200
----------------------------------------------------------------------
src/Makefile.am | 1 +
.../app/addons/documents/tests/viewsSpec.js | 23 ++++++++++++++++++++
src/fauxton/app/addons/pouchdb/base.js | 2 +-
src/fauxton/app/addons/pouchdb/pouch.collate.js | 2 +-
.../app/addons/pouchdb/pouchdb.mapreduce.js | 4 ++--
5 files changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ad8e28c8/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index f09d313..1e3515d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,6 +152,7 @@ FAUXTON_FILES = \
fauxton/app/addons/documents/resources.js \
fauxton/app/addons/documents/routes.js \
fauxton/app/addons/documents/tests/resourcesSpec.js \
+ fauxton/app/addons/documents/tests/viewsSpec.js \
fauxton/app/addons/documents/views.js \
fauxton/app/addons/fauxton/base.js \
fauxton/app/addons/fauxton/components.js \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ad8e28c8/src/fauxton/app/addons/documents/tests/viewsSpec.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/tests/viewsSpec.js b/src/fauxton/app/addons/documents/tests/viewsSpec.js
new file mode 100644
index 0000000..8bc1397
--- /dev/null
+++ b/src/fauxton/app/addons/documents/tests/viewsSpec.js
@@ -0,0 +1,23 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+define([
+ 'addons/documents/views',
+ 'testUtils'
+], function (Views, testUtils) {
+ var assert = testUtils.assert;
+
+ describe('DocumentsViews', function () {
+ it('should load', function () {
+ assert.equal(typeof Views.Views.Changes, 'function');
+ });
+ });
+});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ad8e28c8/src/fauxton/app/addons/pouchdb/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/pouchdb/base.js b/src/fauxton/app/addons/pouchdb/base.js
index 69962bb..3cd2b43 100644
--- a/src/fauxton/app/addons/pouchdb/base.js
+++ b/src/fauxton/app/addons/pouchdb/base.js
@@ -22,7 +22,7 @@ define([
"api",
// Modules
- "addons/pouchdb/pouchdb.mapreduce.js"
+ "addons/pouchdb/pouchdb.mapreduce"
],
function(app, FauxtonAPI, MapReduce) {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ad8e28c8/src/fauxton/app/addons/pouchdb/pouch.collate.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/pouchdb/pouch.collate.js b/src/fauxton/app/addons/pouchdb/pouch.collate.js
index 8f15808..e48ab85 100644
--- a/src/fauxton/app/addons/pouchdb/pouch.collate.js
+++ b/src/fauxton/app/addons/pouchdb/pouch.collate.js
@@ -21,7 +21,7 @@ define([
"api",
// Modules
- "addons/pouchdb/pouch.collate.js"
+ "addons/pouchdb/pouch.collate"
],
function(app, FauxtonAPI, Collate) {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ad8e28c8/src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js b/src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js
index 502e0eb..30e01e5 100644
--- a/src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js
+++ b/src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js
@@ -29,7 +29,7 @@ define([
"api",
// Modules
- "addons/pouchdb/pouch.collate.js"
+ "addons/pouchdb/pouch.collate"
],
function(app, FauxtonAPI, Collate) {
@@ -90,7 +90,7 @@ function(app, FauxtonAPI, Collate) {
id: current.doc._id,
key: key,
value: val
- };
+ };
//console.log("VIEW ROW: ", viewRow);
if (options.startkey && Pouch.collate(key, options.startkey) < 0) return;