feat: add changes for SUI-5 support in UCC (#454)

ADDON-78814: changes to support Splunk UI 5.

Author: hetangmodi-crest

.github/workflows/build-test-release.yaml

@@ -1,3 +1,5 @@
+name: CI/CD
+
 on:
   push:
     branches:
@@ -24,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - id: matrix
-        uses: splunk/addonfactory-test-matrix-action@v1.10
+        uses: splunk/addonfactory-test-matrix-action@v3.0.6
 
   fossa-scan:
     continue-on-error: true
@@ -90,7 +92,8 @@ jobs:
     name: build
     runs-on: ubuntu-22.04
     needs:
-      - fossa-scan
+      # marking fossa-scan as optional due to pre-existing failures
+      # - fossa-scan
       - compliance-copyrights
       - pre-commit
       - run-unit-tests

pytest_splunk_addon_ui_smartx/components/controls/checkbox.py

@@ -56,7 +56,7 @@ def __init__(self, browser, container, searchable=True):
                     ),
                     "checkbox_btn": Selector(
                         select=container.select
-                        + ' [data-test="button"][role="checkbox"]'
+                        + ' div[data-test="controls"] button[role="checkbox"]'
                     ),
                 }
             )

pytest_splunk_addon_ui_smartx/components/controls/single_select.py

@@ -15,6 +15,7 @@
 #
 
 from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.common.by import By
 
 from ..base_component import Selector
 from .base_control import BaseControl
@@ -198,6 +199,11 @@ def get_value(self):
             if self.root.get_attribute(
                 "data-test-loading"
             ) == "false" and self.root.get_attribute("data-test-value"):
+                nested_span_element = self.root.find_element(
+                    By.CSS_SELECTOR, "span > span"
+                )
+                if nested_span_element:
+                    return nested_span_element.text
                 return self.root.get_attribute("label")
             else:
                 return False

pytest_splunk_addon_ui_smartx/components/entity.py

@@ -62,7 +62,9 @@ def __init__(self, browser, container, add_btn=None, is_single_page=False):
         )
         self.cancel_btn = Button(
             browser,
-            Selector(select=container.select + ' [data-test="button"][label="Cancel"]'),
+            Selector(
+                by=By.XPATH, select='//span[@data-test="label" and text()="Cancel"]'
+            ),
         )
         self.close_btn = Button(
             browser, Selector(select=container.select + ' button[data-test="close"]')

pytest_splunk_addon_ui_smartx/components/input_table.py

@@ -40,8 +40,9 @@ def __init__(self, browser, container, mapping={}):
         self.elements.update(
             {
                 "switch_button_status": Selector(select='[data-disabled="true"]'),
+                # It works as both selectors never exist simultaneously, if it does new_selector will get picked.
                 "status_toggle": Selector(
-                    select='button[data-test="button"][role="switch"]'
+                    select='button[data-test="toggle"][role="switch"], button[data-test="button"][role="switch"]'
                 ),
                 "switch_to_page": Selector(
                     select=container.select + " [data-test-page]"

pytest_splunk_addon_ui_smartx/components/table.py

@@ -73,9 +73,13 @@ def __init__(self, browser, container, mapping=dict(), wait_for_seconds=10):
                 "search": Selector(select=".searchBtn"),
                 "delete": Selector(select=".deleteBtn"),
                 "delete_prompt": Selector(select=".deletePrompt"),  # [data-test="body"]
-                "delete_btn": Selector(select='[data-test="button"][label="Delete"]'),
+                "delete_btn": Selector(
+                    by=By.XPATH,
+                    select='//button[@data-test="button" and .//span[text()="Delete"]]',
+                ),
                 "delete_cancel": Selector(
-                    select='[data-test="button"][label="Cancel"]'
+                    by=By.XPATH,
+                    select='//button[@data-test="button" and .//span[text()="Cancel"]]',
                 ),
                 "delete_close": Selector(select='[data-test="close"]'),
                 "delete_loading": Selector(select='button[data-test="wait-spinner"]'),
@@ -126,11 +130,7 @@ def get_headers(self):
             :return: Generator for Str list The headers in the table
         """
         headers = []
-        GET_PARENT_ELEMENT = (
-            "var parent = arguments[0].firstChild.firstChild;if(parent.hasChildNodes()){var r='';var C=parent.childNodes;"
-            "for(var n=0;n<C.length;n++){if(C[n].nodeType==Node.TEXT_NODE){r+=' '+C[n].nodeValue}}"
-            "return r.trim()}else{return parent.innerText}"
-        )
+        GET_PARENT_ELEMENT = "return arguments[0].innerText.trim();"
         for each in self.get_elements("header"):
             parent_text = self.browser.execute_script(GET_PARENT_ELEMENT, each)
             headers.append(parent_text)

tests/ui/test_splunk_ta_example_addon_input_1.py

@@ -1269,17 +1269,22 @@ def test_inputs_textarea_height(
         """
         input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper)
         input_page.table.edit_row("dummy_input_one")
-        min_textarea_height = 71
-        max_textarea_height = 311
+        # adding two different heights for different Splunk versions
+        min_textarea_height = [61, 71]
+        max_textarea_height = [301, 311]
         long_input = ""
         self.assert_util(
-            min_textarea_height, input_page.entity1.text_area.get_textarea_height
+            left=input_page.entity1.text_area.get_textarea_height,
+            right=min_textarea_height,
+            operator="in",
         )
         for i in range(1, 50):
             long_input += f"{str(i)}\n"
         input_page.entity1.text_area.append_value(long_input)
         self.assert_util(
-            max_textarea_height, input_page.entity1.text_area.get_textarea_height
+            left=input_page.entity1.text_area.get_textarea_height,
+            right=max_textarea_height,
+            operator="in",
         )
 
     @pytest.mark.execute_enterprise_cloud_true