Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/965473-none-in-the-url into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Fixed Bug:965473

Overview
========
Fixed Bug:965473. Additionally made the url which is sent to the Twitter always stay the same, regardless of the distroseries selected.

[Michael Nelson (michael.nelson)]

13:28 < noodles> lukasz: could thee test on linee 14 do self.assertContains(response, 'href="/cat/applications/whatever') instead of assertNotContains?
13:33 < lukasz> noodles, sure, but why?
13:34 < noodles> lukasz: because asserting that something isn't contained in the result can lead to very easy false positives (ie. the link is moved to a different template)

Thanks for the updated test!

review: Approve

[ISD Branch Mangler (isd-branches-mangler)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-28 12:45:14 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-30 13:50:24 +0000
@@ -169,6 +169,17 @@
         self.assertContains(response, "Tweet</a>")
         self.assertContains(response, "https://twitter.com/share")
 
+    def test_twitter_link_does_not_contain_none(self):
+        app = self.factory.make_application()
+
+        response = self.client.get(
+            reverse('wc-package-detail', args=[app.package_name]))
+
+        self.assertContains(
+            response,
+            'data-url="http://testserver/cat/applications/{0}/"'.format(
+                app.package_name))
+
     def test_google_plus_button_is_present(self):
         response, app = self.get_app_and_response()
 

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-03-23 22:42:24 +0000
+++ src/webcatalog/views.py	2012-03-30 13:50:24 +0000
@@ -184,7 +184,7 @@
         'breadcrumbs': app.crumbs(),
         'distroseries': distro,
         'absolute_url': request.build_absolute_uri(
-            reverse('wc-package-detail', args=[distro, package_name])),
+            reverse('wc-package-detail', args=[package_name])),
         'email_form': form,
         'debtags': debtags,
         }