Merge pull request mdn#1035 from lmorchard/863692-delete-exception-wa…

…ffle

bug 863692: Waffle switch "wiki_error_on_delete"

apps/wiki/models.py

@@ -39,6 +39,8 @@
 from taggit.managers import TaggableManager
 from taggit.utils import parse_tags, edit_string_for_tags
 
+import waffle
+
 from wiki import TEMPLATE_TITLE_PREFIX
 import wiki.content
 
@@ -1034,8 +1036,11 @@ def save(self, *args, **kwargs):
             del self.old_title
 
     def delete(self, *args, **kwargs):
-        # Temporary while we investigate disappearing pages.
-        raise Exception("Attempt to delete document %s: %s" % (self.id, self.title))
+        if waffle.switch_is_active('wiki_error_on_delete'):
+            # bug 863692: Temporary while we investigate disappearing pages.
+            raise Exception("Attempt to delete document %s: %s" % (self.id, self.title))
+        else:
+            super(Document, self).delete(*args, **kwargs)
 
     def move(self, new_slug=None, user=None):
         """

apps/wiki/tests/test_models.py

@@ -16,6 +16,8 @@
 
 import constance.config
 
+from waffle.models import Flag, Switch
+
 from sumo import ProgrammingError
 from sumo.tests import TestCase
 
@@ -135,6 +137,26 @@ def test_document_is_template(self):
 
         assert not d.is_template
 
+    def test_error_on_delete(self):
+        """Ensure error-on-delete is only thrown when waffle switch active"""
+        switch = Switch.objects.create(name='wiki_error_on_delete')
+
+        for active in (True, False):
+
+            switch.active = active
+            switch.save()
+
+            d = document()
+            d.save()
+
+            try:
+                d.delete()
+                if active:
+                    ok_(False, 'Exception on delete when active')
+            except Exception, e:
+                if not active:
+                    ok_(False, 'No exception on delete when not active')
+
     def test_delete_tagged_document(self):
         """Make sure deleting a tagged doc deletes its tag relationships."""
         # TODO: Move to wherever the tests for TaggableMixin are.