Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[webtests/navigation] use the new connection api
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Tue, 03 Jun 2014 14:55:02 +0200
changeset 9848 ead7a288e08e
parent 9847 b23c90721351
child 9849 b18ef631e72c
[webtests/navigation] use the new connection api
web/test/unittest_views_navigation.py file | annotate | diff | comparison | revisions 
--- a/web/test/unittest_views_navigation.py	Tue Jun 03 14:45:32 2014 +0200
+++ b/web/test/unittest_views_navigation.py	Tue Jun 03 14:55:02 2014 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
@@ -17,7 +17,7 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """cubicweb.web.views.navigation unit tests"""
 
-from logilab.common.testlib import unittest_main, mock_object
+from logilab.common.testlib import unittest_main
 
 from cubicweb.devtools.testlib import CubicWebTC
 from cubicweb.web.views.navigation import (PageNavigation, SortedNavigation,
@@ -29,123 +29,94 @@
 class NavigationTC(CubicWebTC):
 
     def test_navigation_selection_whatever(self):
-        req = self.request()
-        rset = self.execute('Any X,N WHERE X name N')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        self.assertIsInstance(navcomp, PageNavigation)
-        req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        self.assertIsInstance(navcomp, PageNavigation)
-        req.set_search_state('normal')
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any X,N WHERE X name N')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            self.assertIsInstance(navcomp, PageNavigation)
+            req.set_search_state('W:X:Y:Z')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            self.assertIsInstance(navcomp, PageNavigation)
+            req.set_search_state('normal')
 
     def test_navigation_selection_ordered(self):
-        req = self.request()
-        rset = self.execute('Any X,N ORDERBY N LIMIT 40 WHERE X name N')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
-        self.assertIsInstance(navcomp, SortedNavigation)
-        req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
-        self.assertIsInstance(navcomp, SortedNavigation)
-        req.set_search_state('normal')
-        html = navcomp.render()
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any X,N ORDERBY N LIMIT 40 WHERE X name N')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
+            self.assertIsInstance(navcomp, SortedNavigation)
+            req.set_search_state('W:X:Y:Z')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
+            self.assertIsInstance(navcomp, SortedNavigation)
+            req.set_search_state('normal')
+            navcomp.render()
 
     def test_navigation_selection_large_rset(self):
-        req = self.request()
-        rset = self.execute('Any X,N LIMIT 120 WHERE X name N')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
-        self.assertIsInstance(navcomp, PageNavigationSelect)
-        rset = self.execute('Any X,N ORDERBY N LIMIT 120 WHERE X name N')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
-        self.assertIsInstance(navcomp, PageNavigationSelect)
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any X,N LIMIT 120 WHERE X name N')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
+            self.assertIsInstance(navcomp, PageNavigationSelect)
+            rset = req.execute('Any X,N ORDERBY N LIMIT 120 WHERE X name N')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset, page_size=20)
+            self.assertIsInstance(navcomp, PageNavigationSelect)
 
     def test_navigation_selection_not_enough_1(self):
-        req = self.request()
-        rset = self.execute('Any X,N LIMIT 10 WHERE X name N')
-        navcomp = self.vreg['components'].select_or_none('navigation', req, rset=rset)
-        self.assertEqual(navcomp, None)
-        req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg['components'].select_or_none('navigation', req, rset=rset)
-        self.assertEqual(navcomp, None)
-        req.set_search_state('normal')
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any X,N LIMIT 10 WHERE X name N')
+            navcomp = self.vreg['components'].select_or_none('navigation', req, rset=rset)
+            self.assertEqual(navcomp, None)
+            req.set_search_state('W:X:Y:Z')
+            navcomp = self.vreg['components'].select_or_none('navigation', req, rset=rset)
+            self.assertEqual(navcomp, None)
+            req.set_search_state('normal')
 
     def test_navigation_selection_not_enough_2(self):
-        req = self.request()
-        rset = self.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N WHERE RDEF relation_type RT, RT name N')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        self.assertIsInstance(navcomp, SortedNavigation)
-        req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        self.assertIsInstance(navcomp, SortedNavigation)
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N '
+                               'WHERE RDEF relation_type RT, RT name N')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            self.assertIsInstance(navcomp, SortedNavigation)
+            req.set_search_state('W:X:Y:Z')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            self.assertIsInstance(navcomp, SortedNavigation)
 
     def test_navigation_selection_wrong_boundary(self):
-        req = self.request()
-        rset = self.execute('Any X,N WHERE X name N')
-        req = self.request()
-        req.form['__start'] = 1000000
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        html = navcomp.render()
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any X,N WHERE X name N')
+            req.form['__start'] = 1000000
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            html = navcomp.render()
 
     def test_sorted_navigation_1(self):
-        req = self.request()
-        rset = self.execute('Any RDEF ORDERBY RT WHERE RDEF relation_type RT')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        html = navcomp.render()
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any RDEF ORDERBY RT WHERE RDEF relation_type RT')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            html = navcomp.render()
 
     def test_sorted_navigation_2(self):
-        req = self.request()
-        rset = self.execute('Any RDEF ORDERBY RDEF WHERE RDEF relation_type RT')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        html = navcomp.render()
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any RDEF ORDERBY RDEF WHERE RDEF relation_type RT')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            html = navcomp.render()
 
     def test_sorted_navigation_3(self):
-        req = self.request()
-        rset = self.execute('CWAttribute RDEF ORDERBY RDEF')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        html = navcomp.render()
+        with self.admin_access.web_request() as req:
+            rset = req.execute('CWAttribute RDEF ORDERBY RDEF')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            html = navcomp.render()
 
     def test_sorted_navigation_4(self):
-        req = self.request()
-        rset = self.execute('Any RDEF ORDERBY N WHERE RDEF relation_type RT, RT name N')
-        navcomp = self.vreg['components'].select('navigation', req, rset=rset)
-        html = navcomp.render()
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any RDEF ORDERBY N '
+                               'WHERE RDEF relation_type RT, RT name N')
+            navcomp = self.vreg['components'].select('navigation', req, rset=rset)
+            html = navcomp.render()
 
     def test_sorted_navigation_5(self):
-        req = self.request()
-        rset = self.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N WHERE RDEF relation_type RT, RT name N')
-        navcomp = self.vreg['components'].select('navigation', rset.req, rset=rset)
-        html = navcomp.render()
-
+        with self.admin_access.web_request() as req:
+            rset = req.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N '
+                               'WHERE RDEF relation_type RT, RT name N')
+            navcomp = self.vreg['components'].select('navigation', rset.req, rset=rset)
+            html = navcomp.render()
 
-# XXX deactivate, contextual component has been removed
-# class ContentNavigationTC(CubicWebTC):
-    # def test_component_context(self):
-    #     view = mock_object(is_primary=lambda x: True)
-    #     rset = self.execute('CWUser X LIMIT 1')
-    #     req = self.request()
-    #     objs = self.vreg['ctxcomponents'].poss_visible_objects(
-    #         req, rset=rset, view=view, context='navtop')
-    #     # breadcrumbs should be in headers by default
-    #     clsids = set(obj.id for obj in objs)
-    #     self.assertIn('breadcrumbs', clsids)
-    #     objs = self.vreg['ctxcomponents'].poss_visible_objects(
-    #         req, rset=rset, view=view, context='navbottom')
-    #     # breadcrumbs should _NOT_ be in footers by default
-    #     clsids = set(obj.id for obj in objs)
-    #     self.assertNotIn('breadcrumbs', clsids)
-    #     self.execute('INSERT CWProperty P: P pkey "ctxcomponents.breadcrumbs.context", '
-    #                  'P value "navbottom"')
-    #     # breadcrumbs should now be in footers
-    #     req.cnx.commit()
-    #     objs = self.vreg['ctxcomponents'].poss_visible_objects(
-    #         req, rset=rset, view=view, context='navbottom')
-
-    #     clsids = [obj.id for obj in objs]
-    #     self.assertIn('breadcrumbs', clsids)
-    #     objs = self.vreg['ctxcomponents'].poss_visible_objects(
-    #         req, rset=rset, view=view, context='navtop')
-
-    #     clsids = [obj.id for obj in objs]
-    #     self.assertNotIn('breadcrumbs', clsids)
 
 
 if __name__ == '__main__':
cubicweb