Skip to content

Commit

Permalink
Merge pull request #27 from ploneintranet/unicode-tests
Browse files Browse the repository at this point in the history
Unicode tests
  • Loading branch information
mattss committed Jul 14, 2014
2 parents 85d0a3d + 20b311f commit f44c75b
Show file tree
Hide file tree
Showing 9 changed files with 369 additions and 263 deletions.
4 changes: 2 additions & 2 deletions src/ploneintranet/workspace/browser/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,11 @@ def handleApply(self, action):
workspace=self.context.title,
token_url=token_url)

message = "{header}\n\n{optional}{footer}".format(
message = u"{header}\n\n{optional}{footer}".format(
header=msg_header,
optional=given_message,
footer=msg_footer,
)
)

subject = 'You are invited to join "%s"' % self.context.title

Expand Down
29 changes: 18 additions & 11 deletions src/ploneintranet/workspace/tests/test_content_type.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
# coding=utf-8
from ploneintranet.workspace.tests.base import BaseTestCase
from plone import api
from plone.api.exc import InvalidParameterError
from collective.workspace.interfaces import IHasWorkspace, IWorkspace


class TestContentTypes(BaseTestCase):

def create_workspace(self):
""" returns adapted workspace folder"""
workspace_folder = api.content.create(
self.portal,
'ploneintranet.workspace.workspacefolder',
'example-workspace',
title='Welcome to my workspace')
title='Welcome to my workspace'
)
return IWorkspace(workspace_folder)

def create_unadapted_workspace(self):
Expand All @@ -21,10 +22,11 @@ def create_unadapted_workspace(self):
self.portal,
'ploneintranet.workspace.workspacefolder',
'example-workspace',
title='Welcome to my workspace')
title='Welcome to my workspace'
)
return workspace_folder

def create_user(self, name="testuser", password="secret"):
def create_user(self, name='testuser', password='secret'):
"""
helper method for creating a test user
:param name: username
Expand All @@ -34,10 +36,10 @@ def create_user(self, name="testuser", password="secret"):
"""
user = api.user.create(
email="test@user.com",
email='test@user.com',
username=name,
password=password,
)
)
return user

def test_add_workspacefolder(self):
Expand All @@ -49,7 +51,8 @@ def test_add_workspacefolder(self):
self.portal,
'ploneintranet.workspace.workspacefolder',
'example-workspace',
title='Welcome to my workspace')
title=u'Welcome to my workspacé'
)

self.assertTrue(
IHasWorkspace.providedBy(workspace_folder),
Expand All @@ -60,8 +63,11 @@ def test_add_workspacefolder(self):
# does the view work?
view = workspace_folder.restrictedTraverse('@@view')
html = view()
self.assertIn(workspace_folder.title, html,
'Workspace title not found on view page')
self.assertIn(
workspace_folder.title,
html,
'Workspace title not found on view page'
)

def test_cannot_add_sub_workspace(self):
"""
Expand Down Expand Up @@ -97,10 +103,11 @@ def test_add_admin_to_workspace(self):
user = self.create_user()
groups = api.group.get_groups()
group_names = [x.getName() for x in groups]
group_name = "Admins:%s" % (api.content.get_uuid(ws))
group_name = 'Admins:%s' % (api.content.get_uuid(ws))
self.assertIn(
group_name,
group_names)
group_names
)
workspace = IWorkspace(ws)
workspace.add_to_team(user=user.getId(), groups=set([u"Admins"]))

Expand Down
Loading

0 comments on commit f44c75b

Please sign in to comment.