entrouvert
/
collective.contact.core
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix parent address and add robot tests

This commit is contained in:
Cédric Messiant 2013-10-09 16:44:46 +02:00
parent 41ca87aa99
commit f3f35874e9
2 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/collective/contact/core/browser/contactable.py
View File

@ -82,8 +82,9 @@ class Contactable(grok.Adapter):
def get_parent_address(self):
contactables = self._get_contactables()
if self.context.is_created and self.context in contactables:
# we don't want self.context address if the object is already created
url = self.context.REQUEST.URL
# we don't want self.context address if the object is already created
if '/++add++' not in url and '/@@add' not in url:
contactables.remove(self.context)
address = self._get_address(contactables)

64
src/collective/contact/core/tests/robot/test_contacts.robot
View File

@ -9,6 +9,12 @@ Test Setup Open SauceLabs test browser
Test Teardown Run keywords Report test status Close all browsers
*** Keywords ***
Add new
[Arguments] ${name}
Open Add New Menu
Click link css=#plone-contentmenu-factories a#${name}
Wait Until Page Contains Element css=#form-widgets-IBasic-title
Go to directory
Go to ${PLONE_URL}/mydirectory
@ -24,23 +30,24 @@ Overlay is opened
*** Test cases ***
Directory is available
Log in as site owner
Click link css=#portaltab-mydirectory a
Element should contain css=#content h1 Military directory
Create a new organization
Log in as site owner
Go to directory
Open Add New Menu
Click link css=#plone-contentmenu-factories a#organization
Wait Until Page Contains Element css=#form-widgets-IBasic-title
Add new organization
Input Text css=#form-widgets-IBasic-title Squadron five
Click Button Save
Page should contain Squadron five
Go to directory
Element should contain organizations Squadron five
Can create new contact from organization
Log in as site owner
Go to ${PLONE_URL}/mydirectory/armeedeterre/corpsa/divisionalpha
@ -55,6 +62,7 @@ Can create new contact from organization
Click element css=.ac_results li:nth-child(1)
Click button Add
Can create new contact from position
Log in as site owner
Go to ${PLONE_URL}/mydirectory/armeedeterre/corpsa/divisionalpha/regimenth/brigadelh/sergent_lh
@ -69,3 +77,53 @@ Can create new contact from position
Wait Until Page Contains Element css=.ac_results
Click element css=.ac_results li:nth-child(1)
Click button Add
Show parent address if it exists in creation
Log in as site owner
Go to ${PLONE_URL}/mydirectory/armeedeterre/corpsa
Add new organization
Click link Address
Checkbox Should Be Selected form-widgets-IContactDetails-use_parent_address-0
Element should contain address rue Philibert Lucot
Element should contain address Orléans
Element should contain address France
#Page should not contain element formfield-form-widgets-IContactDetails-number
#Page should not contain element formfield-form-widgets-IContactDetails-street
Show parent address if it exists in edition
Log in as site owner
Go to ${PLONE_URL}/mydirectory/armeedeterre/corpsa/divisionalpha/capitaine_alpha
Click Edit In Edit Bar
Click link Address
Checkbox Should Be Selected form-widgets-IContactDetails-use_parent_address-0
Element should contain address rue Philibert Lucot
Element should contain address Orléans
Element should contain address France
#Page should not contain element formfield-form-widgets-IContactDetails-number
#Page should not contain element formfield-form-widgets-IContactDetails-street
Don't show use parent address checkbox if no parent address in creation
Log in as site owner
Go to ${PLONE_URL}/mydirectory/armeedeterre/corpsb
Add new position
Click link Address
Page should contain element formfield-form-widgets-IContactDetails-number
Page should contain element formfield-form-widgets-IContactDetails-street
Page should contain element formfield-form-widgets-IContactDetails-city
Page should contain element formfield-form-widgets-IContactDetails-country
#Page should not contain element form-widgets-IContactDetails-use_parent_address-0
Don't show use parent address checkbox if no parent address in edition
Log in as site owner
Go to ${PLONE_URL}/mydirectory/armeedeterre/corpsb
Click Edit In Edit Bar
Click link Address
Page should contain element formfield-form-widgets-IContactDetails-number
Page should contain element formfield-form-widgets-IContactDetails-street
Page should contain element formfield-form-widgets-IContactDetails-city
Page should contain element formfield-form-widgets-IContactDetails-country
#Page should not contain element form-widgets-IContactDetails-use_parent_address-0