Added fx7 and m7. Enabled fx6 and m6 in the UI. [bug 672481]

mythmon · Jul 19, 2011 · d1018c4 · d1018c4
1 parent 5fe4ff8
commit d1018c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/apps/wiki/models.py b/apps/wiki/models.py
@@ -86,10 +86,10 @@
                              'is_default')
 GROUPED_FIREFOX_VERSIONS = (
     ((_lazy(u'Desktop:'), 'desktop'), (
-        # The first option is the default for {for} display. This should be the
-        # newest version.
+        VersionMetadata(9, _lazy(u'Firefox 7'),
+                        _lazy(u'Firefox 7'), 'fx7', 7.9999, False, False),
         VersionMetadata(6, _lazy(u'Firefox 6'),
-                        _lazy(u'Firefox 6'), 'fx6', 6.9999, False, False),
+                        _lazy(u'Firefox 6'), 'fx6', 6.9999, True, False),
         VersionMetadata(5, _lazy(u'Firefox 5'),
                         _lazy(u'Firefox 5'), 'fx5', 5.9999, True, True),
         VersionMetadata(1, _lazy(u'Firefox 4'),
@@ -100,8 +100,11 @@
         VersionMetadata(3, _lazy(u'Firefox 3.0'),
                         _lazy(u'Firefox 3.0'), 'fx3', 3.4999, False, False))),
     ((_lazy(u'Mobile:'), 'mobile'), (
+        VersionMetadata(10, _lazy(u'Firefox 7'),
+                        _lazy(u'Firefox 7 for Mobile'), 'm7', 7.9999, False,
+                        False),
         VersionMetadata(8, _lazy(u'Firefox 6'),
-                        _lazy(u'Firefox 6 for Mobile'), 'm6', 6.9999, False,
+                        _lazy(u'Firefox 6 for Mobile'), 'm6', 6.9999, True,
                         False),
         VersionMetadata(7, _lazy(u'Firefox 5'),
                         _lazy(u'Firefox 5 for Mobile'), 'm5', 5.9999, True,

diff --git a/apps/wiki/tests/test_templates.py b/apps/wiki/tests/test_templates.py
@@ -442,7 +442,7 @@ def test_new_document_form_defaults(self):
         self.client.login(username='admin', password='testpass')
         response = self.client.get(reverse('wiki.new_document'))
         doc = pq(response.content)
-        eq_(8, len(doc('.relevant-to input[checked=checked]')))
+        eq_(9, len(doc('.relevant-to input[checked=checked]')))
         eq_(None, doc('input[name="tags"]').attr('required'))
         eq_('checked', doc('input#id_allow_discussion').attr('checked'))
         eq_(None, doc('input#id_allow_discussion').attr('required'))