# HG changeset patch
# User raph
# Date 1280844985 -7200
# Node ID 31eb61fe6cf460ac56ce00d8d91f2037708e6556
# Parent  55f97508300b343e3bfb189befd30d11db33a4f2
fix tests for mysql

diff -r 55f97508300b -r 31eb61fe6cf4 src/cm/fixtures/test_comments.json
--- a/src/cm/fixtures/test_comments.json	Wed Jul 28 17:27:37 2010 +0200
+++ b/src/cm/fixtures/test_comments.json	Tue Aug 03 16:16:25 2010 +0200
@@ -5,7 +5,7 @@
       "created": "2009-02-13 03:27:05", 
       "key": "keyText", 
       "modified": "2009-02-13 03:27:05",
-      "last_text_version": 1,
+      "last_text_version": null,
       "state":"approved",
       "title": "1top level title"      
     }, 
diff -r 55f97508300b -r 31eb61fe6cf4 src/cm/fixtures/test_content.yaml
--- a/src/cm/fixtures/test_content.yaml	Wed Jul 28 17:27:37 2010 +0200
+++ b/src/cm/fixtures/test_content.yaml	Tue Aug 03 16:16:25 2010 +0200
@@ -109,6 +109,18 @@
 ############### texts ############### 
 
 # text 1
+- model : cm.text
+  pk: 1
+  fields:
+    created: "2009-02-13 04:01:12"
+    modified: "2009-02-13 04:01:12"
+    last_text_version: null
+    title: 'title 1'
+    state: "approved"
+    key: "text_key_1" 
+    adminkey: "text_adminkey_1" 
+    user: 1
+    
 - model : cm.textversion
   pk: 1
   fields:
@@ -133,21 +145,22 @@
     text: 1
     mod_posteriori: True
     key: "textversion_key_0" 
-    adminkey: "tv_adminkey_0" 
-    
+    adminkey: "tv_adminkey_0"    
+
+# text 2
+
 - model : cm.text
-  pk: 1
+  pk: 2
   fields:
     created: "2009-02-13 04:01:12"
     modified: "2009-02-13 04:01:12"
-    last_text_version: 1
-    title: 'title 1'
+    last_text_version: null
+    title: 'title 2'
     state: "approved"
-    key: "text_key_1" 
-    adminkey: "text_adminkey_1" 
-    user: 1
+    key: "text_key_2" 
+    adminkey: "text_adminkey_2"
+    user: 1    
 
-# text 2
 - model : cm.textversion
   pk: 2
   fields:
@@ -160,20 +173,22 @@
     mod_posteriori: False
     key: "textversion_key_2" 
     adminkey: "tv_adminkey_2" 
+ 
+  
+# text 3
 
 - model : cm.text
-  pk: 2
+  pk: 3
   fields:
     created: "2009-02-13 04:01:12"
     modified: "2009-02-13 04:01:12"
-    last_text_version: 2
-    title: 'title 2'
+    last_text_version: null
+    title: 'title 3'
     state: "approved"
-    key: "text_key_2" 
-    adminkey: "text_adminkey_2"
-    user: 1     
-  
-# text 3
+    key: "text_key_3" 
+    adminkey: "text_adminkey_3"
+    user: 2   
+
 - model : cm.textversion
   pk: 3
   fields:
@@ -358,22 +373,22 @@
     long text'
     text: 3
     key: "textversion_key_3" 
-    adminkey: "tv_adminkey_3" 
-    
+    adminkey: "tv_adminkey_3"  
 
+# text 4
+    
 - model : cm.text
-  pk: 3
+  pk: 4
   fields:
     created: "2009-02-13 04:01:12"
     modified: "2009-02-13 04:01:12"
-    last_text_version: 3
-    title: 'title 3'
+    last_text_version: null
+    title: 'title 4, public text'
     state: "approved"
-    key: "text_key_3" 
-    adminkey: "text_adminkey_3"
-    user: 2    
+    key: "text_key_4" 
+    adminkey: "text_adminkey_4" 
+    user: 1
 
-# text 4
 - model : cm.textversion
   pk: 4
   fields:
@@ -386,20 +401,21 @@
     mod_posteriori: True
     key: "textversion_key_4" 
     adminkey: "tv_adminkey_4" 
+
+# text 5
     
 - model : cm.text
-  pk: 4
+  pk: 5
   fields:
     created: "2009-02-13 04:01:12"
     modified: "2009-02-13 04:01:12"
-    last_text_version: 4
-    title: 'title 4, public text'
+    last_text_version: null
+    title: 'title 5, public text'
     state: "approved"
-    key: "text_key_4" 
-    adminkey: "text_adminkey_4" 
-    user: 1
+    key: "text_key_5" 
+    adminkey: "text_adminkey_5" 
+    user: 1    
 
-# text 5
 - model : cm.textversion
   pk: 5
   fields:
@@ -412,19 +428,7 @@
     mod_posteriori: True
     key: "textversion_key_5" 
     adminkey: "tv_adminkey_5" 
-    
-- model : cm.text
-  pk: 5
-  fields:
-    created: "2009-02-13 04:01:12"
-    modified: "2009-02-13 04:01:12"
-    last_text_version: 5
-    title: 'title 5, public text'
-    state: "approved"
-    key: "text_key_5" 
-    adminkey: "text_adminkey_5" 
-    user: 1    
-    
+
 ############### userrole ############### 
 
 # user 1 is global Manager
diff -r 55f97508300b -r 31eb61fe6cf4 src/cm/tests/test_activity.py
--- a/src/cm/tests/test_activity.py	Wed Jul 28 17:27:37 2010 +0200
+++ b/src/cm/tests/test_activity.py	Tue Aug 03 16:16:25 2010 +0200
@@ -7,7 +7,7 @@
 from cm.security import *
 
 class ActivityTest(TestCase):
-    fixtures = ['test_content']
+    fixtures = ['roles_generic','test_content']
     
     def test_process_activities(self):
         text = Text.objects.get(id=1)