diff --git a/analytical/templatetags/google_analytics_js.py b/analytical/templatetags/google_analytics_js.py index f3863a7..377d1f8 100644 --- a/analytical/templatetags/google_analytics_js.py +++ b/analytical/templatetags/google_analytics_js.py @@ -27,7 +27,7 @@ SETUP_CODE = """ (function(i,s,o,g,r,a,m){{i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){{ (i[r].q=i[r].q||[]).push(arguments)}},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) -}})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); +}})(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', '{property_id}', 'auto', {create_fields}); {display_features} diff --git a/analytical/tests/test_tag_google_analytics_js.py b/analytical/tests/test_tag_google_analytics_js.py index 05ada18..517eb8b 100644 --- a/analytical/tests/test_tag_google_analytics_js.py +++ b/analytical/tests/test_tag_google_analytics_js.py @@ -21,11 +21,19 @@ class GoogleAnalyticsTagTestCase(TagTestCase): def test_tag(self): r = self.render_tag('google_analytics_js', 'google_analytics_js') + self.assertTrue("""(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ +(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), +m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) +})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');""" in r, r) self.assertTrue("ga('create', 'UA-123456-7', 'auto', {});" in r, r) self.assertTrue("ga('send', 'pageview');" in r, r) def test_node(self): r = GoogleAnalyticsJsNode().render(Context()) + self.assertTrue("""(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ +(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), +m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) +})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');""" in r, r) self.assertTrue("ga('create', 'UA-123456-7', 'auto', {});" in r, r) self.assertTrue("ga('send', 'pageview');" in r, r)