[ckan-changes] commit/ckan: 3 new changesets
Bitbucket
commits-noreply at bitbucket.org
Mon Oct 10 11:06:29 UTC 2011
3 new changesets in ckan:
http://bitbucket.org/okfn/ckan/changeset/5767a0bff6d6/
changeset: 5767a0bff6d6
branch: feature-1264-core-admin
user: zephod
date: 2011-10-05 16:25:18
summary: [admin][s]: Don't mention ckanext-admin in the docs.
affected #: 2 files (-1 bytes)
--- a/doc/configuration.rst Wed Oct 05 14:30:32 2011 +0100
+++ b/doc/configuration.rst Wed Oct 05 15:25:18 2011 +0100
@@ -472,7 +472,7 @@
Example::
- ckan.plugins = disqus synchronous_search datapreview googleanalytics stats storage admin follower
+ ckan.plugins = disqus synchronous_search datapreview googleanalytics stats storage follower
Specify which CKAN extensions are to be enabled.
--- a/doc/extensions.rst Wed Oct 05 14:30:32 2011 +0100
+++ b/doc/extensions.rst Wed Oct 05 15:25:18 2011 +0100
@@ -15,7 +15,6 @@
Some popular extensions include:
-* `ckanext-admin <https://bitbucket.org/okfn/ckanext-admin>`_: Admin web interface for CKAN.
* `ckanext-apps <https://bitbucket.org/okfn/ckanext-apps>`_: Apps and ideas catalogue extension for CKAN.
* `ckanext-deliverance <https://bitbucket.org/okfn/ckanext-deliverance>`_: Extends CKAN to use the Deliverance HTTP proxy, which can request and render web pages from * an external site (e.g. a CMS like Drupal or Wordpress).
* `ckanext-disqus <https://bitbucket.org/okfn/ckanext-disqus>`_: Allows users to comment on dataset pages with Disqus.
http://bitbucket.org/okfn/ckan/changeset/2dbe3134d0dc/
changeset: 2dbe3134d0dc
branch: feature-1264-core-admin
user: zephod
date: 2011-10-05 16:26:35
summary: [admin][m]: Added test harness.
affected #: 1 file (-1 bytes)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ckan/tests/functional/test_admin.py Wed Oct 05 15:26:35 2011 +0100
@@ -0,0 +1,308 @@
+import os
+from paste.deploy import appconfig
+import paste.fixture
+from ckan.config.middleware import make_app
+import ckan.model as model
+from ckan.tests import conf_dir, url_for, CreateTestData
+from controllers.admin import get_sysadmins
+
+class TestAdminController:
+ @classmethod
+ def setup_class(cls):
+ config = appconfig('config:test.ini', relative_to=conf_dir)
+ wsgiapp = make_app(config.global_conf, **config.local_conf)
+ cls.app = paste.fixture.TestApp(wsgiapp)
+ # setup test data including testsysadmin user
+ CreateTestData.create()
+
+ @classmethod
+ def teardown_class(self):
+ CreateTestData.delete()
+
+ #test that only sysadmins can access the /ckan-admin page
+ def test_index(self):
+ url = url_for('ckanadmin', action='index')
+ # redirect as not authorized
+ response = self.app.get(url, status=[302])
+ # random username
+ response = self.app.get(url, status=[401],
+ extra_environ={'REMOTE_USER': 'my-random-user-name'})
+ # now test real access
+ username = u'testsysadmin'.encode('utf8')
+ response = self.app.get(url,
+ extra_environ={'REMOTE_USER': username})
+ assert 'Administration' in response, response
+
+
+class TestAdminAuthzController:
+ @classmethod
+ def setup_class(cls):
+ config = appconfig('config:test.ini', relative_to=conf_dir)
+ wsgiapp = make_app(config.global_conf, **config.local_conf)
+ cls.app = paste.fixture.TestApp(wsgiapp)
+ # setup test data including testsysadmin user
+ CreateTestData.create()
+ # Creating a couple of authorization groups, which are enough to break
+ # some things just by their existence
+ for ag_name in [u'anauthzgroup', u'anotherauthzgroup']:
+ ag=model.AuthorizationGroup.by_name(ag_name)
+ if not ag: #may already exist, if not create
+ ag=model.AuthorizationGroup(name=ag_name)
+ model.Session.add(ag)
+ model.Session.commit()
+ #they are especially dangerous if they have a role on the System
+ ag = model.AuthorizationGroup.by_name(u'anauthzgroup')
+ model.add_authorization_group_to_role(ag, u'editor', model.System())
+ model.Session.commit()
+
+ @classmethod
+ def teardown_class(self):
+ CreateTestData.delete()
+
+ def test_role_table(self):
+
+ #logged in as testsysadmin for all actions
+ as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
+
+ def get_system_user_roles():
+ sys_query=model.Session.query(model.SystemRole)
+ return sorted([(x.user.name,x.role) for x in sys_query.all() if x.user])
+
+ def get_system_authzgroup_roles():
+ sys_query=model.Session.query(model.SystemRole)
+ return sorted([(x.authorized_group.name,x.role) for x in sys_query.all() if x.authorized_group])
+
+ def get_response():
+ response = self.app.get(
+ url_for('ckanadmin', action='authz'),
+ extra_environ=as_testsysadmin)
+ assert 'Administration - Authorization' in response, response
+ return response
+
+ def get_user_form():
+ response = get_response()
+ return response.forms['theform']
+
+ def get_authzgroup_form():
+ response = get_response()
+ return response.forms['authzgroup_form']
+
+ def check_and_set_checkbox(theform, user, role, should_be, set_to):
+ user_role_string = '%s$%s' % (user, role)
+ checkboxes = [x for x in theform.fields[user_role_string] \
+ if x.__class__.__name__ == 'Checkbox']
+
+ assert(len(checkboxes)==1), \
+ "there should only be one checkbox for %s/%s" % (user, role)
+ checkbox = checkboxes[0]
+
+ #checkbox should be unticked
+ assert checkbox.checked==should_be, \
+ "%s/%s checkbox in unexpected state" % (user, role)
+
+ #tick or untick the box and submit the form
+ checkbox.checked=set_to
+ return theform
+
+ def submit(form):
+ return form.submit('save', extra_environ=as_testsysadmin)
+
+ def authz_submit(form):
+ return form.submit('authz_save', extra_environ=as_testsysadmin)
+
+ # get and store the starting state of the system roles
+ original_user_roles = get_system_user_roles()
+ original_authzgroup_roles = get_system_authzgroup_roles()
+
+ # also keep a copy that we can update as the tests go on
+ expected_user_roles = get_system_user_roles()
+ expected_authzgroup_roles = get_system_authzgroup_roles()
+
+ # before we start changing things, check that the roles on the system are as expected
+ assert original_user_roles == \
+ [(u'logged_in', u'editor'), (u'testsysadmin', u'admin'), (u'visitor', u'anon_editor')] , \
+ "original user roles not as expected " + str(original_user_roles)
+
+ assert original_authzgroup_roles == [(u'anauthzgroup', u'editor')], \
+ "original authzgroup roles not as expected" + str(original_authzgroup_roles)
+
+
+ # visitor is not an admin. check that his admin box is unticked, tick it, and submit
+ submit(check_and_set_checkbox(get_user_form(), u'visitor', u'admin', False, True))
+
+ # update expected state to reflect the change we should just have made
+ expected_user_roles.append((u'visitor', u'admin'))
+ expected_user_roles.sort()
+
+ # and check that's the state in the database now
+ assert get_system_user_roles() == expected_user_roles
+ assert get_system_authzgroup_roles() == expected_authzgroup_roles
+
+ # try again, this time we expect the box to be ticked already
+ submit(check_and_set_checkbox(get_user_form(), u'visitor', u'admin', True, True))
+
+ # performing the action twice shouldn't have changed anything
+ assert get_system_user_roles() == expected_user_roles
+ assert get_system_authzgroup_roles() == expected_authzgroup_roles
+
+ # now let's make the authzgroup which already has a system role an admin
+ authz_submit(check_and_set_checkbox(get_authzgroup_form(), u'anauthzgroup', u'admin', False, True))
+
+ # update expected state to reflect the change we should just have made
+ expected_authzgroup_roles.append((u'anauthzgroup', u'admin'))
+ expected_authzgroup_roles.sort()
+
+ # check that's happened
+ assert get_system_user_roles() == expected_user_roles
+ assert get_system_authzgroup_roles() == expected_authzgroup_roles
+
+ # put it back how it was
+ submit(check_and_set_checkbox(get_user_form(), u'visitor', u'admin', True, False))
+ authz_submit(check_and_set_checkbox(get_authzgroup_form(), u'anauthzgroup', u'admin', True, False))
+
+ # should be back to our starting state
+ assert original_user_roles == get_system_user_roles()
+ assert original_authzgroup_roles == get_system_authzgroup_roles()
+
+
+ # now test making multiple changes
+
+
+ # change lots of things
+ form = get_user_form()
+ check_and_set_checkbox(form, u'visitor', u'editor', False, True)
+ check_and_set_checkbox(form, u'visitor', u'reader', False, False)
+ check_and_set_checkbox(form, u'logged_in', u'editor', True, False)
+ check_and_set_checkbox(form, u'logged_in', u'reader', False, True)
+ submit(form)
+
+ roles=get_system_user_roles()
+ # and assert that they've actually changed
+ assert (u'visitor', u'editor') in roles and \
+ (u'logged_in', u'editor') not in roles and \
+ (u'logged_in', u'reader') in roles and \
+ (u'visitor', u'reader') not in roles, \
+ "visitor and logged_in roles seem not to have reversed"
+
+
+ def get_roles_by_name(user=None, group=None):
+ if user:
+ return [y for (x,y) in get_system_user_roles() if x==user]
+ elif group:
+ return [y for (x,y) in get_system_authzgroup_roles() if x==group]
+ else:
+ assert False, 'miscalled'
+
+
+ # now we test the box for giving roles to an arbitrary user
+
+ # check that tester doesn't have a system role
+ assert len(get_roles_by_name(user=u'tester'))==0, \
+ "tester should not have roles"
+
+ # get the put tester in the username box
+ form = get_response().forms['addform']
+ form.fields['new_user_name'][0].value='tester'
+ # get the admin checkbox
+ checkbox = [x for x in form.fields['admin'] \
+ if x.__class__.__name__ == 'Checkbox'][0]
+ # check it's currently unticked
+ assert checkbox.checked == False
+ # tick it and submit
+ checkbox.checked=True
+ response = form.submit('add', extra_environ=as_testsysadmin)
+ assert "User Added" in response, "don't see flash message"
+
+ assert get_roles_by_name(user=u'tester') == ['admin'], \
+ "tester should be an admin now"
+
+ # and similarly for an arbitrary authz group
+ assert get_roles_by_name(group=u'anotherauthzgroup') == [], \
+ "should not have roles"
+
+ form = get_response().forms['authzgroup_addform']
+ form.fields['new_user_name'][0].value='anotherauthzgroup'
+ checkbox = [x for x in form.fields['reader'] \
+ if x.__class__.__name__ == 'Checkbox'][0]
+ assert checkbox.checked == False
+ checkbox.checked=True
+
+ response = form.submit('authz_add', extra_environ=as_testsysadmin)
+ assert "Authorization Group Added" in response, "don't see flash message"
+
+
+ assert get_roles_by_name(group=u'anotherauthzgroup') == [u'reader'], \
+ "should be a reader now"
+
+
+class TestAdminTrashController:
+ def setup(cls):
+ config = appconfig('config:test.ini', relative_to=conf_dir)
+ wsgiapp = make_app(config.global_conf, **config.local_conf)
+ cls.app = paste.fixture.TestApp(wsgiapp)
+ CreateTestData.create()
+
+ def teardown(self):
+ CreateTestData.delete()
+
+ def test_purge_revision(self):
+ as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
+
+ # Put a revision in deleted state
+ rev = model.repo.youngest_revision()
+ revid = rev.id
+ rev.state = model.State.DELETED
+ model.Session.commit()
+
+ # check it shows up on trash page and
+ url = url_for('ckanadmin', action='trash')
+ response = self.app.get(url, extra_environ=as_testsysadmin)
+ assert revid in response, response
+
+ # check it can be successfully purged
+ form = response.forms['form-purge-revisions']
+ res = form.submit('purge-revisions', status=[302], extra_environ=as_testsysadmin)
+ res = res.follow(extra_environ=as_testsysadmin)
+ assert not revid in res, res
+ rev = model.Session.query(model.Revision).filter_by(id=revid).first()
+ assert rev is None, rev
+
+ def test_purge_package(self):
+ as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
+
+ # Put packages in deleted state
+ rev = model.repo.new_revision()
+ pkg = model.Package.by_name(u'warandpeace')
+ pkg.state = model.State.DELETED
+ model.repo.commit_and_remove()
+
+ # Check shows up on trash page
+ url = url_for('ckanadmin', action='trash')
+ response = self.app.get(url, extra_environ=as_testsysadmin)
+ assert 'dataset/warandpeace' in response, response
+
+ # Check we get correct error message on attempted purge
+ form = response.forms['form-purge-packages']
+ response = form.submit('purge-packages', status=[302],
+ extra_environ=as_testsysadmin)
+ response = response.follow(extra_environ=as_testsysadmin)
+ assert 'Cannot purge package' in response, response
+ assert 'dataset/warandpeace' in response
+
+ # now check we really can purge when things are ok
+ pkg = model.Package.by_name(u'annakarenina')
+ pkg.state = model.State.DELETED
+ model.repo.new_revision()
+ model.Session.commit()
+
+ response = self.app.get(url, extra_environ=as_testsysadmin)
+ assert 'dataset/warandpeace' in response, response
+ assert 'dataset/annakarenina' in response, response
+
+ form = response.forms['form-purge-packages']
+ res = form.submit('purge-packages', status=[302], extra_environ=as_testsysadmin)
+ res = res.follow(extra_environ=as_testsysadmin)
+
+ pkgs = model.Session.query(model.Package).all()
+ assert len(pkgs) == 0
+
http://bitbucket.org/okfn/ckan/changeset/21c2d8fcbdf7/
changeset: 21c2d8fcbdf7
branch: feature-1264-core-admin
user: zephod
date: 2011-10-10 13:06:14
summary: [admin][m]: Written new unit tests. Altererd markup to be testable.
affected #: 3 files (-1 bytes)
--- a/ckan/public/css/style.css Wed Oct 05 15:26:35 2011 +0100
+++ b/ckan/public/css/style.css Mon Oct 10 12:06:14 2011 +0100
@@ -1103,7 +1103,8 @@
margin-bottom: 30px;
text-align: right;
}
-body.admin .actions button {
+body.admin .actions button,
+body.admin .actions input {
margin: 0;
}
body.admin.authz form {
--- a/ckan/templates/_util.html Wed Oct 05 15:26:35 2011 +0100
+++ b/ckan/templates/_util.html Mon Oct 10 12:06:14 2011 +0100
@@ -364,12 +364,15 @@
action="${h.url_for(controller='revision',
action='edit',
id=revision.id)}"
+ id="undelete-${revision.id}"
><py:if test="revision.state!='deleted'">
- <button type="submit" name="action" value="delete" class="pretty-button small">Delete</button>
+ <input type="hidden" name="action" value="delete"/>
+ <input type="submit" name="submit" value="Delete" class="pretty-button small" /></py:if><py:if test="revision.state=='deleted'">
- <button type="submit" name="action" value="undelete" class="pretty-button small">Undelete</button>
+ <input type="hidden" name="action" value="undelete"/>
+ <input type="submit" name="submit" value="Undelete" class="pretty-button small" /></py:if></form></div>
--- a/ckan/tests/functional/test_admin.py Wed Oct 05 15:26:35 2011 +0100
+++ b/ckan/tests/functional/test_admin.py Mon Oct 10 12:06:14 2011 +0100
@@ -243,7 +243,7 @@
CreateTestData.create()
def teardown(self):
- CreateTestData.delete()
+ model.repo.rebuild_db()
def test_purge_revision(self):
as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
@@ -306,3 +306,54 @@
pkgs = model.Session.query(model.Package).all()
assert len(pkgs) == 0
+ def test_purge_youngest_revision(self):
+ as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
+
+ id = u'warandpeace'
+ log_message = 'test_1234'
+ edit_url = url_for(controller='package', action='edit', id=id)
+
+ # Manually create a revision
+ res = self.app.get(edit_url)
+ fv = res.forms['dataset-edit']
+ fv['title'] = 'RevisedTitle'
+ fv['log_message'] = log_message
+ res = fv.submit('save')
+
+ # Delete that revision
+ rev = model.repo.youngest_revision()
+ assert rev.message == log_message
+ rev.state = model.State.DELETED
+ model.Session.commit()
+
+ # Run a purge
+ url = url_for('ckanadmin', action='trash')
+ res = self.app.get(url, extra_environ=as_testsysadmin)
+ form = res.forms['form-purge-revisions']
+ res = form.submit('purge-revisions', status=[302], extra_environ=as_testsysadmin)
+ res = res.follow(extra_environ=as_testsysadmin)
+
+ # Verify the edit page can be loaded (ie. does not 404)
+ res = self.app.get(edit_url)
+
+ def test_undelete(self):
+ as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
+
+ rev = model.repo.youngest_revision()
+ rev_id = rev.id
+ rev.state = model.State.DELETED
+ model.Session.commit()
+
+ # Click undelete
+ url = url_for('ckanadmin', action='trash')
+ res = self.app.get(url, extra_environ=as_testsysadmin)
+ form = res.forms['undelete-'+rev.id]
+ res = form.submit('submit', status=[302], extra_environ=as_testsysadmin)
+ res = res.follow(extra_environ=as_testsysadmin)
+
+ assert 'Revision updated' in res
+ assert not 'DELETED' in res
+
+ rev = model.repo.youngest_revision()
+ assert rev.id == rev_id
+ assert rev.state == model.State.ACTIVE
Repository URL: https://bitbucket.org/okfn/ckan/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the ckan-changes
mailing list