Merge pull request #95 from BotBotMe/fix-test-suite

Fix test suite

Author: Brian Luft

botbot/apps/bots/admin.py

@@ -13,11 +13,6 @@
 
 class PluginFormset(BaseInlineFormSet):
     def __init__(self, *args, **kwargs):
-        if not kwargs['instance'].pk:
-            defaults = Plugin.objects.filter(
-                slug__in=models.Channel.DEFAULT_PLUGINS)
-
-            kwargs['initial'] = [{"plugin": obj.pk} for obj in defaults]
         super(PluginFormset, self).__init__(*args, **kwargs)
 
 
@@ -26,8 +21,6 @@ class ActivePluginInline(admin.StackedInline):
     formset = PluginFormset
 
     def get_extra(self, request, obj=None, **kwargs):
-        if obj is None:
-            return len(models.Channel.DEFAULT_PLUGINS)
         return 0
 
 

botbot/apps/bots/tests.py

@@ -48,9 +48,6 @@ def setUp(self):
             user=self.member, channel=self.private_channel, is_owner=True,
             is_admin=True)
 
-        for plugin in models.Channel.DEFAULT_PLUGINS:
-            models.Plugin.objects.create(name=plugin, slug=plugin)
-
 
 class ModelTests(BaseTestCase):
 

botbot/settings.py

@@ -297,3 +297,5 @@
 STATSD_PREFIX = os.environ.get('STATSD_PREFIX', 'bbme')
 
 DJANGO_HSTORE_ADAPTER_REGISTRATION = 'connection'
+
+SOUTH_TESTS_MIGRATE = False