Merge pull request #112 from bogdanbodnar/patch-2

Fix holding config variable in database through proxy objects
jazzband · Aug 17, 2017 · bec4540 · bec4540
2 parents e1d0603 + 9df1182
commit bec4540
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/analytical/tests/test_tag_uservoice.py b/analytical/tests/test_tag_uservoice.py
@@ -40,14 +40,7 @@ def test_invalid_key(self):
 
     @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'}

diff --git a/analytical/tests/test_utils.py b/analytical/tests/test_utils.py
@@ -29,11 +29,11 @@ def test_get_required_setting(self):
 
         # 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,

diff --git a/analytical/utils.py b/analytical/utils.py
@@ -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'"