diff options
| author | Tim Graham <timograham@gmail.com> | 2018-02-12 14:20:54 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-02-12 20:47:58 -0500 |
| commit | fd18345e10b9e5c9713c606509feaf18e57178e2 (patch) | |
| tree | 59319e855588ccadf6f8f52853d97bbadd3be94b /tests | |
| parent | aeb35548dc3a669aebec45f8f51a9cd3fbfc8801 (diff) | |
[2.0.x] Refs #29125 -- Made Q.deconstruct() omit 'query_utils' in the path and _connector='AND' since it's a default value.
Backport of 9ba3df82402e7e23b353da20aea6894935241ef9 from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/queries/test_q.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/queries/test_q.py b/tests/queries/test_q.py index 2ed4278b77..9e71553ef7 100644 --- a/tests/queries/test_q.py +++ b/tests/queries/test_q.py @@ -22,14 +22,13 @@ class QTests(SimpleTestCase): def test_deconstruct(self): q = Q(price__gt=F('discounted_price')) path, args, kwargs = q.deconstruct() - self.assertEqual(path, 'django.db.models.query_utils.Q') + self.assertEqual(path, 'django.db.models.Q') self.assertEqual(args, ()) self.assertEqual(kwargs, {'price__gt': F('discounted_price')}) def test_deconstruct_negated(self): q = ~Q(price__gt=F('discounted_price')) path, args, kwargs = q.deconstruct() - self.assertEqual(path, 'django.db.models.query_utils.Q') self.assertEqual(args, ()) self.assertEqual(kwargs, { 'price__gt': F('discounted_price'), @@ -41,7 +40,6 @@ class QTests(SimpleTestCase): q2 = Q(price=F('discounted_price')) q = q1 | q2 path, args, kwargs = q.deconstruct() - self.assertEqual(path, 'django.db.models.query_utils.Q') self.assertEqual(args, ( ('price__gt', F('discounted_price')), ('price', F('discounted_price')), @@ -53,12 +51,11 @@ class QTests(SimpleTestCase): q2 = Q(price=F('discounted_price')) q = q1 & q2 path, args, kwargs = q.deconstruct() - self.assertEqual(path, 'django.db.models.query_utils.Q') self.assertEqual(args, ( ('price__gt', F('discounted_price')), ('price', F('discounted_price')), )) - self.assertEqual(kwargs, {'_connector': 'AND'}) + self.assertEqual(kwargs, {}) def test_deconstruct_multiple_kwargs(self): q = Q(price__gt=F('discounted_price'), price=F('discounted_price')) @@ -67,14 +64,13 @@ class QTests(SimpleTestCase): ('price', F('discounted_price')), ('price__gt', F('discounted_price')), )) - self.assertEqual(kwargs, {'_connector': 'AND'}) + self.assertEqual(kwargs, {}) def test_deconstruct_nested(self): q = Q(Q(price__gt=F('discounted_price'))) path, args, kwargs = q.deconstruct() - self.assertEqual(path, 'django.db.models.query_utils.Q') self.assertEqual(args, (Q(price__gt=F('discounted_price')),)) - self.assertEqual(kwargs, {'_connector': 'AND'}) + self.assertEqual(kwargs, {}) def test_reconstruct(self): q = Q(price__gt=F('discounted_price')) |