Fixed Tasks header causing MergeAndOrderSections to fail with Robot Framework 6.0+ (#496)

* Add GenerateDocumentation transformer

Co-authored-by: Mateusz Nojek <matnojek@gmail.com>

Author: bhirsz

docs/releasenotes/4.0.0.rst

@@ -272,4 +272,5 @@ enclose it with quotation marks::
 Bugs
 -----
 
-- Fixed the bug where keyword name would be prefixed with continuation marks (``...``) if name was longer than line length limit (#494)
+- Keyword name will no longer be prefixed with continuation marks (``...``) if name was longer than line length limit (#494)
+- It is now safe to use Tasks sections with ``MergeAndOrderSections`` transformer with Robot Framework 6.0+ (#490)

robotidy/decorators.py

@@ -27,7 +27,7 @@ def wrapper(*args, **kwargs):
                 "\nFatal exception occurred. You can create an issue at "
                 "https://github.com/MarketSquare/robotframework-tidy/issues . Thanks!"
             )
-            err.args = (err.args[0] + message,) + err.args[1:]
+            err.args = (str(err.args[0]) + message,) + err.args[1:]
             raise err
 
     return wrapper

robotidy/transformers/MergeAndOrderSections.py

@@ -68,6 +68,7 @@ def parse_order(self, order):
             Token.SETTING_HEADER,
             Token.VARIABLE_HEADER,
             Token.TESTCASE_HEADER,
+            "TASK HEADER",
             Token.KEYWORD_HEADER,
         )
         if not order:
@@ -82,19 +83,31 @@ def parse_order(self, order):
             "variable": Token.VARIABLE_HEADER,
             "testcases": Token.TESTCASE_HEADER,
             "testcase": Token.TESTCASE_HEADER,
+            "tasks": "TASK HEADER",
+            "task": "TASK HEADER",
             "keywords": Token.KEYWORD_HEADER,
             "keyword": Token.KEYWORD_HEADER,
         }
         parsed_order = [self.LANGUAGE_MARKER_SECTION]
         for part in parts:
             parsed_order.append(map_names.get(part, None))
-        if any(header not in parsed_order for header in default_order):
+        # all sections need to be here, and either tasks or test cases or both of them
+        any_of_sections = [Token.TESTCASE_HEADER, "TASK HEADER"]
+        required_sections = [section for section in default_order if section not in any_of_sections]
+        if (
+            # unexpected section names
+            any(header not in default_order for header in parsed_order)
+            # missing required section
+            or any(req_section not in parsed_order for req_section in required_sections)
+            # we need either task, test or both in parsing order
+            or not any(any_section in parsed_order for any_section in any_of_sections)
+        ):
             raise InvalidParameterValueError(
                 self.__class__.__name__,
                 "order",
                 order,
                 "Custom order should be provided in comma separated list with all section names:\n"
-                "order=comments,settings,variables,testcases,variables",
+                "order=comments,settings,variables,testcases,tasks,variables",
             )
         return parsed_order
 
@@ -181,8 +194,6 @@ def get_section_type(self, section):
         )
         if section.header:
             name_token = section.header.get_token(*header_tokens)
-            if name_token.type == "TASK HEADER":
-                return Token.TESTCASE_HEADER
             return name_token.type
         if Config and any(isinstance(child, Config) for child in section.body):
             return self.LANGUAGE_MARKER_SECTION

tests/atest/transformers/MergeAndOrderSections/expected/both_test_and_task_rf6.robot

@@ -0,0 +1,14 @@
+*** Comments ***
+i am comment
+*** Test Case ***
+Test 1
+    IF  ${condition}
+        Log  stuff
+    END
+
+*** Task ***
+Task 1
+    IF  ${condition}
+        Log  stuff
+    END
+

tests/atest/transformers/MergeAndOrderSections/test_merge_and_order_sections.py

@@ -10,7 +10,10 @@ def test_merging_and_ordering(self):
         self.compare(source="tests.robot")
 
     def test_both_test_and_task(self):
-        self.compare(source="both_test_and_task.robot")
+        self.compare(source="both_test_and_task.robot", target_version="<6")
+
+    def test_both_test_and_task_rf6(self):
+        self.compare(source="both_test_and_task.robot", expected="both_test_and_task_rf6.robot", target_version=">=6")
 
     def test_multiple_header_comments(self):
         self.compare(source="multiple_header_comments.robot")
@@ -64,7 +67,7 @@ def test_invalid_order_parameter(self, parameter):
         expected_output = (
             f"Error: {self.TRANSFORMER_NAME}: Invalid 'order' parameter value: '{parameter}'. "
             "Custom order should be provided in comma separated list with all section names:\n"
-            "order=comments,settings,variables,testcases,variables\n"
+            "order=comments,settings,variables,testcases,tasks,variables\n"
         )
         assert expected_output == result.output
 

tests/packages/stable6/requirements.txt

@@ -1 +1 @@
-robotframework==6.0
+robotframework==6.0.2