Merge branch 'f-values' into f-merge-dict-eles

unittests/test_converters.py

@@ -28,8 +28,8 @@ import os
 import pytest
 import yaml
 
-from caoscrawler.converters import (Converter, ConverterValidationError,
-                                    DictElementConverter, DirectoryConverter,
+from caoscrawler.converters import (Converter, ConverterValidationError, DictElementConverter,
+                                    DirectoryConverter, DictIntegerElementConverter,
                                     handle_value, MarkdownFileConverter,
                                     FloatElementConverter, JSONFileConverter)
 from caoscrawler.converters import _AbstractScalarValueElementConverter
@@ -432,7 +432,11 @@ def test_converter_value_match(converter_registry):
         m = dc.match(IntegerElement(name="a", value=4))
 
     # overwrite default with match for float
+<< << << < HEAD
     dc = FloatElementConverter(
+== == == =
+    dc=DictIntegerElementConverter(
+>>>>>> > f-values
         definition={
             "match_name": "(.*)",
             "match_value": "(.*)",
@@ -441,5 +445,5 @@ def test_converter_value_match(converter_registry):
         name="Test",
         converter_registry=converter_registry
     )
-    m = dc.match(FloatElement(name="a", value=4.0))
+    m=dc.match(FloatElement(name="a", value=4.0))
     assert m is not None