Merge pull request #2491 from strictdoc-project/stanislaw/section

chore(tests/integration): migrate several itests from [SECTION] to [[SECTION]]

Author: stanislaw

strictdoc/backend/sdoc/models/document_grammar.py

@@ -344,7 +344,7 @@ def create_default_section_element(
                     parent=None,
                     title=RequirementFieldName.MID,
                     human_title=None,
-                    required="True",
+                    required="False",
                 )
             )
         fields.append(

strictdoc/backend/sdoc/processor.py

@@ -126,29 +126,6 @@ def process_section(self, section: SDocSection) -> None:
         )
         preserve_source_location_data(section)
 
-        # FIXME: Refactor to eliminate the need in such assert.
-        assert self.parse_context.document_config is not None
-
-        if self.parse_context.document_config.auto_levels:
-            if (
-                section.ng_resolved_custom_level
-                and section.ng_resolved_custom_level != "None"
-            ):
-                raise StrictDocException(
-                    "[SECTION].LEVEL field is provided. "
-                    "This contradicts to the option "
-                    "[DOCUMENT].OPTIONS.AUTO_LEVELS set to On. "
-                    f"Section: {section}"
-                )
-        else:
-            if not section.ng_resolved_custom_level:
-                raise StrictDocException(
-                    "[SECTION].LEVEL field is not provided. "
-                    "This contradicts to the option "
-                    "[DOCUMENT].OPTIONS.AUTO_LEVELS set to Off. "
-                    f"Section: {section}"
-                )
-
     def process_document_from_file(
         self, document_from_file: DocumentFromFile
     ) -> None:
@@ -213,6 +190,18 @@ def process_requirement(self, requirement: SDocNode) -> None:
 
         preserve_source_location_data(requirement)
 
+        # FIXME: Refactor to eliminate the need in such assert.
+        assert self.parse_context.document_config is not None
+
+        if not self.parse_context.document_config.auto_levels:
+            if not requirement.ng_resolved_custom_level:
+                raise StrictDocException(
+                    f"[{requirement.node_type}].LEVEL field is not provided. "
+                    "This contradicts to the option "
+                    "[DOCUMENT].OPTIONS.AUTO_LEVELS set to Off. "
+                    f"Node: {requirement}"
+                )
+
     def process_node_field(self, node_field: SDocNodeField) -> None:
         node_field_parts = node_field.parts
         if (

strictdoc/core/query_engine/query_object.py

@@ -268,11 +268,7 @@ def _evaluate_node_field_expression(
         expression: NodeFieldExpression,
     ) -> Optional[str]:
         field_name = expression.field_name
-        if (
-            isinstance(node, SDocNode)
-            and node.is_requirement()
-            and node.node_type == "REQUIREMENT"
-        ):
+        if isinstance(node, SDocNode):
             requirement: SDocNode = assert_cast(node, SDocNode)
             requirement_document: SDocDocument = assert_cast(
                 requirement.get_document(), SDocDocument

strictdoc/export/html/templates/components/node_content/tiny.jinja

@@ -11,7 +11,7 @@
   {%- endif %}
   data-testid="requirement-style-{{ requirement_style|d(sdoc_entity.get_requirement_style_mode()) }}"
 >
-  {% set title_number = false %}
+  {% set title_number = true %}
   {% set truncated_statement = true %}
   {% include "components/node_field/title/index.jinja" %}
   {% include "components/node_field/uid/index.jinja" %}

strictdoc/export/html/templates/screens/document/table/main.jinja

@@ -30,11 +30,7 @@
               {%- set requirement = node %}
               <tr>
                 <td class="content-view-td content-view-td-type">
-                  {%- if node.is_text_node() %}
-                    Text
-                  {%- else %}
-                    Requirement
-                  {%- endif -%}
+                  {{ node.node_type }}
                 </td>
                 <td class="content-view-td content-view-td-meta">
                   {{ requirement.context.title_number_string }}

tests/integration/features/commands/bypass/50_nested_document_from_file/nested/subnested/input3.sdoc

@@ -1,7 +1,7 @@
 [DOCUMENT]
 TITLE: Hello world doc 3
 
-[SECTION]
+[[SECTION]]
 TITLE: Section 1
 
 [REQUIREMENT]
@@ -12,4 +12,4 @@ STATEMENT: ...
 TITLE: Req-2
 STATEMENT: ...
 
-[/SECTION]
+[[/SECTION]]

tests/integration/features/commands/manage/auto-uid/01_issue_1630_autouid_must_preserve_relations_DEPRECATED/input.sdoc

@@ -6,7 +6,7 @@ OPTIONS:
 [DOCUMENT_FROM_FILE]
 FILE: subnested.sdoc
 
-[SECTION]
+[[SECTION]]
 TITLE: Nested Doc Section
 
 [COMPOSITE_REQUIREMENT]
@@ -17,4 +17,4 @@ TITLE: Nested Doc Section Requirement
 
 [/COMPOSITE_REQUIREMENT]
 
-[/SECTION]
+[[/SECTION]]

tests/integration/features/commands/manage/auto-uid/01_issue_1630_autouid_must_preserve_relations_DEPRECATED/test.itest

@@ -2,9 +2,9 @@
 TITLE: Hello world doc
 PREFIX: DOC-
 
-[SECTION]
-TITLE: Section 1
+[[SECTION]]
 PREFIX: LEVEL1-REQ-
+TITLE: Section 1
 
 [REQUIREMENT]
 UID: LEVEL1-REQ-1
@@ -14,11 +14,11 @@ STATEMENT: System shall do L1-1.
 UID: LEVEL1-REQ-2
 STATEMENT: System shall do L1-1.
 
-[/SECTION]
+[[/SECTION]]
 
-[SECTION]
-TITLE: Section 2
+[[SECTION]]
 PREFIX: LEVEL2-REQ-
+TITLE: Section 2
 
 [REQUIREMENT]
 UID: LEVEL2-REQ-2
@@ -28,4 +28,4 @@ STATEMENT: System shall do L2-1.
 UID: LEVEL2-REQ-1
 STATEMENT: System shall do L2-1.
 
-[/SECTION]
+[[/SECTION]]