#185 Unit test for workspaces ; moved ContentController to content.py ; replaced double quotes with single quotes

tracim/tracim/controllers/content.py

@@ -6,13 +6,13 @@ import traceback
 
 from cgi import FieldStorage
 import tg
-from tg import tmpl_context
+from tg import tmpl_context, require, predicates
 from tg.i18n import ugettext as _
 from tg.predicates import not_anonymous
 from sqlalchemy.orm.exc import NoResultFound
 from tg import abort
 
-from tracim.controllers import TIMRestController
+from tracim.controllers import TIMRestController, StandardController
 from tracim.controllers import TIMRestPathContextSetup
 from tracim.controllers import TIMRestControllerWithBreadcrumb
 from tracim.controllers import TIMWorkspaceContentRestController
@@ -1074,3 +1074,32 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
             msg = _('{} not un-deleted: {}').format(self._item_type_label, str(e))
             tg.flash(msg, CST.STATUS_ERROR)
             tg.redirect(back_url)
+
+
+class ContentController(StandardController):
+
+    '''
+    Class of controllers used for example in home to mark read the unread 
+    contents via mark_all_read()
+    '''
+
+    @classmethod
+    def current_item_id_key_in_context(cls) -> str:
+        return''
+
+    @tg.expose()
+    def index(self):
+        return dict()
+
+    @require(predicates.not_anonymous())
+    @tg.expose()
+    def mark_all_read(self):
+        '''
+        Mark as read all the content that hasn't been read
+        redirects the user to "/home"
+        '''
+        user = tg.tmpl_context.current_user
+        content_api = ContentApi(user)
+        content_api.mark_read__all()
+
+        tg.redirect("/home")

tracim/tracim/controllers/read.py

@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-import tg
-from tg import require, predicates
-from tracim.controllers import StandardController
-from tracim.lib.content import ContentApi
-from tracim.model.data import ContentType
-
-
-class ContentController(StandardController):
-
-    @classmethod
-    def current_item_id_key_in_context(cls) -> str:
-        return''
-
-    @tg.expose()
-    def index(self):
-        return dict()
-
-    @require(predicates.not_anonymous())
-    @tg.expose()
-    def mark_all_read(self):
-        user = tg.tmpl_context.current_user
-        content_api = ContentApi(user)
-        content_api.mark_read__all()
-
-        tg.redirect("/home")
-
-

tracim/tracim/controllers/root.py

@@ -12,7 +12,7 @@ from tg import url
 
 from tg.i18n import ugettext as _
 from tracim.controllers.api import APIController
-from tracim.controllers.read import ContentController
+from tracim.controllers.content import ContentController
 
 from tracim.lib import CST
 from tracim.lib.base import logger

tracim/tracim/controllers/workspace.py

@@ -9,7 +9,6 @@ from tracim.config.app_cfg import CFG
 
 from tracim.controllers import TIMRestController
 from tracim.controllers.content import UserWorkspaceFolderRestController
-from tracim.controllers.read import ContentController
 
 from tracim.lib.helpers import convert_id_into_instances
 from tracim.lib.content import ContentApi

tracim/tracim/tests/library/test_content_api.py

@@ -348,6 +348,80 @@ class TestContentApi(BaseTest, TestStandard):
         eq_(ActionDescription.COMMENT, c.revision_type)
 
 
+    def test_mark_read__workspace(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)]
+        user_a = uapi.create_user(email='this.is@user',
+                                  groups=groups, save_now=True)
+        user_b = uapi.create_user(email='this.is@another.user',
+                                  groups=groups, save_now=True)
+
+        wapi = WorkspaceApi(user_a)
+        workspace1 = wapi.create_workspace(
+            'test workspace n°1',
+            save_now=True)
+        workspace2 = wapi.create_workspace(
+            'test workspace n°2',
+            save_now=True)
+
+        role_api1 = RoleApi(user_a)
+        role_api1.create_one(user_b, workspace1, UserRoleInWorkspace.READER,
+                            False)
+
+        role_api2 = RoleApi(user_a)
+        role_api2.create_one(user_b, workspace2, UserRoleInWorkspace.READER,
+                             False)
+
+        cont_api_a = ContentApi(user_a)
+        cont_api_b = ContentApi(user_b)
+
+
+        # Creates page_1 & page_2 in workspace 1
+        #     and page_3 & page_4 in workspace 2
+        page_1 = cont_api_a.create(ContentType.Page, workspace1, None,
+                                   'this is a page', do_save=True)
+        page_2 = cont_api_a.create(ContentType.Page, workspace1, None,
+                                   'this is page1', do_save=True)
+        page_3 = cont_api_a.create(ContentType.Thread, workspace2, None,
+                                   'this is page2', do_save=True)
+        page_4 = cont_api_a.create(ContentType.File, workspace2, None,
+                                   'this is page3', do_save=True)
+
+        for rev in page_1.revisions:
+            eq_(user_b not in rev.read_by.keys(), True)
+        for rev in page_2.revisions:
+            eq_(user_b not in rev.read_by.keys(), True)
+        for rev in page_3.revisions:
+            eq_(user_b not in rev.read_by.keys(), True)
+        for rev in page_4.revisions:
+            eq_(user_b not in rev.read_by.keys(), True)
+
+        # Set as read the workspace n°1
+        cont_api_b.mark_read__workspace(workspace=workspace1)
+
+        for rev in page_1.revisions:
+            eq_(user_b in rev.read_by.keys(), True)
+        for rev in page_2.revisions:
+            eq_(user_b in rev.read_by.keys(), True)
+        for rev in page_3.revisions:
+            eq_(user_b not in rev.read_by.keys(), True)
+        for rev in page_4.revisions:
+            eq_(user_b not in rev.read_by.keys(), True)
+
+        # Set as read the workspace n°2
+        cont_api_b.mark_read__workspace(workspace=workspace2)
+
+        for rev in page_1.revisions:
+            eq_(user_b in rev.read_by.keys(), True)
+        for rev in page_2.revisions:
+            eq_(user_b in rev.read_by.keys(), True)
+        for rev in page_3.revisions:
+            eq_(user_b in rev.read_by.keys(), True)
+        for rev in page_4.revisions:
+            eq_(user_b in rev.read_by.keys(), True)
+
     def test_mark_read(self):
         uapi = UserApi(None)
         groups = [GroupApi(None).get_one(Group.TIM_USER),
@@ -368,7 +442,8 @@ class TestContentApi(BaseTest, TestStandard):
         cont_api_a = ContentApi(user_a)
         cont_api_b = ContentApi(user_b)
 
-        page_1 = cont_api_a.create(ContentType.Page, workspace, None, "this is a page", do_save=True)
+        page_1 = cont_api_a.create(ContentType.Page, workspace, None,
+                                   'this is a page', do_save=True)
 
         for rev in page_1.revisions:
             eq_(user_b not in rev.read_by.keys(), True)
@@ -399,9 +474,9 @@ class TestContentApi(BaseTest, TestStandard):
         cont_api_a = ContentApi(user_a)
         cont_api_b = ContentApi(user_b)
 
-        page_2 = cont_api_a.create(ContentType.Page, workspace, None, "this is page1", do_save=True)
-        page_3 = cont_api_a.create(ContentType.Thread, workspace, None, "this is page2", do_save=True)
-        page_4 = cont_api_a.create(ContentType.File, workspace, None, "this is page3", do_save=True)
+        page_2 = cont_api_a.create(ContentType.Page, workspace, None, 'this is page1', do_save=True)
+        page_3 = cont_api_a.create(ContentType.Thread, workspace, None, 'this is page2', do_save=True)
+        page_4 = cont_api_a.create(ContentType.File, workspace, None, 'this is page3', do_save=True)
 
         for rev in page_2.revisions:
             eq_(user_b not in rev.read_by.keys(), True)