Skip to content

Commit

Permalink
Add File.is_webextension field (bug 1219772)
Browse files Browse the repository at this point in the history
  • Loading branch information
magopian committed Dec 2, 2015
1 parent c13c8ef commit 1318090
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 0 deletions.
Binary file added apps/files/fixtures/files/webextension.xpi
Binary file not shown.
3 changes: 3 additions & 0 deletions apps/files/models.py
Expand Up @@ -79,6 +79,8 @@ class File(amo.models.OnChangeMixin, amo.models.ModelBase):
is_multi_package = models.BooleanField(default=False)
# Is the file an experiment (see bug 1220097)?
is_experiment = models.BooleanField(default=False)
# Is the file a WebExtension?
is_webextension = models.BooleanField(default=False)

class Meta(amo.models.ModelBase.Meta):
db_table = 'files'
Expand Down Expand Up @@ -167,6 +169,7 @@ def from_upload(cls, upload, version, platform, is_beta=False,
False)
file_.is_multi_package = parse_data.get('is_multi_package', False)
file_.is_experiment = parse_data.get('is_experiment', False)
file_.is_webextension = parse_data.get('is_webextension', False)

if is_beta and addon.status == amo.STATUS_PUBLIC:
file_.status = amo.STATUS_BETA
Expand Down
19 changes: 19 additions & 0 deletions apps/files/tests/test_models.py
Expand Up @@ -445,6 +445,12 @@ def test_match_type_extension_for_experiments(self):
assert parsed['type'] == amo.ADDON_EXTENSION
assert parsed['is_experiment']

def test_match_type_extension_for_webextensions(self):
self.create_switch('webextensions')
parsed = self.parse(filename='webextension.xpi')
assert parsed['type'] == amo.ADDON_EXTENSION
assert parsed['is_webextension']

def test_xml_for_extension(self):
addon = Addon.objects.create(guid='guid@xpi', type=1)
with self.assertRaises(forms.ValidationError) as e:
Expand Down Expand Up @@ -1109,6 +1115,19 @@ def test_not_experiment(self):
parse_data={'is_experiment': False})
assert not file_.is_experiment

def test_webextension(self):
self.create_switch('webextensions')
upload = self.upload('webextension')
file_ = File.from_upload(upload, self.version, self.platform,
parse_data={'is_webextension': True})
assert file_.is_webextension

def test_not_webextension(self):
upload = self.upload('extension')
file_ = File.from_upload(upload, self.version, self.platform,
parse_data={})
assert not file_.is_experiment


class TestZip(amo.tests.TestCase, amo.tests.AMOPaths):

Expand Down
7 changes: 7 additions & 0 deletions apps/files/tests/test_utils_.py
Expand Up @@ -311,6 +311,10 @@ def test_fennec_is_treated_as_android(self):
assert apps[0].min == android_version
assert apps[0].max == android_version

def test_is_webextension(self):
"""An add-on with a package.json file can't be a webextension."""
assert 'is_webextension' not in self.parse({})


class TestManifestJSONExtractor(amo.tests.TestCase):

Expand Down Expand Up @@ -410,6 +414,9 @@ def test_invalid_app_versions_are_ignored(self):
'strict_max_version': '=30.*'}}}
assert not self.parse(data)['apps']

def test_is_webextension(self):
assert self.parse({})['is_webextension']


def test_zip_folder_content():
extension_file = 'apps/files/fixtures/files/extension.xpi'
Expand Down
1 change: 1 addition & 0 deletions apps/files/utils.py
Expand Up @@ -316,6 +316,7 @@ def parse(self):
'summary': self.get('description'),
'no_restart': True,
'apps': [self.app] if self.app else [],
'is_webextension': True,
}


Expand Down
5 changes: 5 additions & 0 deletions migrations/844-file-webextension.sql
@@ -0,0 +1,5 @@
ALTER TABLE
`files`
ADD COLUMN
`is_webextension` BOOL DEFAULT FALSE
;

0 comments on commit 1318090

Please sign in to comment.