More fixing

Author: safwanrahman

django_elasticsearch_dsl/registries.py

@@ -48,13 +48,10 @@ def register_document(self, document):
 
         # Add The model fields into elasticsearch mapping field
         model_field_names = getattr(document.Django, "fields", [])
-        class_fields = set(
-            name for name, field in document.__dict__.items()
-            if isinstance(field, Field)
-        )
+        mapping_fields = document._doc_type.mapping.properties.properties.to_dict().keys()
 
         for field_name in model_field_names:
-            if field_name in class_fields:
+            if field_name in mapping_fields:
                 raise RedeclaredFieldError(
                     "You cannot redeclare the field named '{}' on {}"
                     .format(field_name, document.__name__)

tests/test_documents.py

@@ -263,7 +263,7 @@ def test_model_instance_iterable_update(self):
 
     def test_model_instance_update_no_refresh(self):
         doc = CarDocument()
-        doc._doc_type.auto_refresh = False
+        doc.django.auto_refresh = False
         car = Car()
         with patch('django_elasticsearch_dsl.documents.bulk') as mock:
             doc.update(car)

tests/test_indices.py

@@ -10,13 +10,15 @@
 
 
 class IndexTestCase(WithFixturesMixin, TestCase):
+    def setUp(self):
+        self.registry = DocumentRegistry()
+
     def test_documents_add_to_register(self):
-        registry = DocumentRegistry()
+        registry = self.registry
         with patch('django_elasticsearch_dsl.indices.registry', new=registry):
             index = Index('test')
-            doc_a1 = self._generate_doc_mock(self.ModelA)
-            doc_a2 = self._generate_doc_mock(self.ModelA)
-            print(index._mapping)
+            doc_a1 = self._generate_doc_mock(self.ModelA, index)
+            doc_a2 = self._generate_doc_mock(self.ModelA, index)
             index.doc_type(doc_a1)
             docs = list(registry.get_documents())
             self.assertEqual(len(docs), 1)