diff options
| author | tsabi <csaba.toth@i3rendszerhaz.hu> | 2012-11-29 12:41:32 +0100 |
|---|---|---|
| committer | tsabi <csaba.toth@i3rendszerhaz.hu> | 2012-11-29 12:41:32 +0100 |
| commit | 76ca47d4fd0bd178fd7dfd2ea5b534d4e878a6f5 (patch) | |
| tree | 32339ef0c6869f21bb757f8ab6bce7faf8028c6b /addons/web/tests/test_menu.py | |
| parent | e2435d4f004a20636aef8a8ee2cc03c8cfc3e78c (diff) | |
| parent | c7772fdd82105ddf60cbec2517753bf927ce19ed (diff) | |
[MERGE] trunk
bzr revid: csaba.toth@i3rendszerhaz.hu-20121129114132-gfe3sn1p5t0mzofm
Diffstat (limited to 'addons/web/tests/test_menu.py')
| -rw-r--r-- | addons/web/tests/test_menu.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/addons/web/tests/test_menu.py b/addons/web/tests/test_menu.py index c5e1b948b67..75d1d009408 100644 --- a/addons/web/tests/test_menu.py +++ b/addons/web/tests/test_menu.py @@ -4,7 +4,6 @@ import mock import unittest2 from ..controllers import main -from ..session import OpenERPSession class Placeholder(object): def __init__(self, **kwargs): @@ -40,11 +39,11 @@ class LoadTest(unittest2.TestCase): root = self.menu.do_load(self.request) self.MockMenus.search.assert_called_with( - [], 0, False, False, self.request.session.eval_context()) + [], 0, False, False, self.request.context) self.MockMenus.read.assert_called_with( [], ['name', 'sequence', 'parent_id', 'action', 'needaction_enabled', 'needaction_counter'], - self.request.session.eval_context()) + self.request.context) self.assertListEqual( root['children'], @@ -63,7 +62,7 @@ class LoadTest(unittest2.TestCase): self.MockMenus.read.assert_called_with( [1, 2, 3], ['name', 'sequence', 'parent_id', 'action', 'needaction_enabled', 'needaction_counter'], - self.request.session.eval_context()) + self.request.context) self.assertEqual( root['children'], |