[MIG] web_editor: migrate to new api

1 files changed, 25 insertions, 25 deletions

diff --git a/addons/website/tests/test_views.py b/addons/website/tests/test_views.py
index 9ab3e77c987..04b20d36e00 100644
--- a/addons/website/tests/test_views.py
+++ b/addons/website/tests/test_views.py
@@ -7,8 +7,11 @@ from lxml.html import builder as h
 
 from openerp.tests import common
 
+
 def attrs(**kwargs):
     return dict(('data-oe-%s' % key, str(value)) for key, value in kwargs.iteritems())
+
+
 class TestViewSaving(common.TransactionCase):
     def eq(self, a, b):
         self.assertEqual(a.tag, b.tag)
@@ -42,8 +45,7 @@ class TestViewSaving(common.TransactionCase):
         })
 
     def test_embedded_extraction(self):
-        fields = self.registry('ir.ui.view').extract_embedded_fields(
-            self.cr, self.uid, self.arch, context=None)
+        fields = self.env['ir.ui.view'].extract_embedded_fields(self.arch)
 
         expect = [
             h.SPAN("My Company", attrs(model='res.company', id=1, field='name', type='char')),
@@ -56,7 +58,7 @@ class TestViewSaving(common.TransactionCase):
         embedded = h.SPAN("+00 00 000 00 0 000", attrs(
             model='res.company', id=1, field='phone', type='char'))
 
-        self.registry('ir.ui.view').save_embedded_field(self.cr, self.uid, embedded)
+        self.env['ir.ui.view'].save_embedded_field(embedded)
 
         company = self.registry('res.company').browse(self.cr, self.uid, 1)
         self.assertEqual(company.phone, "+00 00 000 00 0 000")
@@ -66,37 +68,37 @@ class TestViewSaving(common.TransactionCase):
         e1 = h.SPAN("My Company", attrs(model='res.company', id=1, field='name'))
         e2 = h.SPAN("Leeroy Jenkins", attrs(model='res.company', id=1, field='name'))
 
-        View = self.registry('ir.ui.view')
+        View = self.env['ir.ui.view']
 
-        View.save_embedded_field(self.cr, self.uid, e1)
+        View.save_embedded_field(e1)
         # FIXME: more precise exception
         with self.assertRaises(Exception):
-            View.save_embedded_field(self.cr, self.uid, e2)
+            View.save_embedded_field(e2)
 
     def test_embedded_to_field_ref(self):
-        View = self.registry('ir.ui.view')
+        View = self.env['ir.ui.view']
         embedded = h.SPAN("My Company", attrs(expression="bob"))
         self.eq(
-            View.to_field_ref(self.cr, self.uid, embedded, context=None),
+            View.to_field_ref(embedded),
             h.SPAN({'t-field': 'bob'})
         )
 
     def test_to_field_ref_keep_attributes(self):
-        View = self.registry('ir.ui.view')
+        View = self.env['ir.ui.view']
 
         att = attrs(expression="bob", model="res.company", id=1, field="name")
         att['id'] = "whop"
         att['class'] = "foo bar"
         embedded = h.SPAN("My Company", att)
 
-        self.eq(View.to_field_ref(self.cr, self.uid, embedded, context=None),
+        self.eq(View.to_field_ref(embedded),
                 h.SPAN({'t-field': 'bob', 'class': 'foo bar', 'id': 'whop'}))
 
     def test_replace_arch(self):
         replacement = h.P("Wheee")
 
         result = self.registry('ir.ui.view').replace_arch_section(
-            self.cr, self.uid, self.view_id, None, replacement)
+            self.cr, self.uid, [self.view_id], None, replacement)
 
         self.eq(result, h.DIV("Wheee"))
 
@@ -104,7 +106,7 @@ class TestViewSaving(common.TransactionCase):
         replacement = h.DIV(h.P("Wheee"))
 
         result = self.registry('ir.ui.view').replace_arch_section(
-            self.cr, self.uid, self.view_id, None, replacement)
+            self.cr, self.uid, [self.view_id], None, replacement)
 
         self.eq(result, replacement)
 
@@ -112,7 +114,7 @@ class TestViewSaving(common.TransactionCase):
         replacement = h.H1("I am the greatest title alive!")
 
         result = self.registry('ir.ui.view').replace_arch_section(
-            self.cr, self.uid, self.view_id, '/div/div[1]/h3',
+            self.cr, self.uid, [self.view_id], '/div/div[1]/h3',
             replacement)
 
         self.eq(result, h.DIV(
@@ -134,12 +136,12 @@ class TestViewSaving(common.TransactionCase):
     def test_multiple_xpath_matches(self):
         with self.assertRaises(ValueError):
             self.registry('ir.ui.view').replace_arch_section(
-                self.cr, self.uid, self.view_id, '/div/div/h3',
+                self.cr, self.uid, [self.view_id], '/div/div/h3',
                 h.H6("Lol nope"))
 
     def test_save(self):
         Company = self.registry('res.company')
-        View = self.registry('ir.ui.view')
+        View = self.env['ir.ui.view']
 
         replacement = ET.tostring(h.DIV(
             h.H3("Column 2"),
@@ -149,14 +151,13 @@ class TestViewSaving(common.TransactionCase):
                 h.LI(h.SPAN("+12 3456789", attrs(model='res.company', id=1, field='phone', expression="edmund", type='char'))),
             )
         ), encoding='utf-8')
-        View.save(self.cr, self.uid, res_id=self.view_id, value=replacement,
-                  xpath='/div/div[2]')
+        View.browse(self.view_id).save(value=replacement, xpath='/div/div[2]')
 
         company = Company.browse(self.cr, self.uid, 1)
         self.assertEqual(company.name, "Acme Corporation")
         self.assertEqual(company.phone, "+12 3456789")
         self.eq(
-            ET.fromstring(View.browse(self.cr, self.uid, self.view_id).arch.encode('utf-8')),
+            ET.fromstring(View.browse(self.view_id).arch.encode('utf-8')),
             h.DIV(
                 h.DIV(
                     h.H3("Column 1"),
@@ -180,7 +181,7 @@ class TestViewSaving(common.TransactionCase):
             'arch':'<t><p><h1>hello world</h1></p></t>',
             'type':'qweb'
         })
-        view = self.registry('ir.ui.view').browse(self.cr, self.uid, view_id)
+        view = self.env['ir.ui.view'].browse(view_id)
         # script and style text nodes should not escaped client side
         replacement = '<script>1 && "hello & world"</script>'
         view.save(replacement, xpath='/t/p/h1')
@@ -212,26 +213,25 @@ class TestViewSaving(common.TransactionCase):
         node = html.tostring(h.SPAN(
             "Acme Corporation",
             attrs(model='res.company', id=company_id, field="name", expression='bob', type='char')))
-
-        self.registry('ir.ui.view').save(self.cr, self.uid, res_id=company_id,value=node)
+        View = self.env['ir.ui.view']
+        View.browse(company_id).save(value=node)
 
         company = Company.browse(self.cr, self.uid, company_id)
         self.assertEqual(company.name, "Acme Corporation")
 
 
     def test_field_tail(self):
-        View = self.registry('ir.ui.view')
+        View = self.env['ir.ui.view']
         replacement = ET.tostring(
             h.LI(h.SPAN("+12 3456789", attrs(
                         model='res.company', id=1, type='char',
                         field='phone', expression="edmund")),
                  "whop whop"
         ), encoding="utf-8")
-        View.save(self.cr, self.uid, res_id = self.view_id, value=replacement,
-                  xpath='/div/div[2]/ul/li[3]')
+        View.browse(self.view_id).save(value=replacement, xpath='/div/div[2]/ul/li[3]')
 
         self.eq(
-            ET.fromstring(View.browse(self.cr, self.uid, self.view_id).arch.encode('utf-8')),
+            ET.fromstring(View.browse(self.view_id).arch.encode('utf-8')),
             h.DIV(
                 h.DIV(
                     h.H3("Column 1"),