Merge lp:~stevenk/launchpad/forbid-proprietary-api into lp:launchpad

[Steve Kowalik]

Forbid IBug.transistionToInformationType(Proprietary) over the API.

Currently users can call IBug.transistionToInformationType(Proprietary) over the API currently, and as it stands right now, we don't want to allow that at all until we make some design level decisions about when proprietary is shown.

[William Grant (wgrant)]

I believe the preferred spelling these days is "cannot", but otherwise this looks good.

review: Approve (code)

=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2012-03-28 01:14:17 +0000
+++ lib/lp/bugs/interfaces/bug.py	2012-04-17 01:15:25 +0000
@@ -892,10 +892,10 @@
     @operation_parameters(
         information_type=copy_field(IBugPublic['information_type']),
         )
-    @call_with(who=REQUEST_USER)
+    @call_with(who=REQUEST_USER, from_api=True)
     @export_write_operation()
     @operation_for_version("devel")
-    def transitionToInformationType(information_type, who):
+    def transitionToInformationType(information_type, who, from_api=False):
         """Set the information type for this bug.
 
         :information_type: The `InformationType` to transition to.

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2012-04-03 06:14:09 +0000
+++ lib/lp/bugs/model/bug.py	2012-04-17 01:15:25 +0000
@@ -1724,9 +1724,13 @@
         return self.transitionToInformationType(
             convert_to_information_type(self.private, security_related), who)
 
-    def transitionToInformationType(self, information_type, who):
+    def transitionToInformationType(self, information_type, who,
+                                    from_api=False):
         """See `IBug`."""
         bug_before_modification = Snapshot(self, providing=providedBy(self))
+        if from_api and information_type == InformationType.PROPRIETARY:
+            raise BugCannotBePrivate(
+                "Cannot transition the information type to proprietary.")
         if self.information_type == information_type:
             return False
         f_flag_str = 'disclosure.enhanced_private_bug_subscriptions.enabled'

=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py	2012-04-03 06:14:09 +0000
+++ lib/lp/bugs/model/tests/test_bug.py	2012-04-17 01:15:25 +0000
@@ -552,6 +552,16 @@
         self.assertThat(
             recorder2, HasQueryCount(Equals(recorder1.count)))
 
+    def test_transitionToInformationType_forbids_proprietary(self):
+        # Calling IBug.transitionToInformationType(PROPRIETARY) over the API
+        # is forbidden currently.
+        bug = self.factory.makeBug()
+        with person_logged_in(bug.owner):
+            self.assertRaisesWithContent(
+                BugCannotBePrivate, "Cannot transition the information type "
+                "to proprietary.", bug.transitionToInformationType,
+                InformationType.PROPRIETARY, bug.owner, True)
+
 
 class TestBugPrivateAndSecurityRelatedUpdatesMixin: