Hopiu/django-analytical
1
0
Fork 0
mirror of https://github.com/jazzband/django-analytical.git synced 2026-03-16 22:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address review comments from @bittner

Browse source 
- Remove comments from Piwik tracking JS
- Remove unnecessary wrapping from lines in tests
This commit is contained in:
Garrett Robinson 2017-01-13 18:09:01 -08:00
parent 7ef1c9fd31
commit 6f1db73026
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
analytical/templatetags/piwik.py
View file

@ -21,7 +21,6 @@ DOMAINPATH_RE = re.compile(r'^(([^./?#@:]+\.)*[^./?#@:]+)+(:[0-9]+)?(/[^/?#@:]+)
SITEID_RE = re.compile(r'^\d+$')
TRACKING_CODE = """
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
%(variables)s
@ -35,7 +34,6 @@ TRACKING_CODE = """
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
<noscript><p><img src="//%(url)s/piwik.php?idsite=%(siteid)s" style="border:0;" alt="" /></p></noscript>
""" # noqa

9
analytical/tests/test_tag_piwik.py
View file

@ -36,22 +36,19 @@ class PiwikTagTestCase(TagTestCase):
PIWIK_SITE_ID='345')
def test_domain_path_valid(self):
r = self.render_tag('piwik', 'piwik')
self.assertTrue('"//example.com/piwik/"' in r,
r)
self.assertTrue('"//example.com/piwik/"' in r, r)
@override_settings(PIWIK_DOMAIN_PATH='example.com:1234',
PIWIK_SITE_ID='345')
def test_domain_port_valid(self):
r = self.render_tag('piwik', 'piwik')
self.assertTrue('"//example.com:1234/";' in r,
r)
self.assertTrue('"//example.com:1234/";' in r, r)
@override_settings(PIWIK_DOMAIN_PATH='example.com:1234/piwik',
PIWIK_SITE_ID='345')
def test_domain_port_path_valid(self):
r = self.render_tag('piwik', 'piwik')
self.assertTrue('"//example.com:1234/piwik/"' in r,
r)
self.assertTrue('"//example.com:1234/piwik/"' in r, r)
@override_settings(PIWIK_DOMAIN_PATH=None)
def test_no_domain(self):