fix tests

Author: dpep

graphene_sqlalchemy/tests/models.py

@@ -66,8 +66,6 @@ class Reporter(Base):
     articles = relationship("Article", backref="reporter")
     favorite_article = relationship("Article", uselist=False)
 
-    pet_names = association_proxy('pets', 'name')
-
     @hybrid_property
     def hybrid_prop(self):
         return self.first_name
@@ -78,6 +76,8 @@ def hybrid_prop(self):
 
     composite_prop = composite(CompositeFullName, first_name, last_name, doc="Composite")
 
+    pet_names = association_proxy('pets', 'name')
+
 
 class Article(Base):
     __tablename__ = "articles"

graphene_sqlalchemy/tests/test_types.py

@@ -83,6 +83,8 @@ class Meta:
         "composite_prop",
         # Hybrid
         "hybrid_prop",
+        # AssociationProxy
+        "pet_names",
         # Relationship
         "pets",
         "articles",
@@ -118,6 +120,11 @@ class Meta:
     assert favorite_article_field.type().type == ArticleType
     assert favorite_article_field.type().description is None
 
+    # assocation proxy
+    assoc_prop = ReporterType._meta.fields['pet_names']
+    assert isinstance(assoc_prop, Dynamic)
+    assert assoc_prop.type().type == List(String)
+
 
 def test_sqlalchemy_override_fields():
     @convert_sqlalchemy_composite.register(CompositeFullName)
@@ -179,6 +186,7 @@ class Meta:
         # Then the automatic SQLAlchemy fields
         "id",
         "favorite_pet_kind",
+        "pet_names",
     ]
 
     first_name_field = ReporterType._meta.fields['first_name']
@@ -276,6 +284,7 @@ class Meta:
         "favorite_pet_kind",
         "composite_prop",
         "hybrid_prop",
+        "pet_names",
         "pets",
         "articles",
         "favorite_article",
@@ -384,7 +393,7 @@ class Meta:
 
     assert issubclass(CustomReporterType, ObjectType)
     assert CustomReporterType._meta.model == Reporter
-    assert len(CustomReporterType._meta.fields) == 11
+    assert len(CustomReporterType._meta.fields) == 12
 
 
 # Test Custom SQLAlchemyObjectType with Custom Options

graphene_sqlalchemy/types.py

@@ -116,7 +116,9 @@ def construct_fields(
         inspected_model.column_attrs.items() +
         inspected_model.composites.items() +
         [(name, item) for name, item in inspected_model.all_orm_descriptors.items()
-            if isinstance(item, (AssociationProxy, hybrid_property))] +
+            if isinstance(item, hybrid_property)] +
+        [(name, item) for name, item in inspected_model.all_orm_descriptors.items()
+            if isinstance(item, AssociationProxy)] +
         inspected_model.relationships.items()
     )