Merge lp:~gmb/launchpad/fix-ff-for-ss-bug-677020 into lp:launchpad

[Graham Binns]

[r=adeuring][ui=none][bug=677020] The advanced subscription features are now flagged correctly on the StructuralSubscriptionView.

This branch ensures that the feature-flagging of the advanced subscriptions features works for the structural subscriptions form by adding a check for the feature flag to AdvancedSubscriptionMixin.setUpBugNotificationLevelField().

[Abel Deuring (adeuring)]

(17:24:50) abel: gmb: looks fine -- but what I don't understand is this: BugSubscriptionSubscribeSelfView.setUpFields() already calls _seUpBugNotificationLevelFiled only if the feature is enabled. Or am I missing something?
(17:25:39) gmb: abel: It's not BugSubscriptionSubscribeSelfView that's the problem, but I get your point. I'll remove that condition (the idea of my change is that whoever is using AdvancedSubscriptionMixin shouldn't have to remember to add the conditional in the first place.)
(17:26:09) abel: gmb: ah, OK, I see. so, r=me

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
--- lib/lp/bugs/browser/bugsubscription.py	2010-11-12 11:02:58 +0000
+++ lib/lp/bugs/browser/bugsubscription.py	2010-11-19 09:07:59 +0000
@@ -133,6 +133,10 @@
 
     def _setUpBugNotificationLevelField(self):
         """Set up the bug_notification_level field."""
+        if not self._use_advanced_features:
+            # If advanced features are disabled, do nothing.
+            return
+
         self.form_fields = self.form_fields.omit('bug_notification_level')
         self.form_fields += formlib.form.Fields(
             self._bug_notification_level_field)
@@ -263,11 +267,8 @@
         if self.user is None:
             return
 
-        if self._use_advanced_features:
-            self.form_fields += formlib.form.Fields(self._subscription_field)
-            self._setUpBugNotificationLevelField()
-        else:
-            self.form_fields += formlib.form.Fields(self._subscription_field)
+        self.form_fields += formlib.form.Fields(self._subscription_field)
+        self._setUpBugNotificationLevelField()
         self.form_fields['subscription'].custom_widget = CustomWidgetFactory(
             RadioWidget)
 

=== modified file 'lib/lp/registry/browser/tests/test_structuralsubscription.py'
--- lib/lp/registry/browser/tests/test_structuralsubscription.py	2010-11-10 11:33:45 +0000
+++ lib/lp/registry/browser/tests/test_structuralsubscription.py	2010-11-19 09:07:59 +0000
@@ -249,6 +249,17 @@
                 harness.submit('save', form_data)
                 self.assertTrue(harness.hasErrors())
 
+    def test_extra_features_hidden_without_feature_flag(self):
+        # If the malone.advanced-subscriptions.enabled flag is turned
+        # off, the bug_notification_level field doesn't appear on the
+        # form.
+        person = self.factory.makePerson()
+        with person_logged_in(person):
+            harness = LaunchpadFormHarness(
+                self.target, StructuralSubscriptionView)
+            form_fields = harness.view.form_fields
+            self.assertIs(
+                None, form_fields.get('bug_notification_level'))
 
 class TestProductSeriesAdvancedSubscriptionFeatures(
     TestStructuralSubscriptionAdvancedFeaturesBase):