Ignore:
Timestamp:
Apr 20, 2012 10:04:56 AM (12 years ago)
Author:
potar
Message:

Merged tests branch

Location:
quintagroup.plonetabs/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.plonetabs/trunk

    • Property svn:mergeinfo

      •  

        old new  
        11/quintagroup.plonetabs/branches/plone4:3076-3243 
         2/quintagroup.plonetabs/branches/tests:3394-3436 

  • quintagroup.plonetabs/trunk/quintagroup/plonetabs/tests/selenium/zopeconfig.py

    r818 r3437  
    44    KSSSeleniumTestCase 
    55 
    6 from plone.app.kss.demo.zopeconfig import PloneSiteLayer, \ 
    7     LoggedInManagerLayer, LoggedInUserLayer, IResource 
     6from plone.app.kss.demo.zopeconfig import LoggedInManagerLayer, IResource 
    87 
    98 
    … …  
    1413# for your own programs, or otherwise you will need to change 
    1514# it later. The test suite creation interface will change in 
    16 # the next kss.demo versions. The plugin class (PloneDemos)  
    17 # will change in the next major KSS (and possibly Plone) version.  
     15# the next kss.demo versions. The plugin class (PloneDemos) 
     16# will change in the next major KSS (and possibly Plone) version. 
    1817# This configuration file will be kept up-to-date to these changes. 
    1918# 
    … …  
    2625    teardown = KSSSeleniumTestCase('uninstall-tabs.html') 
    2726 
     27 
    2828class PloneTabsSeleniumKssTests(object): 
    2929    implements(IResource) 
    … …  
    3333    selenium_tests = ( 
    3434        KSSSeleniumTestSuite( 
    35             tests = KSSSeleniumTestDirectory('selenium_tests/run_as_testmanager'), 
    36             layer = PortalTabsLayer, 
    37             component = 'quintagroup.plonetabs', 
    38             application = 'quintagroup.plonetabs', 
     35            tests=KSSSeleniumTestDirectory('selenium_tests/' +\ 
     36                                           'run_as_testmanager'), 
     37            layer=PortalTabsLayer, 
     38            component='quintagroup.plonetabs', 
     39            application='quintagroup.plonetabs', 
    3940        ), 
    4041    ) 
Note: See TracChangeset for help on using the changeset viewer.