Inspect http_method name for get and exclude body

Author: sanders41

meilisearch/_httprequests.py

@@ -33,7 +33,7 @@ def send_request(
             self.headers["Content-Type"] = content_type
         try:
             request_path = self.config.url + "/" + path
-            if body is None or body == "":
+            if http_method.__name__ == "get":
                 request = http_method(
                     request_path,
                     timeout=self.config.timeout,
@@ -51,7 +51,7 @@ def send_request(
                     request_path,
                     timeout=self.config.timeout,
                     headers=self.headers,
-                    data=json.dumps(body),
+                    data=json.dumps(body) if body else "" if body == "" else "null",
                 )
             return self.__validate(request)
 

tests/errors/test_api_error_meilisearch.py

@@ -25,7 +25,7 @@ def test_meilisearch_api_error_wrong_master_key():
 @patch("requests.post")
 def test_meilisearch_api_error_no_code(mock_post):
     """Here to test for regressions related to https://github.com/meilisearch/meilisearch-python/issues/305."""
-
+    mock_post.configure_mock(__name__="post")
     mock_response = requests.models.Response()
     mock_response.status_code = 408
     mock_post.return_value = mock_response

tests/errors/test_communication_error_meilisearch.py

@@ -12,6 +12,7 @@
 
 @patch("requests.post")
 def test_meilisearch_communication_error_host(mock_post):
+    mock_post.configure_mock(__name__="post")
     mock_post.side_effect = requests.exceptions.ConnectionError()
     client = meilisearch.Client("http://wrongurl:1234", MASTER_KEY)
     with pytest.raises(MeilisearchCommunicationError):

tests/errors/test_timeout_error_meilisearch.py

@@ -10,6 +10,7 @@
 
 @patch("requests.get")
 def test_client_timeout_error(mock_get):
+    mock_get.configure_mock(__name__="get")
     mock_get.side_effect = requests.exceptions.Timeout()
     client = meilisearch.Client(BASE_URL, MASTER_KEY, timeout=1)
 

tests/settings/test_settings_displayed_attributes_meilisearch.py

@@ -36,7 +36,8 @@ def test_update_displayed_attributes_to_none(empty_index):
     get_attributes = index.get_displayed_attributes()
     for attribute in DISPLAYED_ATTRIBUTES:
         assert attribute in get_attributes
-    response = index.reset_displayed_attributes()
+    # Launch test to update at null the setting
+    response = index.update_displayed_attributes(None)
     index.wait_for_task(response.task_uid)
     response = index.get_displayed_attributes()
     assert response == ["*"]

tests/settings/test_settings_distinct_attribute_meilisearch.py

@@ -28,7 +28,7 @@ def test_update_distinct_at_to_none(empty_index):
     response = index.get_distinct_attribute()
     assert response == NEW_DISTINCT_ATTRIBUTE
     # Launch test to update at null the setting
-    response = index.reset_distinct_attribute()
+    response = index.update_distinct_attribute(None)
     index.wait_for_task(response.task_uid)
     response = index.get_distinct_attribute()
     assert response == DEFAULT_DISTINCT_ATTRIBUTE

tests/settings/test_settings_filterable_attributes_meilisearch.py

@@ -32,7 +32,7 @@ def test_update_filterable_attributes_to_none(empty_index):
     for attribute in FILTERABLE_ATTRIBUTES:
         assert attribute in get_attributes
     # Launch test to update at null the setting
-    response = index.reset_filterable_attributes()
+    response = index.update_filterable_attributes(None)
     index.wait_for_task(response.task_uid)
     response = index.get_filterable_attributes()
     assert response == []

tests/settings/test_settings_ranking_rules_meilisearch.py

@@ -31,7 +31,7 @@ def test_update_ranking_rules_none(empty_index):
     for rule in NEW_RANKING_RULES:
         assert rule in response
     # Launch test to update at null the setting
-    response = index.reset_ranking_rules()
+    response = index.update_ranking_rules(None)
     index.wait_for_task(response.task_uid)
     response = index.get_ranking_rules()
     for rule in DEFAULT_RANKING_RULES:

tests/settings/test_settings_searchable_attributes_meilisearch.py

@@ -37,7 +37,7 @@ def test_update_searchable_attributes_to_none(empty_index):
     for attribute in NEW_SEARCHABLE_ATTRIBUTES:
         assert attribute in response
     # Launch test to update at null the setting
-    response = index.reset_searchable_attributes()
+    response = index.update_searchable_attributes(None)
     index.wait_for_task(response.task_uid)
     response = index.get_searchable_attributes()
     assert response == ["*"]

tests/settings/test_settings_sortable_attributes_meilisearch.py

@@ -32,7 +32,7 @@ def test_update_sortable_attributes_to_none(empty_index):
     for attribute in SORTABLE_ATTRIBUTES:
         assert attribute in get_attributes
     # Launch test to update at null the setting
-    response = index.reset_sortable_attributes()
+    response = index.update_sortable_attributes(None)
     index.wait_for_task(response.task_uid)
     response = index.get_sortable_attributes()
     assert response == []