Skip to content

Commit

Permalink
Remove unneeded spaces in _gaq.push commands
Browse files Browse the repository at this point in the history
  • Loading branch information
@vdboor @jcassee
vdboor authored and jcassee committed Nov 15, 2018
1 parent d2c782c commit deba4e0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions analytical/templatetags/google_analytics.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
CUSTOM_VAR_CODE = "_gaq.push(['_setCustomVar', %(index)s, '%(name)s', " \
"'%(value)s', %(scope)s]);"
SITE_SPEED_CODE = "_gaq.push(['_trackPageLoadTime']);"
ANONYMIZE_IP_CODE = "_gaq.push (['_gat._anonymizeIp']);"
SAMPLE_RATE_CODE = "_gaq.push (['_setSampleRate', '%s']);"
SITE_SPEED_SAMPLE_RATE_CODE = "_gaq.push (['_setSiteSpeedSampleRate', '%s']);"
SESSION_COOKIE_TIMEOUT_CODE = "_gaq.push (['_setSessionCookieTimeout', '%s']);"
VISITOR_COOKIE_TIMEOUT_CODE = "_gaq.push (['_setVisitorCookieTimeout', '%s']);"
ANONYMIZE_IP_CODE = "_gaq.push(['_gat._anonymizeIp']);"
SAMPLE_RATE_CODE = "_gaq.push(['_setSampleRate', '%s']);"
SITE_SPEED_SAMPLE_RATE_CODE = "_gaq.push(['_setSiteSpeedSampleRate', '%s']);"
SESSION_COOKIE_TIMEOUT_CODE = "_gaq.push(['_setSessionCookieTimeout', '%s']);"
VISITOR_COOKIE_TIMEOUT_CODE = "_gaq.push(['_setVisitorCookieTimeout', '%s']);"
DEFAULT_SOURCE = ("'https://ssl' : 'http://www'", "'.google-analytics.com/ga.js'")
DISPLAY_ADVERTISING_SOURCE = ("'https://' : 'http://'", "'stats.g.doubleclick.net/dc.js'")

Expand Down
20 changes: 10 additions & 10 deletions analytical/tests/test_tag_google_analytics.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,23 @@ def test_render_internal_ip(self):
@override_settings(GOOGLE_ANALYTICS_ANONYMIZE_IP=True)
def test_anonymize_ip(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_gat._anonymizeIp']);" in r, r)
self.assertTrue("_gaq.push(['_gat._anonymizeIp']);" in r, r)
self.assertTrue(r.index('_gat._anonymizeIp') < r.index('_trackPageview'), r)

@override_settings(GOOGLE_ANALYTICS_ANONYMIZE_IP=False)
def test_anonymize_ip_not_present(self):
r = GoogleAnalyticsNode().render(Context())
self.assertFalse("_gaq.push (['_gat._anonymizeIp']);" in r, r)
self.assertFalse("_gaq.push(['_gat._anonymizeIp']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SAMPLE_RATE=0.0)
def test_set_sample_rate_min(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setSampleRate', '0.00']);" in r, r)
self.assertTrue("_gaq.push(['_setSampleRate', '0.00']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SAMPLE_RATE='100.00')
def test_set_sample_rate_max(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setSampleRate', '100.00']);" in r, r)
self.assertTrue("_gaq.push(['_setSampleRate', '100.00']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SAMPLE_RATE=-1)
def test_exception_whenset_sample_rate_too_small(self):
Expand All @@ -123,12 +123,12 @@ def test_exception_when_set_sample_rate_too_large(self):
@override_settings(GOOGLE_ANALYTICS_SITE_SPEED_SAMPLE_RATE=0.0)
def test_set_site_speed_sample_rate_min(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setSiteSpeedSampleRate', '0.00']);" in r, r)
self.assertTrue("_gaq.push(['_setSiteSpeedSampleRate', '0.00']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SITE_SPEED_SAMPLE_RATE='100.00')
def test_set_site_speed_sample_rate_max(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setSiteSpeedSampleRate', '100.00']);" in r, r)
self.assertTrue("_gaq.push(['_setSiteSpeedSampleRate', '100.00']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SITE_SPEED_SAMPLE_RATE=-1)
def test_exception_whenset_site_speed_sample_rate_too_small(self):
Expand All @@ -143,12 +143,12 @@ def test_exception_when_set_site_speed_sample_rate_too_large(self):
@override_settings(GOOGLE_ANALYTICS_SESSION_COOKIE_TIMEOUT=0)
def test_set_session_cookie_timeout_min(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setSessionCookieTimeout', '0']);" in r, r)
self.assertTrue("_gaq.push(['_setSessionCookieTimeout', '0']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SESSION_COOKIE_TIMEOUT='10000')
def test_set_session_cookie_timeout_as_string(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setSessionCookieTimeout', '10000']);" in r, r)
self.assertTrue("_gaq.push(['_setSessionCookieTimeout', '10000']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_SESSION_COOKIE_TIMEOUT=-1)
def test_exception_when_set_session_cookie_timeout_too_small(self):
Expand All @@ -158,12 +158,12 @@ def test_exception_when_set_session_cookie_timeout_too_small(self):
@override_settings(GOOGLE_ANALYTICS_VISITOR_COOKIE_TIMEOUT=0)
def test_set_visitor_cookie_timeout_min(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setVisitorCookieTimeout', '0']);" in r, r)
self.assertTrue("_gaq.push(['_setVisitorCookieTimeout', '0']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_VISITOR_COOKIE_TIMEOUT='10000')
def test_set_visitor_cookie_timeout_as_string(self):
r = GoogleAnalyticsNode().render(Context())
self.assertTrue("_gaq.push (['_setVisitorCookieTimeout', '10000']);" in r, r)
self.assertTrue("_gaq.push(['_setVisitorCookieTimeout', '10000']);" in r, r)

@override_settings(GOOGLE_ANALYTICS_VISITOR_COOKIE_TIMEOUT=-1)
def test_exception_when_set_visitor_cookie_timeout_too_small(self):
Expand Down

0 comments on commit deba4e0

Please sign in to comment.