more test fix

Author: safwanrahman

django_elasticsearch_dsl/documents.py

@@ -131,8 +131,8 @@ def bulk(self, actions, **kwargs):
     def _prepare_action(self, object_instance, action):
         return {
             '_op_type': action,
-            '_index': str(self._index),
-            '_type': self._doc_type.mapping.doc_type,
+            '_index': self._index._name,
+            '_type': self._doc_type.name,
             '_id': object_instance.pk,
             '_source': (
                 self.prepare(object_instance) if action != 'delete' else None

tests/test_documents.py

@@ -44,7 +44,7 @@ def prepare_color(self, instance):
         return "blue"
 
     class Meta:
-        doc_type = MetaField('car_document')
+        doc_type = 'car_document'
 
     class Django:
         fields = ['name', 'price']
@@ -217,7 +217,7 @@ def test_model_instance_update(self):
             )
             self.assertTrue(mock.call_args_list[0][1]['refresh'])
             self.assertEqual(
-                doc.connection, mock.call_args_list[0][1]['client']
+                doc._index.connection, mock.call_args_list[0][1]['client']()
             )
 
     def test_model_instance_iterable_update(self):
@@ -258,7 +258,7 @@ def test_model_instance_iterable_update(self):
             )
             self.assertTrue(mock.call_args_list[0][1]['refresh'])
             self.assertEqual(
-                doc.connection, mock.call_args_list[0][1]['client']
+                doc._index.connection, mock.call_args_list[0][1]['client']()
             )
 
     def test_model_instance_update_no_refresh(self):