REST: Fix typo in embedded serializers

This was preventing the v1.1 fields from getting dropped as intended.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Closes: #237

diff --git a/patchwork/api/embedded.py b/patchwork/api/embedded.py
index 72ffc68aa8a2692f676d8513108c6e6f297e8fe0..f088d0aa9db8aebbdbc02acf71f15cbad3e902cd 100644 (file)
--- a/patchwork/api/embedded.py
+++ b/patchwork/api/embedded.py
@@ -89,7 +89,7 @@ class BundleSerializer(SerializedRelatedField):
             model = models.Bundle
             fields = ('id', 'url', 'web_url', 'name', 'mbox')
             read_only_fields = fields
-            versioned_field = {
+            versioned_fields = {
                 '1.1': ('web_url', ),
             }
             extra_kwargs = {
@@ -126,7 +126,7 @@ class CoverLetterSerializer(SerializedRelatedField):
             model = models.CoverLetter
             fields = ('id', 'url', 'web_url', 'msgid', 'date', 'name', 'mbox')
             read_only_fields = fields
-            versioned_field = {
+            versioned_fields = {
                 '1.1': ('web_url', 'mbox', ),
             }
             extra_kwargs = {
@@ -142,7 +142,7 @@ class PatchSerializer(SerializedRelatedField):
             model = models.Patch
             fields = ('id', 'url', 'web_url', 'msgid', 'date', 'name', 'mbox')
             read_only_fields = fields
-            versioned_field = {
+            versioned_fields = {
                 '1.1': ('web_url', ),
             }
             extra_kwargs = {
@@ -190,7 +190,7 @@ class SeriesSerializer(SerializedRelatedField):
             fields = ('id', 'url', 'web_url', 'date', 'name', 'version',
                       'mbox')
             read_only_fields = fields
-            versioned_field = {
+            versioned_fields = {
                 '1.1': ('web_url', ),
             }
             extra_kwargs = {

diff --git a/patchwork/tests/api/test_series.py b/patchwork/tests/api/test_series.py
index b377880a6d10003b883e279b23a8f74f39b6973d..aecd8b04fb2b9a53b4b90b487d781eedf4cf61f7 100644 (file)
--- a/patchwork/tests/api/test_series.py
+++ b/patchwork/tests/api/test_series.py
@@ -139,6 +139,9 @@ class TestSeriesAPI(APITestCase):
         self.assertEqual(1, len(resp.data))
         self.assertIn('url', resp.data[0])
         self.assertNotIn('web_url', resp.data[0])
+        self.assertNotIn('web_url', resp.data[0]['cover_letter'])
+        self.assertNotIn('mbox', resp.data[0]['cover_letter'])
+        self.assertNotIn('web_url', resp.data[0]['patches'][0])
 
     @utils.store_samples('series-detail')
     def test_detail(self):
@@ -157,6 +160,9 @@ class TestSeriesAPI(APITestCase):
         resp = self.client.get(self.api_url(series.id, version='1.0'))
         self.assertIn('url', resp.data)
         self.assertNotIn('web_url', resp.data)
+        self.assertNotIn('web_url', resp.data['cover_letter'])
+        self.assertNotIn('mbox', resp.data['cover_letter'])
+        self.assertNotIn('web_url', resp.data['patches'][0])
 
     def test_create_update_delete(self):
         """Ensure creates, updates and deletes aren't allowed"""

diff --git a/releasenotes/notes/issue-237-48b9442c31e74b9d.yaml b/releasenotes/notes/issue-237-48b9442c31e74b9d.yaml
new file mode 100644 (file)
index 0000000..541f44a
--- /dev/null
+++ b/releasenotes/notes/issue-237-48b9442c31e74b9d.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fields added in API v1.1 are now consistently excluded when requesting API
+    v1.0, as was intended.