Merge lp:~rockstar/launchpad/not-logged-in-recipes into lp:launchpad

[Paul Hummer]

This branch just fixes an issue where a user that wasn't logged in was able to see the +request-builds page.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-08-24 02:17:19 +0000
+++ lib/lp/code/browser/configure.zcml	2010-09-20 19:16:56 +0000
@@ -1208,7 +1208,7 @@
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsView"
             name="+request-builds"
             template="../templates/sourcepackagerecipe-request-builds.pt"
-            permission="launchpad.View"/>
+            permission="launchpad.AnyPerson"/>
     </facet>
     <facet facet="branches">
         <browser:defaultView

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-09-01 03:25:36 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-09-20 19:16:56 +0000
@@ -46,7 +46,6 @@
     ANONYMOUS,
     BrowserTestCase,
     login,
-    logout,
     person_logged_in,
     )
 from lp.testing.factory import remove_security_proxy_and_shout_at_engineer
@@ -103,17 +102,12 @@
         return branch
 
     def test_create_new_recipe_not_logged_in(self):
-        from canonical.launchpad.testing.pages import setupBrowser
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
         branch = self.factory.makeBranch(
             owner=self.chef, product=product, name='veggies')
-        branch_url = canonical_url(branch)
-        logout()
-
-        browser = setupBrowser()
-        browser.open(branch_url)
-
+
+        browser = self.getViewBrowser(branch, no_login=True)
         self.assertRaises(
             Unauthorized, browser.getLink('Create packaging recipe').click)
 
@@ -689,6 +683,21 @@
             set([2605]),
             set(build.buildqueue_record.lastscore for build in builds))
 
+    def test_request_builds_action_not_logged_in(self):
+        """Requesting a build creates pending builds."""
+        woody = self.factory.makeDistroSeries(
+            name='woody', displayname='Woody',
+            distribution=self.ppa.distribution)
+        naked_woody = removeSecurityProxy(woody)
+        naked_woody.nominatedarchindep = woody.newArch(
+            'i386', ProcessorFamily.get(1), False, self.factory.makePerson(),
+            supports_virtualized=True)
+        recipe = self.makeRecipe()
+
+        browser = self.getViewBrowser(recipe, no_login=True)
+        self.assertRaises(
+            Unauthorized, browser.getLink('Request build(s)').click)
+
     def test_request_builds_archive(self):
         recipe = self.factory.makeSourcePackageRecipe()
         ppa2 = self.factory.makeArchive(

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-09-20 12:56:53 +0000
+++ lib/lp/testing/__init__.py	2010-09-20 19:16:56 +0000
@@ -691,10 +691,17 @@
         self.assertIsNot(
             None, pattern.search(normalise_whitespace(text)), text)
 
-    def getViewBrowser(self, context, view_name=None):
+    def getViewBrowser(self, context, view_name=None, no_login=False):
         login(ANONYMOUS)
         url = canonical_url(context, view_name=view_name)
-        return self.getUserBrowser(url, self.user)
+        logout()
+        if no_login:
+            from canonical.launchpad.testing.pages import setupBrowser
+            browser = setupBrowser()
+            browser.open(url)
+            return browser
+        else:
+            return self.getUserBrowser(url, self.user)
 
     def getMainText(self, context, view_name=None):
         """Return the main text of a context's page."""