Merge pull request #6287 from akatsoulas/aaq-waffle-flags

Control the AAQ moderation flags through waffle

kitsune/questions/models.py

@@ -5,6 +5,7 @@
 
 import actstream
 import actstream.actions
+import waffle
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
@@ -200,16 +201,17 @@ def save(self, update=False, *args, **kwargs):
             # actstream
             # Authors should automatically follow their own questions.
             actstream.actions.follow(self.creator, self, send_action=False, actor_only=False)
-            # Add the question to the moderation queue to validate the topic
-            content_type = ContentType.objects.get_for_model(self)
-            FlaggedObject.objects.create(
-                content_type=content_type,
-                object_id=self.id,
-                creator=self.creator,
-                status=FlaggedObject.FLAG_PENDING,
-                reason="bug_support",
-                notes="New question, review topic",
-            )
+            if waffle.switch_is_active("flagit-spam-autoflag"):
+                # Add the question to the moderation queue to validate the topic
+                content_type = ContentType.objects.get_for_model(self)
+                FlaggedObject.objects.create(
+                    content_type=content_type,
+                    object_id=self.id,
+                    creator=self.creator,
+                    status=FlaggedObject.FLAG_PENDING,
+                    reason="bug_support",
+                    notes="New question, review topic",
+                )
 
     def add_metadata(self, **kwargs):
         """Add (save to db) the passed in metadata.

kitsune/questions/tests/test_models.py

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime, timedelta
 from unittest import mock
 
+import waffle
 from actstream.models import Action, Follow
 from django.contrib.contenttypes.models import ContentType
 from django.core.management import call_command
@@ -655,7 +655,9 @@ def test_question_solved_makes_action(self):
         self.assertEqual(act.verb, "marked as a solution")
         self.assertEqual(act.target, ans.question)
 
-    def test_create_question_creates_flag(self):
+    @mock.patch.object(waffle, "switch_is_active")
+    def test_create_question_creates_flag(self, switch_is_active):
         """Creating a question also creates a flag."""
+        switch_is_active.return_value = True
         QuestionFactory(title="Test Question", content="Lorem Ipsum Dolor")
         self.assertEqual(1, FlaggedObject.objects.filter(reason="bug_support").count())