Merge pull request #211 from dbt-labs/dc/more-jinja-block-fun

Fix for custom generic tests

dbt_meshify/dbt_projects.py

@@ -140,7 +140,7 @@ def models(self) -> Dict[str, ModelNode]:
             return self._models
 
         self._models = {
-            node_name: node
+            node_name: node  # type: ignore
             for node_name, node in self.manifest.nodes.items()
             if node.resource_type == "model" and isinstance(node, ModelNode)
         }
@@ -328,11 +328,22 @@ def find_jinja_blocks(self) -> Dict[str, JinjaBlock]:
             )
 
         for unique_id, macro in self.manifest.macros.items():
+            block_type = "macro"
+            name = macro.name
+            top_level_folder = macro.path.split("/")[0]
+
             if macro.package_name != self.name:
                 continue
+            if (
+                top_level_folder in self.project.test_paths
+                if self.project.test_paths
+                else ["tests"]
+            ):
+                block_type = "test"
+                name = macro.name[5:]
 
             blocks[unique_id] = JinjaBlock.from_file(
-                path=self.path / macro.original_file_path, block_type="macro", name=macro.name
+                path=self.path / macro.original_file_path, block_type=block_type, name=name
             )
 
         return blocks

test-projects/split/split_proj/models/marts/__models.yml

@@ -45,6 +45,7 @@ models:
           expression: count_food_items + count_drink_items = count_items
       - dbt_utils.expression_is_true:
           expression: subtotal_food_items + subtotal_drink_items = subtotal
+      - custom_generic_test
     columns:
       - name: order_id
         description: The unique key of the orders mart.

test-projects/split/split_proj/tests/generic/custom_generic_test.sql

@@ -0,0 +1,3 @@
+{% test custom_generic_test(model) %}
+  select true where false
+{% endtest %}

tests/unit/test_jinja_blocks.py

@@ -68,6 +68,14 @@
 {% endmacro %}
 """
 
+simple_custom_generic_test = """\
+
+
+{% test my_custom_test(model) %}
+  select * from {{ model }} where false
+{% endtest %}
+"""
+
 simple_macro_no_spaces = """\
 
 
@@ -176,3 +184,7 @@ def test_from_file_extracts_content_in_files_with_multiple_blocks(self):
             content
             == "{% docs potato_name %}\nThe name of the customer's favorite potato dish.\n{% enddocs %}"
         )
+
+    def test_from_file_extracts_custom_generic_test(self):
+        range = JinjaBlock.find_block_range(simple_custom_generic_test, "test", "my_custom_test")
+        assert range == (2, 88)