Fixed blocklist for severity only (bug 741841)

mozilla · Apr 4, 2012 · 23a0b43 · 23a0b43
1 parent 391bb97
commit 23a0b43
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/apps/blocklist/templates/blocklist/blocklist.xml b/apps/blocklist/templates/blocklist/blocklist.xml
@@ -41,6 +41,8 @@
         </versionRange>
         {% elif apiver > 2 and plugin.min and plugin.max %}
         <versionRange {{ attrs(severity=plugin.severity, minVersion=plugin.min, maxVersion=plugin.max) }}></versionRange>
+        {% elif plugin.severity and not (plugin.min or plugin.max) %}
+        <versionRange {{ attrs(severity=plugin.severity) }}></versionRange>
         {% endif %}
       {% endif %}
     </pluginItem>

diff --git a/apps/blocklist/tests.py b/apps/blocklist/tests.py
@@ -331,6 +331,16 @@ def test_plugin_with_target_app(self):
         eq_(vr.getAttribute('minVersion'), '1')
         eq_(vr.getAttribute('maxVersion'), '2')
 
+    def test_plugin_with_severity_only(self):
+        self.plugin.update(guid=None, severity=1)
+        vr = self.dom().getElementsByTagName('versionRange')[0]
+        eq_(vr.getAttribute('severity'), '1')
+        eq_(vr.getAttribute('minVersion'), '')
+        eq_(vr.getAttribute('maxVersion'), '')
+
+        eq_(vr.getElementsByTagName('targetApplication'), [],
+            'There should not be a <targetApplication> if there was no app')
+
     def test_plugin_apiver_lt_3(self):
         self.plugin.update(severity='2')
         # No min & max so the app matches.