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

Merge pull request #112 from bogdanbodnar/patch-2

Browse source 
Fix holding config variable in database through proxy objects
This commit is contained in:
Joost Cassee 2017-08-17 16:52:49 +02:00 committed by GitHub
commit bec45403ee
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
analytical/tests/test_tag_uservoice.py
View file

@ -40,14 +40,7 @@ class UserVoiceTagTestCase(TagTestCase):
@override_settings(USERVOICE_WIDGET_KEY='')
def test_empty_key(self):
r = UserVoiceNode().render(Context())
self.assertEqual(r, "")
@override_settings(USERVOICE_WIDGET_KEY='')
def test_overridden_empty_key(self):
vars = {'uservoice_widget_key': 'bcdefghijklmnopqrstu'}
r = UserVoiceNode().render(Context(vars))
self.assertIn("widget.uservoice.com/bcdefghijklmnopqrstu.js", r)
self.assertRaises(AnalyticalException, UserVoiceNode)
def test_overridden_key(self):
vars = {'uservoice_widget_key': 'defghijklmnopqrstuvw'}

4
analytical/tests/test_utils.py
View file

@ -29,11 +29,11 @@ class SettingDeletedTestCase(TestCase):
# available in python >= 3.2
if hasattr(self, 'assertRaisesRegex'):
with self.assertRaisesRegex(AnalyticalException, "^USER_ID setting is set to None$"):
with self.assertRaisesRegex(AnalyticalException, "^USER_ID setting is not set$"):
user_id = get_required_setting("USER_ID", "\d+", "invalid USER_ID")
# available in python >= 2.7, deprecated in 3.2
elif hasattr(self, 'assertRaisesRegexp'):
with self.assertRaisesRegexp(AnalyticalException, "^USER_ID setting is set to None$"):
with self.assertRaisesRegexp(AnalyticalException, "^USER_ID setting is not set$"):
user_id = get_required_setting("USER_ID", "\d+", "invalid USER_ID")
else:
self.assertRaises(AnalyticalException,

4
analytical/utils.py
View file

@ -21,8 +21,8 @@ def get_required_setting(setting, value_re, invalid_msg):
value = getattr(settings, setting)
except AttributeError:
raise AnalyticalException("%s setting: not found" % setting)
if value is None:
raise AnalyticalException("%s setting is set to None" % setting)
if not value:
raise AnalyticalException("%s setting is not set" % setting)
value = str(value)
if not value_re.search(value):
raise AnalyticalException("%s setting: %s: '%s'"