Skip to content

Commit 5989336

Browse files
committed
fix tests
1 parent 1cdd2c1 commit 5989336

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

querybuilder/tests/json_tests.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,21 @@ def test_one(self):
114114
self.assertEqual(record.data['two'], 'two')
115115

116116
record = JsonQueryset(model=MetricRecord).filter(**{'data->one': '1'}).first()
117-
self.assertEqual(record.data['one'], 1)
117+
118+
# Django 3.1 changes the raw queryset behavior so querybuilder isn't going to change that behavior
119+
if VERSION[0] == 3 and VERSION[1] == 1:
120+
self.assertEqual(json.loads(record.data)['one'], 1)
121+
else:
122+
self.assertEqual(record.data['one'], 1)
118123

119124
record = JsonQueryset(model=MetricRecord).filter(**{'data->one': '2'}).first()
120125
self.assertIsNone(record)
121126

122127
records = list(JsonQueryset(model=MetricRecord).order_by('data->one'))
123-
self.assertEqual(records[0].data['one'], 1)
124-
self.assertEqual(records[1].data['one'], 5)
128+
# Django 3.1 changes the raw queryset behavior so querybuilder isn't going to change that behavior
129+
if VERSION[0] == 3 and VERSION[1] == 1:
130+
self.assertEqual(json.loads(records[0].data)['one'], 1)
131+
self.assertEqual(json.loads(records[1].data)['one'], 5)
132+
else:
133+
self.assertEqual(records[0].data['one'], 1)
134+
self.assertEqual(records[1].data['one'], 5)

0 commit comments

Comments
 (0)