diff options
| author | Marco Fucci <marcofucci@gmail.com> | 2015-03-26 18:47:07 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-26 19:00:37 -0400 |
| commit | 4ee08958f154594b538207a53c1d457687b3f7ae (patch) | |
| tree | 55b93347e4fa9d84f8773614169594d6b5221e4a /tests/model_meta | |
| parent | 14f28f82330b3d2ed7f16fa5de1596e50f2a3952 (diff) | |
| download | django-4ee08958f154594b538207a53c1d457687b3f7ae.tar.gz | |
Fixed #24505 -- Fixed clash with hidden m2m fields.
Added support for multiple m2m fields with the same 'to' model
and with related_name set to '+'.
Diffstat (limited to 'tests/model_meta')
| -rw-r--r-- | tests/model_meta/results.py | 20 | ||||
| -rw-r--r-- | tests/model_meta/tests.py | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/model_meta/results.py b/tests/model_meta/results.py index d70963206f..858b70b73a 100644 --- a/tests/model_meta/results.py +++ b/tests/model_meta/results.py @@ -319,7 +319,7 @@ TEST_RESULTS = { 'get_all_related_objects_with_model_hidden_local': { Person: ( ('+', None), - ('+', None), + ('_people_hidden_+', None), ('Person_following_inherited+', None), ('Person_following_inherited+', None), ('Person_friends_inherited+', None), @@ -334,7 +334,7 @@ TEST_RESULTS = { ), BasePerson: ( ('+', None), - ('+', None), + ('_basepeople_hidden_+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_base+', None), @@ -381,9 +381,9 @@ TEST_RESULTS = { 'get_all_related_objects_with_model_hidden': { Person: ( ('+', BasePerson), - ('+', BasePerson), - ('+', None), ('+', None), + ('_basepeople_hidden_+', BasePerson), + ('_people_hidden_+', None), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_base+', BasePerson), @@ -416,7 +416,7 @@ TEST_RESULTS = { ), BasePerson: ( ('+', None), - ('+', None), + ('_basepeople_hidden_+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_base+', None), @@ -730,7 +730,7 @@ TEST_RESULTS = { ('friends_base_rel_+', None), ('followers_base', None), ('relating_basepeople', None), - ('+', None), + ('_basepeople_hidden_+', None), ), Person: ( ('friends_abstract_rel_+', BasePerson), @@ -738,11 +738,11 @@ TEST_RESULTS = { ('friends_base_rel_+', BasePerson), ('followers_base', BasePerson), ('relating_basepeople', BasePerson), - ('+', BasePerson), + ('_basepeople_hidden_+', BasePerson), ('friends_inherited_rel_+', None), ('followers_concrete', None), ('relating_people', None), - ('+', None), + ('_people_hidden_+', None), ), Relation: ( ('m2m_abstract_rel', None), @@ -757,13 +757,13 @@ TEST_RESULTS = { 'friends_base_rel_+', 'followers_base', 'relating_basepeople', - '+', + '_basepeople_hidden_+', ], Person: [ 'friends_inherited_rel_+', 'followers_concrete', 'relating_people', - '+', + '_people_hidden_+', ], Relation: [ 'm2m_abstract_rel', diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py index 340024be47..4421c9ef44 100644 --- a/tests/model_meta/tests.py +++ b/tests/model_meta/tests.py @@ -237,7 +237,7 @@ class RelationTreeTests(TestCase): self.assertEqual( sorted([field.related_query_name() for field in BasePerson._meta._relation_tree]), sorted([ - '+', '+', 'BasePerson_following_abstract+', 'BasePerson_following_abstract+', + '+', '_basepeople_hidden_+', 'BasePerson_following_abstract+', 'BasePerson_following_abstract+', 'BasePerson_following_base+', 'BasePerson_following_base+', 'BasePerson_friends_abstract+', 'BasePerson_friends_abstract+', 'BasePerson_friends_base+', 'BasePerson_friends_base+', 'BasePerson_m2m_abstract+', 'BasePerson_m2m_base+', 'Relating_basepeople+', |