Merge lp:~michael.nelson/ubuntu-webcatalog/953306-display-app-version into lp:ubuntu-webcatalog

[Michael Nelson]

Import and display application versions.

Overiew
=======

Adds Application.version, ensures it's imported for both archive and purchase apps, and displays it on the details page under the license (similar to USC).

`fab test`

[lp:~michael.nelson/ubuntu-webcatalog/953306-display-app-version]

82. By Michael Nelson on 2012-03-13

Moved inline immport.

[Anthony Lenton (elachuni)]

Hi Michael,

Thanks for the branch! The only thing I think would be missing would be to also import the version for for-purchase apps, within the import_for_purchase_apps command.

About rev. 77, I think it's neat if the tests can all work with the same mock_response. Why is test_app_is_not_created_if_already_in_webcatalog removed though? Was that already tested by a different test?

Cheers,

achuni.

[Michael Nelson (michael.nelson)]

On Wed, Mar 14, 2012 at 11:11 PM, Anthony Lenton
<email address hidden> wrote:
> Hi Michael,
>
> Thanks for the branch!  The only thing I think would be missing would be to also import the version for for-purchase apps, within the import_for_purchase_apps command.
>

Sheesh - you had me worried there for a second. It is there, you can
see it being tested line 389 of the MP diff, it's just that
import_for_purchase_apps didn't contain the change, it uses a form to
clean the data and the form was updated (first part of the diff).

> About rev. 77, I think it's neat if the tests can all work with the same mock_response.  Why is test_app_is_not_created_if_already_in_webcatalog removed though? Was that already tested by a different test?

Yeah, with test_existing_app_gets_updated_by_archive_id, it made sense
that part of this test was to ensure not only that the existing app is
updated, but that the number of apps didn't change. If you think it
should be separate, just let me know.

Thanks!

[Anthony Lenton (elachuni)]

Hah, yep, I missed the test completely and thought that the form update was for import_app_install_data.

Thanks!

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-03-06 19:35:00 +0000
+++ src/webcatalog/forms.py	2012-03-13 15:19:18 +0000
@@ -22,6 +22,7 @@
     with_statement,
     )
 
+import apt
 from ConfigParser import ConfigParser
 from StringIO import StringIO
 
@@ -108,6 +109,10 @@
 
         return cls(data=app_data, instance=instance)
 
+    def clean_version(self):
+        value = self.cleaned_data['version']
+        return apt.apt_pkg.upstream_version(value)
+
 
 class EmailDownloadLinkForm(forms.Form):
     email = forms.EmailField()

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-03-05 09:23:47 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-03-13 15:19:18 +0000
@@ -264,6 +264,7 @@
             if not app_comment:
                 app_comment = package.name
 
+            version = apt.apt_pkg.upstream_version(candidate.version)
             if package.name in prefetched_apps:
                 app = prefetched_apps[package.name]
                 if (app.description == candidate.description and
@@ -273,6 +274,7 @@
                         continue
                 app.description = candidate.description
                 app.section = candidate.section
+                app.version = version
                 app.name = app_name
                 app.comment = app_comment
                 app.save()
@@ -284,6 +286,7 @@
                     description=candidate.description,
                     section=candidate.section,
                     name=app_name,
+                    version=version,
                     comment=app_comment,
                     )
         if self.verbosity == 1:

=== added file 'src/webcatalog/migrations/0010_add_app_version.py'
--- src/webcatalog/migrations/0010_add_app_version.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0010_add_app_version.py	2012-03-13 15:19:18 +0000
@@ -0,0 +1,154 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Application.version'
+        db.add_column('webcatalog_application', 'version', self.gf('django.db.models.fields.CharField')(default='', max_length=32, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Application.version'
+        db.delete_column('webcatalog_application', 'version')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'screenshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'sEjZUPZnEgnDdaBCNkLPXCrLcWBCxu'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'NmdZZbdybysvASwPmODfOInVgdUrtwQIuGzCBQzZgoRoppjwrK'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'zXcfbHWuHkeoltnlevFxVswIdDArEKgnTSLZzlkLSHdUCLmluo'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-03-12 15:30:15 +0000
+++ src/webcatalog/models/applications.py	2012-03-13 15:19:18 +0000
@@ -69,6 +69,7 @@
     # The following fields are extracted from app-install-data.
     package_name = models.CharField(max_length=100)
     name = models.CharField(max_length=255)
+    version = models.CharField(max_length=32, blank=True)
     comment = models.CharField(max_length=255, blank=True)
     popcon = models.IntegerField(null=True, blank=True)
     channel = models.CharField(max_length=255, blank=True)

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-03-08 20:27:19 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2012-03-13 15:19:18 +0000
@@ -94,6 +94,12 @@
             <th>{% trans "License:" %}</th>
             <td>{{ application.license_type }}</td>
         </tr>
+        {% if application.version %}
+        <tr>
+            <th>{% trans "Version:" %}</th>
+            <td>{{ application.version }}</td>
+        </tr>
+        {% endif %}
       </table>
     </div>
     <div class="share">

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-03-09 15:46:15 +0000
+++ src/webcatalog/tests/factory.py	2012-03-13 15:19:18 +0000
@@ -93,7 +93,8 @@
     def make_application(self, package_name=None, name=None,
         comment=None, description=None, icon_name='', icon=None,
         distroseries=None, arch='i686', ratings_average=None,
-        ratings_total=None, ratings_histogram='', screenshot_url=None):
+        ratings_total=None, ratings_histogram='', screenshot_url=None,
+        archive_id=None, version=''):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -110,7 +111,8 @@
             description=description, popcon=999, icon=icon,
             icon_name=icon_name, distroseries=distroseries, architectures=arch,
             ratings_average=ratings_average, ratings_total=ratings_total,
-            ratings_histogram=ratings_histogram, screenshot_url=screenshot_url)
+            ratings_histogram=ratings_histogram, screenshot_url=screenshot_url,
+            archive_id=archive_id, version=version)
 
     def make_department(self, name, parent=None, slug=None):
         if slug is None:

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-03-06 16:51:27 +0000
+++ src/webcatalog/tests/test_commands.py	2012-03-13 15:19:18 +0000
@@ -88,6 +88,7 @@
         mock_package.name = name
         mock_package.candidate.section = ''
         mock_package.candidate.summary = summary
+        mock_package.candidate.version = '1.2.3-4ubuntu1~dev'
         return mock_package
 
     def make_mock_apt_cache(self):
@@ -381,6 +382,7 @@
         otherapp = Application.objects.get(package_name='otherapp')
         self.assertEqual('Otherapp the Internet', otherapp.name)
         self.assertEqual('A tagline for Otherapp', otherapp.comment)
+        self.assertEqual('1.2.3', otherapp.version)
 
     def test_lang_specific_description_added_to_app(self):
         # Related to bug 879268 - our app server runs on lucid where
@@ -401,6 +403,7 @@
 class ImportForPurchaseAppsTestCase(TestCaseWithFactory):
 
     def setUp(self):
+        super(ImportForPurchaseAppsTestCase, self).setUp()
         curdir = os.path.dirname(__file__)
         sca_apps_file = os.path.join(curdir, 'test_data', 'sca_apps.txt')
         self.distroseries = DistroSeries.objects.create(code_name='natty')
@@ -409,69 +412,67 @@
         mock_response = Mock()
         mock_response.code = 200
         mock_response.read.return_value = self.response_content
-        self.mock_response = mock_response
-
-    @patch('urllib.urlopen')
-    def test_app_for_purchase_is_found(self, mock_urllib):
-        mock_urllib.return_value = self.mock_response
+
+        self.patch_urlopen = patch('urllib.urlopen')
+        mock_urllib = self.patch_urlopen.start()
+        mock_urllib.return_value = mock_response
+        self.addCleanup(self.patch_urlopen.stop)
+
+    def test_app_for_purchase_is_found(self):
         apps_for_purchase = Application.objects.filter(for_purchase=True)
         self.assertEqual(0, len(apps_for_purchase))
+
         call_command('import_for_purchase_apps')
+
         app_for_purchase = Application.objects.get(name='MyApp',
             distroseries=self.distroseries)
         self.assertEqual(True, app_for_purchase.for_purchase)
         self.assertTrue(app_for_purchase.description.find('hello') > -1)
 
-    @patch('urllib.urlopen')
-    def test_app_is_not_created_if_already_in_webcatalog(self, mock_urllib):
-        mock_urllib.return_value = self.mock_response
-        apps = Application.objects.all()
-        first = len(apps)
-        call_command('import_for_purchase_apps')
-        apps = Application.objects.all()
-        second = len(apps)
-        call_command('import_for_purchase_apps')
-        apps = Application.objects.all()
-        third = len(apps)
-        self.assertTrue(second > first)
-        # number of apps should not increase
-        self.assertEqual(second, third)
+    def test_app_gets_distroseries(self):
+        call_command('import_for_purchase_apps')
 
-    @patch('urllib.urlopen')
-    def test_app_gets_distroseries(self, mock_urllib):
-        mock_urllib.return_value = self.mock_response
-        call_command('import_for_purchase_apps')
         app = Application.objects.get(name='MyApp',
             distroseries=self.distroseries)
         self.assertEqual(2, len(app.available_distroseries()))
 
-    @patch('urllib.urlopen')
-    def test_app_gets_price(self, mock_urllib):
-        mock_urllib.return_value = self.mock_response
+    def test_app_gets_price(self):
         call_command('import_for_purchase_apps')
+
         app = Application.objects.get(name='MyApp',
             distroseries=self.distroseries)
         self.assertEqual(Decimal('2.50'), app.price)
 
-    @patch('urllib.urlopen')
-    def test_app_gets_updated(self, mock_urllib):
-        mock_urllib.return_value = self.mock_response
-        call_command('import_for_purchase_apps')
-        updated = self.response_content.replace('hello', 'bye')
-        self.mock_response.read.return_value = updated
-        call_command('import_for_purchase_apps')
-        app = Application.objects.get(name='MyApp',
+    def test_existing_app_gets_updated_by_archive_id(self):
+        self.factory.make_application(archive_id='launchpad_zematynnad2/myppa',
+            package_name='somethingelse',
+            distroseries=self.factory.make_distroseries(code_name='maverick'))
+        self.factory.make_application(archive_id='launchpad_zematynnad2/myppa',
+            package_name='somethingelse',
             distroseries=self.distroseries)
-        self.assertEqual('bye', app.package_name)
-
-    @patch('urllib.urlopen')
-    def test_app_gets_icon(self, mock_urllib):
-        mock_urllib.return_value = self.mock_response
-        call_command('import_for_purchase_apps')
+        self.assertEqual(2, Application.objects.count())
+
+        call_command('import_for_purchase_apps')
+
+        self.assertEqual(2, Application.objects.count())
+        for app in Application.objects.all():
+            self.assertEqual('launchpad_zematynnad2/myppa', app.archive_id)
+            self.assertEqual('hello', app.package_name)
+
+    def test_app_gets_icon(self):
+        call_command('import_for_purchase_apps')
+
         app = Application.objects.get(name='MyApp',
             distroseries=self.distroseries)
         self.assertEqual(6461, app.icon.size)
 
+    def test_app_gets_version(self):
+        call_command('import_for_purchase_apps')
+
+        app = Application.objects.get(package_name='hello',
+            distroseries=self.distroseries)
+        self.assertEqual('1.2.3', app.version)
+
 
 class ImportRatingsTestCase(TestCaseWithFactory):
 

=== modified file 'src/webcatalog/tests/test_data/sca_apps.txt'
--- src/webcatalog/tests/test_data/sca_apps.txt	2011-07-02 04:53:26 +0000
+++ src/webcatalog/tests/test_data/sca_apps.txt	2012-03-13 15:19:18 +0000
@@ -4,6 +4,7 @@
         "signing_key_id": "",
         "description": "MyAppTagline\nThe classic greeting, and a good example\r\n The GNU hello program produces a familiar, friendly greeting.  It\r\n allows non-programmers to use a classic computer science tool which\r\n would otherwise be unavailable to them.\r\n .\r\n Seriously, though: this is an example of how to do a Debian package.\r\n It is the Debian version of the GNU Project's `hello world' program\r\n (which is itself an example for the GNU Project).",
         "package_name": "hello",
+        "version": "1.2.3-2ubuntu1~dev",
         "series": {"maverick": ["i386", "amd64"], "natty": ["i386", "amd64"]},
         "price": "2.50",
         "archive_id": "launchpad_zematynnad2/myppa",
@@ -15,4 +16,4 @@
         "categories": "Audio",
         "name": "MyApp"
     }
-]
\ No newline at end of file
+]

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-12 15:43:37 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-13 15:19:18 +0000
@@ -282,6 +282,27 @@
                             'has been sent.')
         self.assertContains(response, 'Enter a valid e-mail address.')
 
+    def test_version_and_label_displayed(self):
+        app = self.factory.make_application(version='1.2.3',
+            distroseries=self.factory.make_distroseries())
+
+        url = reverse('wc-package-detail', kwargs=dict(
+            distro=app.distroseries.code_name, package_name=app.package_name))
+        response = self.client.get(url)
+
+        self.assertContains(response, '<th>Version:</th>')
+        self.assertContains(response, '<td>1.2.3</td>')
+
+    def test_version_label_not_displayed(self):
+        app = self.factory.make_application(version='',
+            distroseries=self.factory.make_distroseries())
+
+        url = reverse('wc-package-detail', kwargs=dict(
+            distro=app.distroseries.code_name, package_name=app.package_name))
+        response = self.client.get(url)
+
+        self.assertNotContains(response, '<th>Version</th>')
+
 
 class ApplicationDetailNoSeriesTestCase(TestCaseWithFactory):