Updated ids.json to match FirefoxOS (bug 870920)

mozilla · May 10, 2013 · 49437a2 · 49437a2
1 parent 7b8ae84
commit 49437a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/files/models.py b/apps/files/models.py
@@ -497,17 +497,17 @@ def inject_ids(self):
         """
         For packaged webapps, adds a META-INF/ids.json file with a JSON
         document like the following:
-            {"app_id": "6106d3b3-881a-4ddf-9dec-6b2bf8ff8341",
-             "version_id": 42}
+            {"id": "6106d3b3-881a-4ddf-9dec-6b2bf8ff8341",
+             "version": 42}
         """
         app = self.version.addon
         if not (app.type == amo.ADDON_WEBAPP and app.is_packaged):
             return
 
         filename = 'META-INF/ids.json'
         ids = {
-            'app_id': app.guid,
-            'version_id': self.version_id,
+            'id': app.guid,
+            'version': self.version_id,
         }
         zf = SafeUnzip(self.file_path, mode='a')
         zf.is_valid()

diff --git a/mkt/developers/tests/test_views_versions.py b/mkt/developers/tests/test_views_versions.py
@@ -213,8 +213,8 @@ def test_new_version_gets_ids_file(self, _mock):
         assert zf.getinfo(filename), (
             'Expected %s in zip archive but not found.' % filename)
         ids = json.loads(zf.read(filename))
-        eq_(ids['app_id'], self.app.guid)
-        eq_(ids['version_id'], file_.version_id)
+        eq_(ids['id'], self.app.guid)
+        eq_(ids['version'], file_.version_id)
 
 
 class TestEditVersion(amo.tests.TestCase):

diff --git a/mkt/submit/tests/test_views.py b/mkt/submit/tests/test_views.py
@@ -524,8 +524,8 @@ def test_packaged_app_has_ids_file(self):
         assert zf.getinfo(filename), (
             'Expected %s in zip archive but not found.' % filename)
         ids = json.loads(zf.read(filename))
-        eq_(ids['app_id'], app.guid)
-        eq_(ids['version_id'], file_.version_id)
+        eq_(ids['id'], app.guid)
+        eq_(ids['version'], file_.version_id)
 
 
 class TestDetails(TestSubmit):