Merge pull request #16 from lebouquetin/feature/improve-mail-notifications

tracim/tracim/lib/content.py

@@ -66,6 +66,7 @@ class ContentApi(object):
 
     def __init__(self, current_user: User, show_archived=False, show_deleted=False, all_content_in_treeview=True):
         self._user = current_user
+        self._user_id = current_user.user_id if current_user else None
         self._show_archived = show_archived
         self._show_deleted = show_deleted
         self._show_all_type_of_contents_in_treeview = all_content_in_treeview
@@ -134,8 +135,9 @@ class ContentApi(object):
             result = result.filter(Content.workspace_id==workspace.workspace_id)
 
         if self._user:
+            user = DBSession.query(User).get(self._user_id)
             # Filter according to user workspaces
-            workspace_ids = [r.workspace_id for r in self._user.roles \
+            workspace_ids = [r.workspace_id for r in user.roles \
                              if r.role>=UserRoleInWorkspace.READER]
             result = result.filter(Content.workspace_id.in_(workspace_ids))
 
@@ -222,7 +224,7 @@ class ContentApi(object):
 
         return result
 
-    def create(self, content_type: str, workspace: Workspace=None, parent: Content=None, label:str ='', do_save=False) -> Content:
+    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label:str ='', do_save=False) -> Content:
         assert content_type in ContentType.allowed_types()
         content = Content()
         content.owner = self._user

tracim/tracim/lib/user.py

@@ -44,9 +44,17 @@ class UserApi(object):
         except:
             return False
 
-    def create_user(self, save_now=False) -> User:
+    def create_user(self, email=None, groups=[], save_now=False) -> User:
         user = User()
+
+        if email:
+            user.email = email
+
+        for group in groups:
+            user.groups.append(group)
+
         DBSession.add(user)
+
         if save_now:
             DBSession.flush()
 

tracim/tracim/tests/library/test_content_api.py

@@ -2,20 +2,23 @@
 
 from nose.tools import eq_
 from nose.tools import raises
+from tracim.lib.group import GroupApi
 
 import transaction
 
-from tracim.lib.base import logger
 from tracim.lib.content import compare_content_for_sorting_by_type_and_name
 from tracim.lib.content import ContentApi
+from tracim.lib.group import GroupApi
 from tracim.lib.user import UserApi
-from tracim.lib.user import UserStaticApi
+from tracim.lib.workspace import RoleApi
+from tracim.lib.workspace import WorkspaceApi
+
+from tracim.model.auth import Group
 
-from tracim.model.auth import User
 from tracim.model.data import ActionDescription
 from tracim.model.data import Content
 from tracim.model.data import ContentType
-from tracim.model.data import ContentStatus
+from tracim.model.data import UserRoleInWorkspace
 
 from tracim.tests import TestStandard
 
@@ -85,115 +88,235 @@ class TestContentApi(TestStandard):
         items = [c1, c2]
         sorteds = ContentApi.sort_content(items)
 
-        eq_(sorteds[0], c2, 'value is {} instead of {}'.format(sorteds[0].content_id, c2.content_id))
-        eq_(sorteds[1], c1, 'value is {} instead of {}'.format(sorteds[1].content_id, c1.content_id))
+        eq_(sorteds[0], c2,
+            'value is {} instead of {}'.format(sorteds[0].content_id,
+                                               c2.content_id))
+        eq_(sorteds[1], c1,
+            'value is {} instead of {}'.format(sorteds[1].content_id,
+                                               c1.content_id))
 
     def test_delete(self):
-        api = ContentApi(None)
-        item = api.create(ContentType.Folder, None, None, 'not_deleted', True)
-        item2 = api.create(ContentType.Folder, None, None, 'to_delete', True)
+        uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+
+        api = ContentApi(user)
+        item = api.create(ContentType.Folder, workspace, None,
+                          'not_deleted', True)
+        item2 = api.create(ContentType.Folder, workspace, None,
+                           'to_delete', True)
+        uid = user.user_id
+        wid = workspace.workspace_id
         transaction.commit()
 
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(2, len(items))
 
-        items = api.get_all(None, ContentType.Any, None)
+        items = api.get_all(None, ContentType.Any, workspace)
         api.delete(items[0])
         transaction.commit()
 
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(1, len(items))
         transaction.commit()
 
         # Test that the item is still available if "show deleted" is activated
-        api = ContentApi(None, show_deleted=True)
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user, show_deleted=True)
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(2, len(items))
 
 
     def test_archive(self):
-        api = ContentApi(None)
-        item = api.create(ContentType.Folder, None, None, 'not_archived', True)
-        item2 = api.create(ContentType.Folder, None, None, 'to_archive', True)
+        uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+
+        api = ContentApi(user)
+        item = api.create(ContentType.Folder, workspace, None,
+                          'not_archived', True)
+        item2 = api.create(ContentType.Folder, workspace, None,
+                           'to_archive', True)
+        uid = user.user_id
+        wid = workspace.workspace_id
         transaction.commit()
 
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(2, len(items))
 
-        items = api.get_all(None, ContentType.Any, None)
+        items = api.get_all(None, ContentType.Any, workspace)
         api.archive(items[0])
         transaction.commit()
 
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(1, len(items))
         transaction.commit()
 
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+
         # Test that the item is still available if "show deleted" is activated
         api = ContentApi(None, show_archived=True)
-        items = api.get_all(None, ContentType.Any, None)
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(2, len(items))
 
     def test_get_all_with_filter(self):
-        api = ContentApi(None)
-        item = api.create(ContentType.Folder, None, None, 'thefolder', True)
-        item2 = api.create(ContentType.File, None, None, 'thefile', True)
+        uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+
+        api = ContentApi(user)
+        item = api.create(ContentType.Folder, workspace, None,
+                          'thefolder', True)
+        item2 = api.create(ContentType.File, workspace, None, 'thefile', True)
+        uid = user.user_id
+        wid = workspace.workspace_id
         transaction.commit()
 
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(2, len(items))
 
-        items2 = api.get_all(None, ContentType.File, None)
+        items2 = api.get_all(None, ContentType.File, workspace)
         eq_(1, len(items2))
         eq_('thefile', items2[0].label)
 
-        items3 = api.get_all(None, ContentType.Folder, None)
+        items3 = api.get_all(None, ContentType.Folder, workspace)
         eq_(1, len(items3))
         eq_('thefolder', items3[0].label)
 
     def test_get_all_with_parent_id(self):
-        api = ContentApi(None)
-        item = api.create(ContentType.Folder, None, None, 'parent', True)
-        item2 = api.create(ContentType.File, None, item, 'file1', True)
-        item3 = api.create(ContentType.File, None, None, 'file2', True)
+        uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+
+        api = ContentApi(user)
+        item = api.create(ContentType.Folder, workspace, None, 'parent', True)
+        item2 = api.create(ContentType.File, workspace, item, 'file1', True)
+        item3 = api.create(ContentType.File, workspace, None, 'file2', True)
         parent_id = item.content_id
         child_id = item2.content_id
+        uid = user.user_id
+        wid = workspace.workspace_id
         transaction.commit()
 
-        items = api.get_all(None, ContentType.Any, None)
+        # Refresh instances after commit
+        user = uapi.get_one(uid)
+        workspace = WorkspaceApi(user).get_one(wid)
+        api = ContentApi(user)
+
+        items = api.get_all(None, ContentType.Any, workspace)
         eq_(3, len(items))
 
-        items2 = api.get_all(parent_id, ContentType.File, None)
+        items2 = api.get_all(parent_id, ContentType.File, workspace)
         eq_(1, len(items2))
         eq_(child_id, items2[0].content_id)
 
     @raises(ValueError)
     def test_set_status_unknown_status(self):
-        api = ContentApi(None)
-        c = api.create(ContentType.Folder, None, None, 'parent', True)
+        uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+        api = ContentApi(user)
+        c = api.create(ContentType.Folder, workspace, None, 'parent', True)
         api.set_status(c, 'unknown-status')
 
     def test_set_status_ok(self):
-        api = ContentApi(None)
-        c = api.create(ContentType.Folder, None, None, 'parent', True)
-        for new_status in ['open', 'closed-validated', 'closed-unvalidated', 'closed-deprecated']:
+        uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+        api = ContentApi(user)
+        c = api.create(ContentType.Folder, workspace, None, 'parent', True)
+        for new_status in ['open', 'closed-validated', 'closed-unvalidated',
+                           'closed-deprecated']:
             api.set_status(c, new_status)
             eq_(new_status, c.status)
             eq_(ActionDescription.STATUS_UPDATE, c.revision_type)
 
     def test_create_comment_ok(self):
         uapi = UserApi(None)
-        user = uapi.create_user()
-        user.email = 'this.is@user'
-        uapi.save(user)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
 
         api = ContentApi(user)
-        p = api.create(ContentType.Page, None, None, 'this_is_a_page')
-        c = api.create_comment(None, p, 'this is the comment', True)
+        p = api.create(ContentType.Page, workspace, None, 'this_is_a_page')
+        c = api.create_comment(workspace, p, 'this is the comment', True)
 
         eq_(Content, c.__class__)
         eq_(p.content_id, c.parent_id)
         eq_(user, c.owner)
-        eq_(None, c.workspace)
+        eq_(workspace, c.workspace)
         eq_(ContentType.Comment, c.type)
         eq_('this is the comment', c.description)
         eq_('', c.label)
@@ -202,17 +325,30 @@ class TestContentApi(TestStandard):
 
     def test_update(self):
         uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
 
-        user1 = uapi.create_user()
-        user1.email = 'this.is@user'
-        uapi.save(user1)
+        user1 = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+
+        workspace = WorkspaceApi(user1).create_workspace('test workspace',
+                                                        save_now=True)
+        wid = workspace.workspace_id
 
         user2 = uapi.create_user()
         user2.email = 'this.is@another.user'
         uapi.save(user2)
 
+        RoleApi(user1).create_one(user2, workspace,
+                                  UserRoleInWorkspace.CONTENT_MANAGER,
+                                  flush=True)
+
+        # Test starts here
+
         api = ContentApi(user1)
-        p = api.create(ContentType.Page, None, None, 'this_is_a_page', True)
+        p = api.create(ContentType.Page, workspace, None,
+                       'this_is_a_page', True)
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -221,77 +357,126 @@ class TestContentApi(TestStandard):
 
         transaction.commit()
 
-        content = api.get_one(pcid, ContentType.Any, None)
+        # Refresh instances after commit
+        user1 = uapi.get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+        api = ContentApi(user1)
+
+        content = api.get_one(pcid, ContentType.Any, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2)
-        content2 = api2.get_one(pcid, ContentType.Any, None)
+        content2 = api2.get_one(pcid, ContentType.Any, workspace)
         api2.update_content(content2, 'this is an updated page', 'new content')
         api2.save(content2)
         transaction.commit()
 
-        updated = api.get_one(pcid, ContentType.Any, None)
-        eq_(u2id, updated.owner_id, 'the owner id should be {} (found {})'.format(u2id, updated.owner_id))
+        # Refresh instances after commit
+        user1 = uapi.get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+        api = ContentApi(user1)
+
+        updated = api.get_one(pcid, ContentType.Any, workspace)
+        eq_(u2id, updated.owner_id,
+            'the owner id should be {} (found {})'.format(u2id,
+                                                          updated.owner_id))
         eq_('this is an updated page', updated.label)
         eq_('new content', updated.description)
         eq_(ActionDescription.EDITION, updated.revision_type)
 
-
     def test_update_file_data(self):
         uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
 
-        user1 = uapi.create_user()
-        user1.email = 'this.is@user'
-        uapi.save(user1)
+        user1 = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+
+        workspace = WorkspaceApi(user1).create_workspace('test workspace',
+                                                        save_now=True)
+        wid = workspace.workspace_id
 
         user2 = uapi.create_user()
         user2.email = 'this.is@another.user'
         uapi.save(user2)
 
+        RoleApi(user1).create_one(user2, workspace,
+                                  UserRoleInWorkspace.CONTENT_MANAGER,
+                                  flush=True)
+
+        # Test starts here
+
         api = ContentApi(user1)
-        p = api.create(ContentType.File, None, None, 'this_is_a_page', True)
+        p = api.create(ContentType.File, workspace, None,
+                       'this_is_a_page', True)
 
         u1id = user1.user_id
         u2id = user2.user_id
         pcid = p.content_id
         poid = p.owner_id
 
+        api.save(p)
         transaction.commit()
 
-        content = api.get_one(pcid, ContentType.Any, None)
+        # Refresh instances after commit
+        user1 = uapi.get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+        api = ContentApi(user1)
+
+        content = api.get_one(pcid, ContentType.Any, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2)
-        content2 = api2.get_one(pcid, ContentType.Any, None)
-        api2.update_file_data(content2, 'index.html', 'text/html', b'<html>hello world</html>')
+        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        api2.update_file_data(content2, 'index.html', 'text/html',
+                              b'<html>hello world</html>')
         api2.save(content2)
         transaction.commit()
 
-        updated = api.get_one(pcid, ContentType.Any, None)
-        eq_(u2id, updated.owner_id, 'the owner id should be {} (found {})'.format(u2id, updated.owner_id))
+        # Refresh instances after commit
+        user1 = uapi.get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+
+        updated = api.get_one(pcid, ContentType.Any, workspace)
+        eq_(u2id, updated.owner_id,
+            'the owner id should be {} (found {})'.format(u2id,
+                                                          updated.owner_id))
         eq_('index.html', updated.file_name)
         eq_('text/html', updated.file_mimetype)
         eq_(b'<html>hello world</html>', updated.file_content)
         eq_(ActionDescription.REVISION, updated.revision_type)
 
-
     def test_archive_unarchive(self):
         uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user1 = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+        u1id = user1.user_id
 
-        user1 = uapi.create_user()
-        user1.email = 'this.is@user'
-        uapi.save(user1)
+        workspace = WorkspaceApi(user1).create_workspace('test workspace',
+                                                        save_now=True)
+        wid = workspace.workspace_id
 
         user2 = uapi.create_user()
         user2.email = 'this.is@another.user'
         uapi.save(user2)
 
-        api = ContentApi(user1, show_archived=True) # show archived is used at the top end of the test
-        p = api.create(ContentType.File, None, None, 'this_is_a_page', True)
+        RoleApi(user1).create_one(user2, workspace,
+                                  UserRoleInWorkspace.CONTENT_MANAGER,
+                                  flush=True)
+
+        # show archived is used at the top end of the test
+        api = ContentApi(user1, show_archived=True)
+        p = api.create(ContentType.File, workspace, None,
+                       'this_is_a_page', True)
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -302,45 +487,70 @@ class TestContentApi(TestStandard):
 
         ####
 
-        content = api.get_one(pcid, ContentType.Any, None)
+        # refresh after commit
+        user1 = UserApi(None).get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+
+        content = api.get_one(pcid, ContentType.Any, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2, show_archived=True)
-        content2 = api2.get_one(pcid, ContentType.Any, None)
+        content2 = api2.get_one(pcid, ContentType.Any, workspace)
         api2.archive(content2)
         api2.save(content2)
         transaction.commit()
 
-        updated = api2.get_one(pcid, ContentType.Any, None)
-        eq_(u2id, updated.owner_id, 'the owner id should be {} (found {})'.format(u2id, updated.owner_id))
+        # refresh after commit
+        user1 = UserApi(None).get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+        u2 = UserApi(None).get_one(u2id)
+        api = ContentApi(user1, show_archived=True)
+        api2 = ContentApi(u2, show_archived=True)
+
+        updated = api2.get_one(pcid, ContentType.Any, workspace)
+        eq_(u2id, updated.owner_id,
+            'the owner id should be {} (found {})'.format(u2id,
+                                                          updated.owner_id))
         eq_(True, updated.is_archived)
         eq_(ActionDescription.ARCHIVING, updated.revision_type)
 
         ####
 
-        updated2 = api.get_one(pcid, ContentType.Any, None)
+        updated2 = api.get_one(pcid, ContentType.Any, workspace)
         api.unarchive(updated)
         api.save(updated2)
         eq_(False, updated2.is_archived)
         eq_(ActionDescription.UNARCHIVING, updated2.revision_type)
         eq_(u1id, updated2.owner_id)
 
-
     def test_delete_undelete(self):
         uapi = UserApi(None)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user1 = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+        u1id = user1.user_id
 
-        user1 = uapi.create_user()
-        user1.email = 'this.is@user'
-        uapi.save(user1)
+        workspace = WorkspaceApi(user1).create_workspace('test workspace',
+                                                        save_now=True)
+        wid = workspace.workspace_id
 
         user2 = uapi.create_user()
         user2.email = 'this.is@another.user'
         uapi.save(user2)
 
-        api = ContentApi(user1, show_deleted=True) # show archived is used at the top end of the test
-        p = api.create(ContentType.File, None, None, 'this_is_a_page', True)
+        RoleApi(user1).create_one(user2, workspace,
+                                  UserRoleInWorkspace.CONTENT_MANAGER,
+                                  flush=True)
+
+        # show archived is used at the top end of the test
+        api = ContentApi(user1, show_deleted=True)
+        p = api.create(ContentType.File, workspace, None,
+                       'this_is_a_page', True)
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -350,26 +560,39 @@ class TestContentApi(TestStandard):
         transaction.commit()
 
         ####
+        user1 = UserApi(None).get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
 
-        content = api.get_one(pcid, ContentType.Any, None)
+        content = api.get_one(pcid, ContentType.Any, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2, show_deleted=True)
-        content2 = api2.get_one(pcid, ContentType.Any, None)
+        content2 = api2.get_one(pcid, ContentType.Any, workspace)
         api2.delete(content2)
         api2.save(content2)
         transaction.commit()
 
-        updated = api2.get_one(pcid, ContentType.Any, None)
-        eq_(u2id, updated.owner_id, 'the owner id should be {} (found {})'.format(u2id, updated.owner_id))
+        ####
+
+        user1 = UserApi(None).get_one(u1id)
+        workspace = WorkspaceApi(user1).get_one(wid)
+        # show archived is used at the top end of the test
+        api = ContentApi(user1, show_deleted=True)
+        u2 = UserApi(None).get_one(u2id)
+        api2 = ContentApi(u2, show_deleted=True)
+
+        updated = api2.get_one(pcid, ContentType.Any, workspace)
+        eq_(u2id, updated.owner_id,
+            'the owner id should be {} (found {})'.format(u2id,
+                                                          updated.owner_id))
         eq_(True, updated.is_deleted)
         eq_(ActionDescription.DELETION, updated.revision_type)
 
         ####
 
-        updated2 = api.get_one(pcid, ContentType.Any, None)
+        updated2 = api.get_one(pcid, ContentType.Any, workspace)
         api.undelete(updated)
         api.save(updated2)
         eq_(False, updated2.is_deleted)
@@ -381,14 +604,21 @@ class TestContentApi(TestStandard):
         # This test is based on a bug which does NOT return results found
         # at root of a workspace (eg a folder)
         uapi = UserApi(None)
-        user = uapi.create_user()
-        user.email = 'this.is@user'
-        uapi.save(user)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
 
-        api = ContentApi(user)
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
 
-        a = api.create(ContentType.Folder, None, None, 'this is randomized folder', True)
-        p = api.create(ContentType.Page, None, a, 'this is randomized label content', True)
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+
+        api = ContentApi(user)
+        a = api.create(ContentType.Folder, workspace, None,
+                       'this is randomized folder', True)
+        p = api.create(ContentType.Page, workspace, a,
+                       'this is randomized label content', True)
         p.description = 'This is some amazing test'
         api.save(p)
         original_id = p.content_id
@@ -402,16 +632,23 @@ class TestContentApi(TestStandard):
         # HACK - D.A. - 2015-03-09
         # This test is based on a bug which does NOT return results found
         # at root of a workspace (eg a folder)
+
         uapi = UserApi(None)
-        user = uapi.create_user()
-        user.email = 'this.is@user'
-        uapi.save(user)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
 
-        api = ContentApi(user)
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
 
-        a = api.create(ContentType.Folder, None, None, 'this is randomized folder', True)
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
 
-        p = api.create(ContentType.Page, None, a, 'this is dummy label content', True)
+        api = ContentApi(user)
+        a = api.create(ContentType.Folder, workspace, None,
+                       'this is randomized folder', True)
+        p = api.create(ContentType.Page, workspace, a,
+                       'this is dummy label content', True)
         p.description = 'This is some amazing test'
         api.save(p)
         original_id = p.content_id
@@ -421,22 +658,31 @@ class TestContentApi(TestStandard):
         item = res.all()[0]
         eq_(original_id, item.content_id)
 
-
     def test_search_in_label_or_description(self):
         # HACK - D.A. - 2015-03-09
         # This test is based on a bug which does NOT return results found
         # at root of a workspace (eg a folder)
+
         uapi = UserApi(None)
-        user = uapi.create_user()
-        user.email = 'this.is@user'
-        uapi.save(user)
+        groups = [GroupApi(None).get_one(Group.TIM_USER),
+                  GroupApi(None).get_one(Group.TIM_MANAGER),
+                  GroupApi(None).get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_user(email='this.is@user',
+                                groups=groups, save_now=True)
+
+        workspace = WorkspaceApi(user).create_workspace('test workspace',
+                                                        save_now=True)
+
 
         api = ContentApi(user)
 
-        a = api.create(ContentType.Folder, None, None, 'this is randomized folder', True)
-        p1 = api.create(ContentType.Page, None, a, 'this is dummy label content', True)
+        a = api.create(ContentType.Folder, workspace, None,
+                       'this is randomized folder', True)
+        p1 = api.create(ContentType.Page, workspace, a,
+                        'this is dummy label content', True)
         p1.description = 'This is some amazing test'
-        p2 = api.create(ContentType.Page, None, a, 'Hey ! Jon !', True)
+        p2 = api.create(ContentType.Page, workspace, a, 'Hey ! Jon !', True)
         p2.description = 'What\'s up ?'
         api.save(p1)
         api.save(p2)