diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-01-07 19:42:51 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-01-07 19:42:51 +0000 |
| commit | aa44e253f47089e249612c496df85798922ac546 (patch) | |
| tree | 9448f185c1500c2e1ccaffe841a5342fd1829577 /share | |
| parent | 3a1f041e07c75001cf52cbae1391dcd801c17396 (diff) | |
cleanup patch for merge to trunk
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/account@896982 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share')
| -rw-r--r-- | share/www/script/couch_test_runner.js | 7 | ||||
| -rw-r--r-- | share/www/script/jquery.couch.js | 1 | ||||
| -rw-r--r-- | share/www/script/test/oauth.js | 2 | ||||
| -rw-r--r-- | share/www/script/test/users_db.js | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/share/www/script/couch_test_runner.js b/share/www/script/couch_test_runner.js index ed67d744..237f9312 100644 --- a/share/www/script/couch_test_runner.js +++ b/share/www/script/couch_test_runner.js @@ -164,10 +164,13 @@ function setupAdminParty(fun) { }, "admins"); } }); - } else { - // not a logged in admin. + } else if (userCtx.roles.indexOf("_admin") != -1) { + // admin party! readyToRun = true; fun(); + } else { + // not an admin + alert("Error: You need to be an admin to run the tests."); }; } }); diff --git a/share/www/script/jquery.couch.js b/share/www/script/jquery.couch.js index 8328af60..7e8a0236 100644 --- a/share/www/script/jquery.couch.js +++ b/share/www/script/jquery.couch.js @@ -136,7 +136,6 @@ }, logout: function(options) { options = options || {}; - // TODO this should also login as the logged-out guy using basic auth $.ajax({ type: "DELETE", url: "/_session", dataType: "json", username : "_", password : "_", diff --git a/share/www/script/test/oauth.js b/share/www/script/test/oauth.js index 89e0aaf8..d55d13e8 100644 --- a/share/www/script/test/oauth.js +++ b/share/www/script/test/oauth.js @@ -115,8 +115,6 @@ couchTests.oauth = function(debug) { usersDb.createDb(); // Create a user - // T(CouchDB.createUser("jason", "testpassword", "test@somemail.com", ['test'], adminBasicAuthHeaderValue()).ok); - // Create a user var jasonUserDoc = CouchDB.prepareUserDoc({ username: "jason", roles: ["test"] diff --git a/share/www/script/test/users_db.js b/share/www/script/test/users_db.js index 9e8024f6..2cf63fcf 100644 --- a/share/www/script/test/users_db.js +++ b/share/www/script/test/users_db.js @@ -43,6 +43,7 @@ couchTests.users_db = function(debug) { } }); T(s.name == "jchris@apache.org"); + T(s.user_doc._id == "org.couchdb.user:jchris@apache.org") T(s.info.authenticated == "{couch_httpd_auth, default_authentication_handler}"); T(s.info.user_db == "test_suite_users"); TEquals(["{couch_httpd_oauth, oauth_authentication_handler}", |