Merge lp:~michael.nelson/ubuntu-webcatalog/1009734-wrong-version into lp:ubuntu-webcatalog

[Michael Nelson]

Don't overwrite correct version with desktop file format version.

Overview
========

After getting the correct apt version of a package from the apt-cache, processing a desktop file was overwriting this with the desktop file format version, as the model-form wasn't excluding the 'version' attribute from the fields to be updated.

`fab test`

[Danny Tamez (zematynnad)]

Looks good noodles

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-06-13 08:55:00 +0000
+++ src/webcatalog/forms.py	2012-06-20 07:57:20 +0000
@@ -62,7 +62,7 @@
 
     class Meta:
         model = Application
-        exclude = ('for_purchase', 'archive_id', 'price')
+        exclude = ('for_purchase', 'archive_id', 'price', 'version')
 
     @classmethod
     def get_form_from_desktop_data(cls, str_data, distroseries):

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-06-19 16:52:32 +0000
+++ src/webcatalog/tests/test_commands.py	2012-06-20 07:57:20 +0000
@@ -454,27 +454,48 @@
         firefox = Application.objects.get(package_name='firefox')
         self.assertEqual(self.FIREFOX_DESCRIPTION, firefox.description)
 
-    def test_process_desktop_file_with_screenshot_url(self):
-        """When processing a desktop file, handle if screenshot_url is set."""
-        command = import_app_install_data.Command()
+    def _make_desktop_file(self, package_name, 
+                           screenshot_url='http://example.com',
+                           desktop_file_version="1.0"):
         desktop_file = tempfile.mktemp()
         self.addCleanup(os.remove, desktop_file)
 
         with open(desktop_file, 'w') as f:
             f.write("""[Desktop Entry]
-X-AppInstall-Package=foo
+X-AppInstall-Package=%s
 X-AppInstall-Popcon=149803
 X-AppInstall-Section=main
-Version=1.0
+Version=%s
 Name=Foo Bar Baz
-X-AppInstall-Screenshot-Url=http://foo.com
+X-AppInstall-Screenshot-Url=%s
 X-Ubuntu-Gettext-Domain=app-install-data
-""")
+""" % (package_name, desktop_file_version, screenshot_url))
+        return desktop_file
+
+    def test_process_desktop_file_with_screenshot_url(self):
+        """When processing a desktop file, handle if screenshot_url is set."""
+        command = import_app_install_data.Command()
+        desktop_file = self._make_desktop_file(
+                'foo', screenshot_url='http://foo.com')
 
         distroseries = self.factory.make_distroseries()
         command.process_desktop_file(desktop_file, '', distroseries)
         # no breakage!
 
+    def test_process_desktop_file_doesnt_override_version(self):
+        distroseries=self.factory.make_distroseries(code_name='natty')
+        app = self.factory.make_application(
+            package_name='inkscape', version="1.6.3a123",
+            distroseries=distroseries)
+        desktop_file = self._make_desktop_file('inkscape',
+                                               desktop_file_version="1.0")
+
+        command = import_app_install_data.Command()
+        command.process_desktop_file(desktop_file, '', distroseries)
+
+        app = Application.objects.get(id=app.id)
+        self.assertEqual("1.6.3a123", app.version)
+
     @patch('urllib.urlopen')
     def test_fetch_icon_from_extras(self, mock_urlopen):
         mock_urlopen.return_value.getcode.return_value = 200