From 4b5bc1ad78313694ba8f41fac05c9a62ccce9f08 Mon Sep 17 00:00:00 2001
From: Ryan P Kilby <rpkilby@ncsu.edu>
Date: Sun, 6 Nov 2016 19:24:52 -0500
Subject: [PATCH] Fixup tests to include Meta.fields

---
 tests/test_conf.py      |  1 +
 tests/test_filtering.py |  1 +
 tests/test_filterset.py | 28 +++++++++++++++++-----------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/tests/test_conf.py b/tests/test_conf.py
index c727d8d..8a88569 100644
--- a/tests/test_conf.py
+++ b/tests/test_conf.py
@@ -39,6 +39,7 @@ class StrictnessTests(TestCase):
     class F(FilterSet):
         class Meta:
             model = User
+            fields = []
 
     def test_settings_default(self):
         self.assertEqual(self.F().strict, STRICTNESS.RETURN_NO_RESULTS)
diff --git a/tests/test_filtering.py b/tests/test_filtering.py
index 4697e78..425a0bb 100644
--- a/tests/test_filtering.py
+++ b/tests/test_filtering.py
@@ -208,6 +208,7 @@ class ChoiceFilterTests(TestCase):
 
             class Meta:
                 model = Article
+                fields = ['author']
 
         # sanity check to make sure the filter is setup correctly
         f = F({'author': '1'})
diff --git a/tests/test_filterset.py b/tests/test_filterset.py
index 3b42d5e..aa41956 100644
--- a/tests/test_filterset.py
+++ b/tests/test_filterset.py
@@ -322,20 +322,21 @@ class FilterSetClassCreationTests(TestCase):
                              ['title', 'price', 'average_rating'])
 
     def test_model_no_fields_or_exclude(self):
+        with self.assertRaises(AssertionError) as excinfo:
+            class F(FilterSet):
+                class Meta:
+                    model = Book
+
+        self.assertIn(
+            "Setting 'Meta.model' without either 'Meta.fields' or 'Meta.exclude'",
+            str(excinfo.exception)
+        )
+
+    def test_model_fields_empty(self):
         class F(FilterSet):
             class Meta:
                 model = Book
-
-        self.assertEqual(len(F.declared_filters), 0)
-        self.assertEqual(len(F.base_filters), 0)
-        self.assertListEqual(list(F.base_filters), [])
-
-    def test_model_exclude_is_none(self):
-        # equivalent to unset fields/exclude
-        class F(FilterSet):
-            class Meta:
-                model = Book
-                exclude = None
+                fields = []
 
         self.assertEqual(len(F.declared_filters), 0)
         self.assertEqual(len(F.base_filters), 0)
@@ -612,6 +613,7 @@ class FilterSetStrictnessTests(TestCase):
         class F(FilterSet):
             class Meta:
                 model = User
+                fields = []
 
         # Ensure default is not IGNORE
         self.assertEqual(F().strict, STRICTNESS.RETURN_NO_RESULTS)
@@ -624,6 +626,7 @@ class FilterSetStrictnessTests(TestCase):
         class F(FilterSet):
             class Meta:
                 model = User
+                fields = []
                 strict = STRICTNESS.IGNORE
 
         self.assertEqual(F().strict, STRICTNESS.IGNORE)
@@ -632,6 +635,7 @@ class FilterSetStrictnessTests(TestCase):
         class F(FilterSet):
             class Meta:
                 model = User
+                fields = []
                 strict = STRICTNESS.IGNORE
 
         strict = STRICTNESS.RAISE_VALIDATION_ERROR
@@ -641,6 +645,7 @@ class FilterSetStrictnessTests(TestCase):
         class F(FilterSet):
             class Meta:
                 model = User
+                fields = []
 
         self.assertEqual(F(strict=False).strict, STRICTNESS.IGNORE)
 
@@ -770,6 +775,7 @@ class FilterMethodTests(TestCase):
 
             class Meta:
                 model = User
+                fields = []
 
             def filter_f(inner_self, qs, name, value):
                 self.assertIsInstance(inner_self, F)