Merge branch 'stable/0.9.z' into prod/pa1ch/0.y.z

1 files changed, 15 insertions, 10 deletions

diff --git a/tests.py b/tests.py
index a3ae55e..1d23620 100644
--- a/tests.py
+++ b/tests.py
@@ -1,30 +1,32 @@
 #    Copyright (C) 2017  Alban Gruin
 #
-#    celcatsanitizer is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
+#    celcatsanitizer is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    celcatsanitizer is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License along
-#    with celcatsanitizer; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.test import TestCase
 from django.utils import timezone
 
-from .models import Course, Group, Timetable
+from .models import Course, Group, Timetable, Year
 
 
 class CourseTestCase(TestCase):
     def setUp(self):
         dt = timezone.now()
 
-        self.timetable = Timetable(name="Test timetable 2", url="http://example.org/", slug="test-timetable2")
+        self.year = Year(name="L2", slug="l2")
+        self.year.save()
+
+        self.timetable = Timetable(year=self.year, name="Test timetable 2", url="http://example.org/", slug="test-timetable2")
         self.timetable.save()
 
         cma = Group.objects.create(celcat_name="L1 info s2 CMA", timetable=self.timetable)
@@ -54,7 +56,10 @@ class CourseTestCase(TestCase):
 
 class GroupTestCase(TestCase):
     def setUp(self):
-        self.timetable = Timetable(name="Test timetable", url="http://example.com/", slug="test-timetable")
+        self.year = Year(name="L1", slug="l1")
+        self.year.save()
+
+        self.timetable = Timetable(year=self.year, name="Test timetable", url="http://example.com/", slug="test-timetable")
         self.timetable.save()
 
         Group.objects.create(celcat_name="L1 info s2 CMA", timetable=self.timetable)