reasonable minimum versions for other apps (bug 691393)

This commit is contained in:
Chris Van 2011-10-05 23:30:04 -07:00
Родитель ba29f6c246
Коммит 0ecb3be86a
3 изменённых файлов: 10 добавлений и 9 удалений

Просмотреть файл

@ -785,11 +785,11 @@ class PackagerCompatForm(forms.Form):
self.fields['min_ver'].queryset = qs.filter(~Q(version__contains='*'))
self.fields['max_ver'].queryset = qs.all()
# Unreasonably hardcode a reasonable default Firefox minVersion.
if self.app == amo.FIREFOX:
# Unreasonably hardcode a reasonable default minVersion.
if self.app in (amo.FIREFOX, amo.MOBILE, amo.THUNDERBIRD):
try:
self.fields['min_ver'].initial = qs.filter(
version=settings.FIREFOX_MINVER)[0]
version=settings.DEFAULT_MINVER)[0]
except (IndexError, AttributeError):
pass

Просмотреть файл

@ -186,15 +186,16 @@ class TestPackager(amo.tests.TestCase):
eq_(r.context['compat_forms'].errors[0]['__all__'][0],
'Min version must be less than Max version.')
@patch.object(settings, 'FIREFOX_MINVER', '3.6')
@patch.object(settings, 'DEFAULT_MINVER', '3.6')
def test_default_firefox_minver(self):
eq_(len(AppVersion.objects.filter(version='3.6')), 1)
eq_(len(AppVersion.objects.filter(application__id=amo.FIREFOX.id,
version='3.6')), 1)
r = self.client.get(self.url)
eq_(r.status_code, 200)
s = pq(r.content)('select#id_form-0-min_ver option[selected]').text()
eq_(s, '3.6')
@patch.object(settings, 'FIREFOX_MINVER', '999.0')
@patch.object(settings, 'DEFAULT_MINVER', '999.0')
def test_no_default_firefox_minver(self):
r = self.client.get(self.url)
eq_(r.status_code, 200)
@ -202,7 +203,7 @@ class TestPackager(amo.tests.TestCase):
assert s != '3.6', (
'The Firefox minVer default should not be set on POST.')
@patch.object(settings, 'FIREFOX_MINVER', '3.6')
@patch.object(settings, 'DEFAULT_MINVER', '3.6')
def test_no_default_firefox_minver_on_post(self):
self.compat_form['min_ver'] = '114'
r = self.client.post(self.url, self._form_data())

Просмотреть файл

@ -1128,8 +1128,8 @@ COMPAT = (
# Latest nightly version of Firefox.
NIGHTLY_VERSION = COMPAT[0]['main']
# Default minimum version of Firefox for Add-on Packager.
FIREFOX_MINVER = COMPAT[4]['main']
# Default minimum version of Firefox/Thunderbird for Add-on Packager.
DEFAULT_MINVER = COMPAT[4]['main']
# URL for reporting arecibo errors too. If not set, won't be sent.
ARECIBO_SERVER_URL = ""