Add 'properties' to ContentRevision clone columns and test

tracim/tracim/model/data.py

@@ -515,7 +515,7 @@ class ContentRevisionRO(DeclarativeBase):
 
     """ List of column copied when make a new revision from another """
     _cloned_columns = (
-        'content_id', 'owner_id', 'label', 'description', 'file_name', 'file_mimetype',
+        'content_id', 'owner_id', 'label', 'description', 'file_name', 'file_mimetype', 'properties',
         'file_content', 'type', 'status', 'created', 'updated', 'is_deleted', 'is_archived',
         'revision_type', 'workspace_id', 'workspace', 'parent_id', 'parent', 'node', 'owner'
     )

tracim/tracim/tests/models/test_content_revision.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+from collections import OrderedDict
+
+from nose.tools import eq_
+from sqlalchemy import inspect
+
+from tracim.model import DBSession, ContentRevisionRO
+from tracim.model import User
+from tracim.model.data import ContentType
+from tracim.tests import TestStandard, BaseTest
+
+
+class TestContentRevision(BaseTest, TestStandard):
+
+    def test_new_revision(self):
+        admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
+        workspace = self._create_workspace(name='workspace_1')
+        folder = self._create_content(name='folder_1', workspace=workspace, type=ContentType.Folder)
+        page = self._create_content(
+            workspace=workspace,
+            parent=folder,
+            name='file_1',
+            description='content of file_1',
+            type=ContentType.Page,
+            owner=admin
+        )
+
+        DBSession.flush()
+
+        # Model create a new instance with list of column
+        new_revision_by_model = ContentRevisionRO.new_from(page.revision)
+        # Test create a new instance from dynamic listing of model columns mapping
+        new_revision_by_test = self._new_from(page.revision)
+
+        new_revision_by_model_dict = self._get_dict_representation(new_revision_by_model)
+        new_revision_by_test_dict = self._get_dict_representation(new_revision_by_test)
+
+        # They must be identical
+        eq_(new_revision_by_model_dict, new_revision_by_test_dict)
+
+    def _new_from(self, revision):
+        excluded_columns = ('revision_id', '_sa_instance_state')
+        revision_columns = [attr.key for attr in inspect(revision).attrs if not attr.key in excluded_columns]
+        new_revision = ContentRevisionRO()
+
+        for revision_column in revision_columns:
+            old_revision_column_value = getattr(revision, revision_column)
+            setattr(new_revision, revision_column, old_revision_column_value)
+
+        return new_revision
+
+    def _get_dict_representation(self, revision):
+        keys_to_remove = ('updated', '_sa_instance_state')
+        dict_repr = OrderedDict(sorted(revision.__dict__.items()))
+        for key_to_remove in keys_to_remove:
+            dict_repr.pop(key_to_remove, None)
+        return dict_repr