Merge lp:~roadmr/canonical-identity-provider/fix-non-ascii-in-custom-tags into lp:canonical-identity-provider/release

[Daniel Manrique]

Make faq_title tag non-ascii-aware and add tests for it

Make faq_title tag non-ascii-aware and add tests for it"

[Maximiliano Bertacchini (maxiberta)]

I've just applied this on local trunk but still get a 500 error with `curl --head -H "Accept-Language: es" localhost:8000/+faq`. Am I missing something?

[Maximiliano Bertacchini (maxiberta)]

Indeed, I was missing `make start-db`, sorry! Anyways, I'm unable to reproduce the crash on trunk now :/

[Daniel Manrique (roadmr)]

Yay :)

I can imagine that running it from trunk is not properly using translations. Try:

$ curl --silent -H "Accept-Language: es" http://localhost:8000/+faq |grep FAQ
    <title>FAQ - Ubuntu One</title>
    We have a Two Factor Authentication specific FAQ at <a href="https://help.ubuntu.com/community/SSO/FAQs/2FA">help.ubuntu.com/community/SSO/FAQs/2FA</a>
        Ubuntu One FAQ

the title in particular should read "Preguntas frecuentes (FAQ) - Ubuntu One" if it were picking up the translations.

[Daniel Manrique (roadmr)]

Actually -

1- run "make compilemessages"
2- stop then restart the server (ctrl-c and then "make run")
3-

$ curl --silent -H "Accept-Language: es" http://localhost:8000/+faq |grep FAQ
 u&#39;Preguntas frecuentes (FAQ) - Ubuntu One&#39;,
          <td>LEAKED_PASSWORD_FAQ_URL</td>
          <td>TWOFACTOR_FAQ_URL</td>
          <td class="code"><pre>&#39;https://help.ubuntu.com/community/SSO/FAQs/2FA&#39;</pre></td>

so that is using the translated versions. Now, check the http code:

$ curl --silent -H "Accept-Language: es" http://localhost:8000/+faq --head
HTTP/1.1 500 Internal Server Error
Server: gunicorn/19.3.0
Date: Wed, 06 Jun 2018 18:05:00 GMT
Connection: close
Content-Length: 198536
x-xss-protection: 1; mode=block
Content-Language: es
x-content-type-options: nosniff
Vary: Accept-Language, Cookie
X-Frame-Options: SAMEORIGIN
Content-Type: text/html

Yay, it crashes. Now, apply the patch from this merge and try again:

 curl --silent -H "Accept-Language: es" http://localhost:8000/+faq --head
HTTP/1.1 200 OK

[Maximiliano Bertacchini (maxiberta)]

Thanks! I'm now able to reproduce and can confirm this fixes the issue :D

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/canonical-identity-provider/161/

=== modified file 'src/webui/templatetags/faq.py'
--- src/webui/templatetags/faq.py	2018-05-11 21:29:24 +0000
+++ src/webui/templatetags/faq.py	2018-06-06 15:26:43 +0000
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django import template
 from django.utils.html import format_html
 from django.utils.text import slugify

=== modified file 'src/webui/tests/test_templatetags.py'
--- src/webui/tests/test_templatetags.py	2017-02-26 01:17:04 +0000
+++ src/webui/tests/test_templatetags.py	2018-06-06 15:26:43 +0000
@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 # Copyright 2013-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -129,3 +130,20 @@
             result = Template(
                 "{% load url_with_token %}" + case['in']).render(ctx)
             self.assertEqual(case['out_token'] % {'token': token}, result)
+
+
+class FaqTestCase(TestCase):
+
+    def test_simple(self):
+            result = Template(
+                "{% load faq %}"
+                "{% faq_title 'foo bar' %}").render(Context())
+
+            self.assertIn(">foo bar<", result)
+
+    def test_non_ascii(self):
+            result = Template(
+                "{% load faq %}"
+                "{% faq_title '¿Qué es Ubuntu One 单一登录?' %}").render(Context())
+
+            self.assertIn(">¿Qué es Ubuntu One 单一登录?<", result)