aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2013-09-08 16:16:44 +0200
committerTheo Chatzimichos <tampakrap@gentoo.org>2013-09-08 16:16:44 +0200
commitd31da637c8c7f4293d621a773fa1e0fea22834f3 (patch)
treebdd074f54af3001d0824fce0234b27b2757831e8
parentIdentation, whitespace and other cosmetics fixes in templates (diff)
downloadidentity.gentoo.org-d31da637c8c7f4293d621a773fa1e0fea22834f3.tar.gz
identity.gentoo.org-d31da637c8c7f4293d621a773fa1e0fea22834f3.tar.bz2
identity.gentoo.org-d31da637c8c7f4293d621a773fa1e0fea22834f3.zip
Fix the tests about rendered result, they were not properly concatenating strings
-rw-r--r--okupy/tests/unit/test_lists.py18
-rw-r--r--okupy/tests/unit/test_signup.py4
2 files changed, 5 insertions, 17 deletions
diff --git a/okupy/tests/unit/test_lists.py b/okupy/tests/unit/test_lists.py
index b5d7006..d34e27c 100644
--- a/okupy/tests/unit/test_lists.py
+++ b/okupy/tests/unit/test_lists.py
@@ -34,11 +34,7 @@ class ListsUnitTests(OkupyTestCase):
def test_rendered_devlist_page(self):
request = set_request(uri='/devlist')
response = lists(request, 'devlist')
- page_part = '<tr>\n <td class="devname"><b>alice'
- '</b></td>\n <td>Alice Adams</td>\n '
- '<td><a href="http://maps.google.com/maps?q=City1, Country1">'
- 'City1, Country1</a></td>\n <td class="tableinfo">'
- 'kde, qt, cluster</td>\n </tr>'
+ page_part = '<tr>\n <td class="devname"><b>alice</b></td>\n <td>Alice Adams</td>\n <td><a href="http://maps.google.com/maps?q=City1, Country1">City1, Country1</a></td>\n <td class="tableinfo">kde, qt, cluster</td>\n </tr>' # noqa
self.assertIn(page_part, response.content)
def test_former_devlist_url_resolves_to_lists_view(self):
@@ -53,11 +49,7 @@ class ListsUnitTests(OkupyTestCase):
def test_rendered_former_devlist_page(self):
request = set_request(uri='/former-devlist')
response = lists(request, 'former-devlist')
- page_part = '<tr>\n <td class="devname"><b>john'
- '</b></td>\n <td>John Smith</td>\n '
- '<td><a href="http://maps.google.com/maps?q=City3, Country3">'
- 'City3, Country3</a></td>\n <td class="tableinfo">'
- 'kernel, security</td>\n </tr>'
+ page_part = '<tr>\n <td class="devname"><b>john</b></td>\n <td>John Smith</td>\n <td><a href="http://maps.google.com/maps?q=City3, Country3">City3, Country3</a></td>\n <td class="tableinfo">kernel, security</td>\n </tr>' # noqa
self.assertIn(page_part, response.content)
def test_foundation_members_list_url_resolves_to_lists_view(self):
@@ -72,8 +64,6 @@ class ListsUnitTests(OkupyTestCase):
def test_rendered_foundation_members_page(self):
request = set_request(uri='/foundation-members')
response = lists(request, 'foundation-members')
- page_part = '<tr>\n <td style="color:#5c4f85;"><b>bob'
- '</b></td>\n <td>Robert Barker</td>\n '
- '<td><a href="http://maps.google.com/maps?q=City2, Country2">'
- 'City2, Country2</a></td>\n </tr>'
+ page_part = '<tr>\n <td style="color:#5c4f85;"><b>bob</b></td>\n <td>Robert Barker</td>\n <td><a href="http://maps.google.com/maps?q=City2, Country2">City2, Country2</a></td>\n </tr>' # noqa
+ page_part = '<tr>\n <td style="color:#5c4f85;"><b>bob</b></td>\n <td>Robert Barker</td>\n <td><a href="http://maps.google.com/maps?q=City2, Country2">City2, Country2</a></td>\n </tr>' # noqa
self.assertIn(page_part, response.content)
diff --git a/okupy/tests/unit/test_signup.py b/okupy/tests/unit/test_signup.py
index 459e3f8..8009546 100644
--- a/okupy/tests/unit/test_signup.py
+++ b/okupy/tests/unit/test_signup.py
@@ -204,9 +204,7 @@ class SignupunitTestsNoLDAP(OkupyTestCase):
def test_rendered_signup_form(self):
request = set_request(uri='/signup')
response = signup(request)
- signup_form_part = '<label for="id_first_name">First Name:</label>'
- '<input id="id_first_name" maxlength="100" name="first_name"'
- 'type="text" />'
+ signup_form_part = '<label for="id_first_name">First Name:</label><input id="id_first_name" maxlength="100" name="first_name" type="text" />' # noqa
self.assertIn(signup_form_part, response.content)
def test_empty_signup_form_raises_form_error_messages(self):