couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/2] git commit: updated refs/heads/master to 6ce887f
Date Wed, 07 Aug 2013 14:24:57 GMT
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 <jan@apache.org>
Authored: Wed Aug 7 16:11:59 2013 +0200
Committer: Jan Lehnardt <jan@apache.org>
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);
     });
   };
 


Mime
View raw message