From 4c7535e939ba9bf892dd88a3c51c3ab4a5ee1e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Tue, 11 Oct 2016 19:20:36 +0200
Subject: [PATCH] fix tests with null=True, blank=True

---
 .../migrations/0019_auto_20161011_1720.py     | 26 +++++++++++++++++++
 proposals/models.py                           |  4 +--
 proposals/tests.py                            |  8 +++---
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 proposals/migrations/0019_auto_20161011_1720.py

diff --git a/proposals/migrations/0019_auto_20161011_1720.py b/proposals/migrations/0019_auto_20161011_1720.py
new file mode 100644
index 0000000..05a3ba0
--- /dev/null
+++ b/proposals/migrations/0019_auto_20161011_1720.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-10-11 17:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0018_talk_room'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='talk',
+            name='room',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='planning.Room'),
+        ),
+        migrations.AlterField(
+            model_name='talk',
+            name='start_date',
+            field=models.DateTimeField(blank=True, default=None, null=True),
+        ),
+    ]
diff --git a/proposals/models.py b/proposals/models.py
index b4d0e7c..b8f62e9 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -113,9 +113,9 @@ class Talk(PonyConfModel):
     notes = models.TextField(blank=True, verbose_name=_('Notes'))
     event = models.ForeignKey(Event, verbose_name=_('Intervention kind'))
     accepted = models.NullBooleanField(default=None)
-    start_date = models.DateTimeField(null=True, default=None)
+    start_date = models.DateTimeField(null=True, blank=True, default=None)
     duration = models.IntegerField(default=0, verbose_name=_('Duration (min)'))
-    room = models.ForeignKey(Room, null=True)
+    room = models.ForeignKey(Room, blank=True, null=True, default=None)
 
     class Meta:
         ordering = ('title',)
diff --git a/proposals/tests.py b/proposals/tests.py
index c56b978..ea13b27 100644
--- a/proposals/tests.py
+++ b/proposals/tests.py
@@ -31,8 +31,9 @@ class ProposalsTests(TestCase):
         self.assertEqual(talk.abstract, 'super')
         self.assertEqual(talk.description, 'this is my super talk')
         self.assertEqual(talk.notes, 'you can watch my previous talk videos')
-        self.client.post(reverse('edit-talk', kwargs={'talk': 'super-talk'}),
-                         {'title': 'mega talk', 'description': 'mega', 'event': 1, 'speakers': 1, 'duration': 60})
+        response = self.client.post(reverse('edit-talk', kwargs={'talk': 'super-talk'}),
+                         {'title': 'mega talk', 'description': 'mega',
+                          'event': 1, 'speakers': 1, 'duration': 60})
         self.assertEqual(str(talk), 'super talk')  # title is read only there
         talk = Talk.objects.first()
         self.assertEqual(talk.description, 'mega')
@@ -73,7 +74,8 @@ class ProposalsTests(TestCase):
         self.assertFalse(talk.is_moderable_by(b))  # b is not orga
         self.client.login(username='a', password='a')
         self.client.post(reverse('edit-talk', kwargs={'talk': 'super-talk'}),
-                         {'title': 'mega talk', 'description': 'mega', 'event': 1, 'speakers': (a.pk, b.pk), 'duration': 60})
+                         {'title': 'mega talk', 'description': 'mega', 'event': 1,
+                           'speakers': (a.pk, b.pk), 'duration': 60})
         talk = Talk.objects.get(slug='super-talk')
         self.assertTrue(b in talk.speakers.all())
         self.assertTrue(talk.is_editable_by(b))  # b is speaker now