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 BE78710623 for ; Wed, 7 Aug 2013 14:25:03 +0000 (UTC) Received: (qmail 49311 invoked by uid 500); 7 Aug 2013 14:25:00 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 49143 invoked by uid 500); 7 Aug 2013 14:25:00 -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 48633 invoked by uid 99); 7 Aug 2013 14:24:57 -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, 07 Aug 2013 14:24:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E0F791CDA9; Wed, 7 Aug 2013 14:24:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Wed, 07 Aug 2013 14:24:57 -0000 Message-Id: <77484e4401f74e71be19898aa2ebd82b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 6ce887f fix test for 8d7ab8b. cc COUCHDB-1838 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b4480fac Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b4480fac Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b4480fac Branch: refs/heads/master Commit: b4480facc3d7bc72223c25e8b05c0fa00c08dd3f Parents: 0373c81 Author: Jan Lehnardt Authored: Wed Aug 7 16:11:59 2013 +0200 Committer: Jan Lehnardt Committed: Wed Aug 7 16:24:29 2013 +0200 ---------------------------------------------------------------------- share/www/script/test/users_db_security.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b4480fac/share/www/script/test/users_db_security.js ---------------------------------------------------------------------- diff --git a/share/www/script/test/users_db_security.js b/share/www/script/test/users_db_security.js index cdc3f17..2ab5fe0 100644 --- a/share/www/script/test/users_db_security.js +++ b/share/www/script/test/users_db_security.js @@ -282,23 +282,26 @@ couchTests.users_db_security = function(debug) { TEquals(undefined, res.password_scheme); TEquals(undefined, res.derived_key); - // log in one last time so run_on_modified_server can clean up the admin account - TEquals(true, CouchDB.login("jan", "apple").ok); - var all = usersDb.allDocs({ include_docs: true }); T(all.rows); if (all.rows) { T(all.rows.every(function(row) { - T(row.doc); if (row.doc) { return Object.keys(row.doc).every(function(key) { return key === 'name' || key === 'type'; }); } else { - return false; + if(row.id[0] == "_") { + // ignore design docs + return true + } else { + return false; + } } })); } + // log in one last time so run_on_modified_server can clean up the admin account + TEquals(true, CouchDB.login("jan", "apple").ok); }); };