- test fixed

Author: midnightercz

README.md

@@ -13,10 +13,10 @@ With this knowledge you can revert any changes made on selected model. Althrough
 
 Example: how to use django-logging-middleware
 -------------------------------------------------------------
-simplest usage of logging is put something like this into your api
+simplest usage of logging middleware is put something like this into your api
 ```python
     myobj = MyModel.objects.all()[0]
-    with logging.Log(request, {"myobj": myobj}):
+    with mlogging.Log(request, {"myobj": myobj}):
         myobj.someattribute = "another value"
 ```
 
@@ -27,7 +27,7 @@ or manually:
     old_obj = {"someattribute": myobj.someattribute, "id": myobj.someattribute}
     myobj.someattribute = "another value"
     new_obj = {"someattribute": myobj.someattribute, "id": myobj.someattribute}
-    logging.add_changeset_entry(request, "my_action,
+    mlogging.add_changeset_entry(request, "my_action,
                                 [ContentType.objects.get_for_model(MyModel)],
                                 {"myobj": old_obj},
                                 {"my_model": new_obj})
@@ -56,6 +56,6 @@ objects to prevent store excluded fields into db. By default context manager Log
 store all fields of objects
 
 ```python
-    with logging.Log(request, {"myobj": myobj},
+    with mlogging.Log(request, {"myobj": myobj},
                      exclude_fields={"myobj": ["not_this field"]}):
 ```

mlogging/middle.py renamed to mlogging/middleware.py

@@ -1,10 +1,13 @@
 import sys
 
 from common.models import Arch
-import middle
-from middle import add_changeset_entry
+import middleware
+from middleware import add_changeset_entry
 from models import Logging, ChangeSet, ChangeSetEntry
 
+from django.core import management
+from django.core.management import sql, color
+from django.db import connection, models
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.core.handlers.base import BaseHandler
@@ -35,23 +38,48 @@ def user_login(test_case, name, pswd, **request):
 
 
 class LoggingTest(TestCase):
+    def make_model(self):
+        self.model = type('DummyModel', (models.Model,), {
+                          'dummy_attr': models.CharField(max_length=255),
+                          "__module__": "mlogging.tests"})
+
+        self._style = color.no_style()
+
+        self._cursor = connection.cursor()
+        statements, pending = connection.creation.sql_create_model(self.model,
+                                                                   self._style)
+        for statement in statements:
+            self._cursor.execute(statement)
+        ContentType.objects.get_for_model(self.model).save()
+
     def setUp(self):
         test_user = User.objects.create_user("test_user", "[email protected]")
         test_user.set_password("test_pass")
         test_user.save()
         self.user = authenticate(username="test_user", password="test_pass")
         self.rf = RequestMock()
-        arch = Arch.objects.create(name="dummy arch")
-        arch.save()
-        self.l_instance = middle.LoggingMiddleware()
+        self.make_model()
+        #self.model.save(self.model)
+        dm = self.model.objects.create(dummy_attr="some value")
+
+        dm.save()
+
+        self.l_instance = middleware.LoggingMiddleware()
+
+    def tearDown(self):
+        statements = connection.creation.sql_destroy_model(self.model, (),
+                                                           self._style)
+        for statement in statements:
+            self._cursor.execute(statement)
 
-    def test_middle(self):
+    def test_middle_x(self):
         request = self.rf.request(REQUEST_METHOD='POST')
         login(request, self.user)
         self.l_instance.process_request(request)
-        arch = Arch.objects.all()[0]
-        with middle.Log(request, {"arch": arch}):
-            arch.name = "silly arch"
+        dummy_o = self.model.objects.all()[0]
+        #print >> sys.stderr, dummy_o
+        with middleware.Log(request, {"dummy_o": dummy_o}):
+            dummy_o.dummy_attr = "silly value"
 
         response = lambda x: x
         response.status_code = 200
@@ -69,20 +97,20 @@ def test_middle(self):
         self.assertEqual(entries[0].changeset, changesets[0])
         self.assertEqual(changesets[0].user, self.user)
         self.assertEqual(entries[0].model,
-                         ContentType.objects.get_for_model(Arch))
+                         ContentType.objects.get_for_model(self.model))
 
     def test_middle_manual(self):
         request = self.rf.request(REQUEST_METHOD='POST')
         login(request, self.user)
         self.l_instance.process_request(request)
-        arch = Arch.objects.all()[0]
+        dummy_o = self.model.objects.all()[0]
 
-        old_arch = {"id": arch.id, "name": arch.name}
-        arch.name = "silly arch"
-        new_arch = {"id": arch.id, "name": arch.name}
+        old_dummy = {"id": dummy_o.id, "dummy_attr": dummy_o.dummy_attr}
+        dummy_o.dummy_attr = "new dummy value"
+        new_dummy = {"id": dummy_o.id, "dummy_attr": dummy_o.dummy_attr}
         add_changeset_entry(request, "test_middle_manual",
-                            [ContentType.objects.get_for_model(Arch)],
-                            {"arch": old_arch}, {"arch": new_arch})
+                            [ContentType.objects.get_for_model(dummy_o._meta.model)],
+                            {"dummy_o": old_dummy}, {"dummy_o": new_dummy})
 
         response = lambda x: x
         response.status_code = 200
@@ -100,4 +128,4 @@ def test_middle_manual(self):
         self.assertEqual(entries[0].changeset, changesets[0])
         self.assertEqual(changesets[0].user, self.user)
         self.assertEqual(entries[0].model,
-                         ContentType.objects.get_for_model(Arch))
+                         ContentType.objects.get_for_model(self.model))