diff --git a/arkindex_worker/worker/element.py b/arkindex_worker/worker/element.py index 747af95ba4cf492fe9981eb3e680a0f5e538bc85..a89528baa02055493d3ff885dcaaa815e4a62c5b 100644 --- a/arkindex_worker/worker/element.py +++ b/arkindex_worker/worker/element.py @@ -188,12 +188,11 @@ class ElementMixin(object): def list_element_children( self, element, - best_class=None, folder=None, name=None, recursive=None, type=None, - with_best_classes=None, + with_classes=None, with_corpus=None, with_has_children=None, with_zone=None, @@ -206,11 +205,6 @@ class ElementMixin(object): element, (Element, CachedElement) ), "element shouldn't be null and should be an Element or CachedElement" query_params = {} - if best_class is not None: - assert isinstance(best_class, str) or isinstance( - best_class, bool - ), "best_class should be of type str or bool" - query_params["best_class"] = best_class if folder is not None: assert isinstance(folder, bool), "folder should be of type bool" query_params["folder"] = folder @@ -223,11 +217,9 @@ class ElementMixin(object): if type: assert isinstance(type, str), "type should be of type str" query_params["type"] = type - if with_best_classes is not None: - assert isinstance( - with_best_classes, bool - ), "with_best_classes should be of type bool" - query_params["with_best_classes"] = with_best_classes + if with_classes is not None: + assert isinstance(with_classes, bool), "with_classes should be of type bool" + query_params["with_classes"] = with_classes if with_corpus is not None: assert isinstance(with_corpus, bool), "with_corpus should be of type bool" query_params["with_corpus"] = with_corpus diff --git a/tests/test_elements_worker/test_elements.py b/tests/test_elements_worker/test_elements.py index 02c04ca34c83c7020ceec55217f61430f5fd822f..6e2f132bfc313d85567accea00f83dcb2e2eb5e2 100644 --- a/tests/test_elements_worker/test_elements.py +++ b/tests/test_elements_worker/test_elements.py @@ -976,17 +976,6 @@ def test_list_element_children_wrong_element(mock_elements_worker): ) -def test_list_element_children_wrong_best_class(mock_elements_worker): - elt = Element({"id": "12341234-1234-1234-1234-123412341234"}) - - with pytest.raises(AssertionError) as e: - mock_elements_worker.list_element_children( - element=elt, - best_class=1234, - ) - assert str(e.value) == "best_class should be of type str or bool" - - def test_list_element_children_wrong_folder(mock_elements_worker): elt = Element({"id": "12341234-1234-1234-1234-123412341234"}) @@ -1031,15 +1020,15 @@ def test_list_element_children_wrong_type(mock_elements_worker): assert str(e.value) == "type should be of type str" -def test_list_element_children_wrong_with_best_classes(mock_elements_worker): +def test_list_element_children_wrong_with_classes(mock_elements_worker): elt = Element({"id": "12341234-1234-1234-1234-123412341234"}) with pytest.raises(AssertionError) as e: mock_elements_worker.list_element_children( element=elt, - with_best_classes="not bool", + with_classes="not bool", ) - assert str(e.value) == "with_best_classes should be of type bool" + assert str(e.value) == "with_classes should be of type bool" def test_list_element_children_wrong_with_corpus(mock_elements_worker):