Conjunto de mudanças 6468 no repositório publico

Timestamp:

09/06/2012 00:29:04 (9 anos atrás)

Autor:

mazza

Mensagem:

testes: retirado Splinter

plone.testing.z2.Browser + lxml.html sao suficientes

Localização:

PortalInterlegis/produtos/il.portalinterlegis

Arquivos:

• setup.py (modificado) (1 diff)
• src/il/portalinterlegis/tests/splinterbrowser.py (removido)
• src/il/portalinterlegis/tests/tests.py (modificado) (6 diffs)

PortalInterlegis/produtos/il.portalinterlegis/setup.py

@@ -33 +33 @@
           # -*- Extra requirements: -*-
       ],
-      extras_require={'test': ['plone.app.testing', 'splinter']},
+      extras_require={'test': ['plone.app.testing']},
       entry_points="""
       # -*- Entry points: -*-

PortalInterlegis/produtos/il.portalinterlegis/src/il/portalinterlegis/tests/tests.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+import lxml.html
 import unittest2 as unittest
 from Products.CMFCore.utils import getToolByName
+from plone.testing.z2 import Browser
 
 from fixtures import IL_PORTALINTERLEGIS_INTEGRATION_TESTING
@@ -8 +10 @@
      IComunidadeLegislativa, IInformacao, ICapacitacao, ITecnologia, IComunicacao, \
      ISimpleBox
-from splinterbrowser import SplinterBrowser
-from plone.testing.z2 import Browser
+
 
 class TestIntegracao(unittest.TestCase):
@@ -19 +20 @@
         self.qi_tool = getToolByName(self.portal, 'portal_quickinstaller')
     
+    def browser(self, url=None):
+        browser = Browser(self.app)
+        browser.handleErrors = False
+        if url:
+            browser.open(url)
+        return browser 
+
+    def dom(self, browser):
+        return lxml.html.fromstring(browser.contents)
+        
     def test_product_is_installed(self):
         """ Validate that our products GS profile has been run and the product 
@@ -29 +40 @@
 
     def test_tabs_na_home(self):
-        browser = SplinterBrowser(self.app)
-        browser.visit(self.portal.absolute_url())
-        # simplificar isso depois que o pull request
-        # https://github.com/cobrateam/splinter/pull/152
-        # for aceito no Splinter
+        browser = self.browser(self.portal.absolute_url())
+        dom = self.dom(browser)
         self.assertEqual([u'O Interlegis',
                           u'Comunidade Legislativa',
@@ -40 +48 @@
                           u'Tecnologia',
                           u'Comunicação',],
-            [li.find_by_tag('a').first.text
-                for li in browser.find_by_css('#portal-globalnav li')])
+            [li.text_content() for li in dom.cssselect('#portal-globalnav li')])
 
     def test_homes_marcadas_e_com_layout_home(self):
@@ -53 +60 @@
             self.assertTrue(marker.providedBy(obj))
             self.assertEqual('home', obj.getLayout())
-
-    def browser(self, url=None):
-        browser = Browser(self.app)
-        browser.handleErrors = False
-        if url:
-            browser.open(url)
-        return browser 
 
     def test_box_content_is_empty_before_visiting_form(self):