From 995a388a9e96cb73b83a2c8e4c078bb00a8dfd85 Mon Sep 17 00:00:00 2001 From: Ross Jones Date: Wed, 1 Feb 2012 11:50:10 +0000 Subject: [PATCH] [1669] Test fixes to pass in the package object under the package key, not the name --- ckan/logic/auth/publisher/delete.py | 4 +--- ckan/logic/auth/publisher/update.py | 4 +--- ckan/tests/functional/test_publisher_auth.py | 10 ++++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ckan/logic/auth/publisher/delete.py b/ckan/logic/auth/publisher/delete.py index c3d4b48131d..1a23e611fef 100644 --- a/ckan/logic/auth/publisher/delete.py +++ b/ckan/logic/auth/publisher/delete.py @@ -10,12 +10,10 @@ def package_delete(context, data_dict): model = context['model'] user = context['user'] package = get_package_object(context, data_dict) - packageobj = model.Package.by_name( package ) userobj = model.User.get( user ) if not userobj or \ - not packageobj or \ - not _groups_intersect( userobj.get_groups('publisher'), packageobj.get_groups('publisher') ): + not _groups_intersect( userobj.get_groups('publisher'), package.get_groups('publisher') ): return {'success': False, 'msg': _('User %s not authorized to delete packages in these group') % str(user)} return {'success': True} diff --git a/ckan/logic/auth/publisher/update.py b/ckan/logic/auth/publisher/update.py index 35cb158aee7..d5cadcc089e 100644 --- a/ckan/logic/auth/publisher/update.py +++ b/ckan/logic/auth/publisher/update.py @@ -12,12 +12,10 @@ def package_update(context, data_dict): model = context['model'] user = context.get('user') package = get_package_object(context, data_dict) - packageobj = model.Package.by_name( package ) userobj = model.User.get( user ) if not userobj or \ - not packageobj or \ - not _groups_intersect( userobj.get_groups('publisher'), packageobj.get_groups('publisher') ): + not _groups_intersect( userobj.get_groups('publisher'), package.get_groups('publisher') ): return {'success': False, 'msg': _('User %s not authorized to edit packages in these groups') % str(user)} diff --git a/ckan/tests/functional/test_publisher_auth.py b/ckan/tests/functional/test_publisher_auth.py index 06220645288..1734437bc40 100644 --- a/ckan/tests/functional/test_publisher_auth.py +++ b/ckan/tests/functional/test_publisher_auth.py @@ -123,7 +123,8 @@ def teardown_class(self): model.Session.remove() def _run_fail_test( self, username, action): - context = { 'package': self.packagename, 'model': model, 'user': username } + pkg = model.Package.by_name(self.packagename) + context = { 'package': pkg, 'model': model, 'user': username } try: self.auth.check_access(action, context, {}) assert False, "The user should not have access" @@ -133,15 +134,16 @@ def _run_fail_test( self, username, action): def _run_success_test( self, username, action): userobj = model.User.get(username) grp = model.Group.by_name(self.groupname) - + pkg = model.Package.by_name(self.packagename) + f = model.User.get_groups g = model.Package.get_groups def gg(*args, **kwargs): return [grp] model.User.get_groups = gg model.Package.get_groups = gg - - context = { 'package': self.packagename, 'model': model, 'user': username } + + context = { 'package': pkg, 'model': model, 'user': username } try: self.auth.check_access(action, context, {}) except NotAuthorized, e: