From dbff8c68a9dee6939827ec0997e8a3755197f855 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Thu, 26 Oct 2023 16:30:06 +0200 Subject: [PATCH 01/15] fix: handle multivalue in dropdown, related tests --- .../components/dropdown.py | 31 ++++++ .../Splunk_TA_UCCExample/globalConfig.json | 98 +++++++++++++++++++ tests/ui/Example_UccLib/input_page.py | 58 +++++++++++ ...st_splunk_ta_example_addon_input_common.py | 61 ++++++++++++ 4 files changed, 248 insertions(+) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index 2c16efa8..865d1953 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -100,6 +100,37 @@ def select(self, value): return True else: raise ValueError("{} not found in select list".format(value)) + + def select_nested(self, values): + """ + Selects the values we want from the type list in defined order + :param values: Dropdown values list in order we want to select + :return: Returns True if successful, otherwise raises an error + """ + if not isinstance(values, list): + raise ValueError("{} has to be of type list".format(value)) + + self.add_input.click() + popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") + dropdown_selector = ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' + for value in values: + found = False + self.elements.update( + { + "dropdown_options": Selector( + select=popoverid + + dropdown_selector + ) + } + ) + for each in self.get_elements("dropdown_options"): + if each.text.strip().lower() == value.lower(): + found = True + each.click() + break + if not found: + raise ValueError("{} not found in select list".format(value)) + return True def select_input_type(self, value, open_dropdown=True): """ diff --git a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json index 10bd09c2..094bd855 100644 --- a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json +++ b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json @@ -870,9 +870,107 @@ } ], "title": "Example Input Two" + }, + { + "name": "example_input_three", + "restHandlerName": "splunk_ta_uccexample_rh_three_custom", + "entity": [ + { + "type": "text", + "label": "Name", + "validators": [ + { + "type": "regex", + "errorMsg": "Input Name must begin with a letter and consist exclusively of alphanumeric characters and underscores.", + "pattern": "^[a-zA-Z]\\w*$" + }, + { + "type": "string", + "errorMsg": "Length of input name should be between 1 and 100", + "minLength": 1, + "maxLength": 100 + } + ], + "field": "name", + "help": "A unique name for the data input.", + "required": true + }, + { + "type": "text", + "label": "Interval", + "validators": [ + { + "type": "regex", + "errorMsg": "Interval must be an integer.", + "pattern": "^\\-[1-9]\\d*$|^\\d*$" + } + ], + "field": "interval", + "help": "Time interval of the data input, in seconds.", + "required": true + } + ], + "title": "Example Input Three" + }, + { + "name": "example_input_four", + "restHandlerModule": "splunk_ta_uccexample_custom_rh", + "restHandlerClass": "CustomRestHandler", + "entity": [ + { + "type": "text", + "label": "Name", + "validators": [ + { + "type": "regex", + "errorMsg": "Input Name must begin with a letter and consist exclusively of alphanumeric characters and underscores.", + "pattern": "^[a-zA-Z]\\w*$" + }, + { + "type": "string", + "errorMsg": "Length of input name should be between 1 and 100", + "minLength": 1, + "maxLength": 100 + } + ], + "field": "name", + "help": "A unique name for the data input.", + "required": true + }, + { + "type": "text", + "label": "Interval", + "validators": [ + { + "type": "regex", + "errorMsg": "Interval must be an integer.", + "pattern": "^\\-[1-9]\\d*$|^\\d*$" + } + ], + "field": "interval", + "help": "Time interval of the data input, in seconds.", + "required": true + } + ], + "title": "Example Input Four" } ], "title": "Inputs", + "groupsMenu": [ + { + "groupName": "example_input_one", + "groupTitle": "Example Input One" + }, + { + "groupName": "example_input_two", + "groupTitle": "Example Input Two" + }, + { + "groupName": "group_one", + "groupTitle": "Group One", + "groupServices": ["example_input_three", "example_input_four"] + } + ], "description": "Manage your data inputs", "table": { "actions": [ diff --git a/tests/ui/Example_UccLib/input_page.py b/tests/ui/Example_UccLib/input_page.py index 41452d3b..8befefe2 100644 --- a/tests/ui/Example_UccLib/input_page.py +++ b/tests/ui/Example_UccLib/input_page.py @@ -193,6 +193,58 @@ def __init__(self, browser, container): ) self.title = BaseComponent(browser, Selector(select=' [data-test="title"]')) +class ExampleInputThree(Entity): + """ + Form to configure a new Input + """ + + def __init__(self, browser, container): + """ + :param browser: The selenium webdriver + :param container: The container in which the entity is located in + """ + add_btn = Button( + browser, Selector(select=container.select + ' [id="addInputBtn"]') + ) + entity_container = Selector(select=' [data-test="modal"]') + + super().__init__(browser, entity_container, add_btn=add_btn) + + # Controls + self.name = TextBox( + browser, Selector(select='[data-test="control-group"][data-name="name"]') + ) + self.interval = TextBox( + browser, + Selector(select=' [data-test="control-group"][data-name="interval"]'), + ) + +class ExampleInputFour(Entity): + """ + Form to configure a new Input + """ + + def __init__(self, browser, container): + """ + :param browser: The selenium webdriver + :param container: The container in which the entity is located in + """ + add_btn = Button( + browser, Selector(select=container.select + ' [id="addInputBtn"]') + ) + entity_container = Selector(select=' [data-test="modal"]') + + super().__init__(browser, entity_container, add_btn=add_btn) + + # Controls + self.name = TextBox( + browser, Selector(select='[data-test="control-group"][data-name="name"]') + ) + self.interval = TextBox( + browser, + Selector(select=' [data-test="control-group"][data-name="interval"]'), + ) + class InputPage(Page): """ @@ -237,6 +289,12 @@ def __init__( self.entity2 = ExampleInputTwo( ucc_smartx_selenium_helper.browser, input_container ) + self.entity3 = ExampleInputThree( + ucc_smartx_selenium_helper.browser, input_container + ) + self.entity4 = ExampleInputFour( + ucc_smartx_selenium_helper.browser, input_container + ) self.pagination = Dropdown( ucc_smartx_selenium_helper.browser, Selector(select=".dropdownPage") ) diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index 00d5143a..1a6cff2e 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -343,3 +343,64 @@ def test_inputs_title_and_description( self.assert_util( input_page.description.wait_to_display, "Manage your data inputs" ) + + @pytest.mark.execute_enterprise_cloud_true + @pytest.mark.forwarder + @pytest.mark.input + def test_inputs_create_new_input_list_nested_values( + self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper + ): + """Verifies input list dropdown after multivalue select""" + input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) + value_to_test = [ + "Example Input Three", + "Example Input Four", + ] + input_page.create_new_input.select("Group One") + self.assert_util( + input_page.create_new_input.get_inputs_list, value_to_test + ) + + @pytest.mark.execute_enterprise_cloud_true + @pytest.mark.forwarder + @pytest.mark.input + def test_inputs_create_new_input_list_nested_values_back( + self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper + ): + """Verifies Back button after dropdown multivalue select""" + input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) + value_to_test = [ + "Example Input One", + "Example Input Two", + "Group One" + ] + input_page.create_new_input.select_nested(["Group One", "Back"]) + self.assert_util( + input_page.create_new_input.get_inputs_list, value_to_test + ) + + @pytest.mark.execute_enterprise_cloud_true + @pytest.mark.forwarder + @pytest.mark.input + def test_inputs_create_new_input_from_nested_value( + self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper + ): + """Verifies input creations after nested value select""" + input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) + group_one_list = [ + "Example Input Three", + "Example Input Four", + ] + input_page.create_new_input.select_nested(["Group One", "Example Input Three"]) + input_page.entity3.name.set_value("input_three") + input_page.entity3.interval.set_value("50") + input_page.entity3.save() + value_to_test = { + "account": "dummy_input_three", + "interval": "50", + } + backend_stanza = input_page.backend_conf.get_stanza( + "example_input_three://dummy_input_three" + ) + for each_key, each_value in value_to_test.items(): + self.assert_util(each_value, backend_stanza[each_key]) From 2dc4a8161436e63a9627fef5237322c6a2e57a28 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Thu, 26 Oct 2023 16:37:45 +0200 Subject: [PATCH 02/15] test: fix test cases --- .../ui/test_splunk_ta_example_addon_input_common.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index 1a6cff2e..fbc7750d 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -244,7 +244,7 @@ def test_inputs_create_new_input_list_values( ): """Verifies input list dropdown""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - create_new_input_list = ["Example Input One", "Example Input Two"] + create_new_input_list = ["Example Input One", "Example Input Two", "Group One"] self.assert_util( input_page.create_new_input.get_inputs_list, create_new_input_list ) @@ -261,7 +261,7 @@ def test_inputs_input_type_list_values( ): """Verifies input type filter list""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - type_filter_list = ["All", "Example Input One", "Example Input Two"] + type_filter_list = ["All", "Example Input One", "Example Input Two", "Example Input Three", "Example Input Four"] self.assert_util(input_page.type_filter.get_input_type_list, type_filter_list) input_page.type_filter.select_input_type( "Example Input One", open_dropdown=False @@ -269,6 +269,10 @@ def test_inputs_input_type_list_values( self.assert_util(input_page.table.get_row_count, 1) input_page.type_filter.select_input_type("Example Input Two") self.assert_util(input_page.table.get_row_count, 1) + input_page.type_filter.select_input_type("Example Input Three") + self.assert_util(input_page.table.get_row_count, 0) + input_page.type_filter.select_input_type("Example Input Four") + self.assert_util(input_page.table.get_row_count, 0) @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @@ -350,7 +354,7 @@ def test_inputs_title_and_description( def test_inputs_create_new_input_list_nested_values( self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper ): - """Verifies input list dropdown after multivalue select""" + """Verifies input list dropdown after multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) value_to_test = [ "Example Input Three", @@ -367,7 +371,7 @@ def test_inputs_create_new_input_list_nested_values( def test_inputs_create_new_input_list_nested_values_back( self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper ): - """Verifies Back button after dropdown multivalue select""" + """Verifies Back button after dropdown multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) value_to_test = [ "Example Input One", From ce878912e47b20f1108f718eb81471bb604fcf50 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Thu, 26 Oct 2023 16:39:20 +0200 Subject: [PATCH 03/15] chore: fix precommit --- .../components/dropdown.py | 57 +++++++++---------- tests/ui/Example_UccLib/input_page.py | 4 +- ...st_splunk_ta_example_addon_input_common.py | 28 +++++---- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index 865d1953..d1a0da87 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -100,37 +100,34 @@ def select(self, value): return True else: raise ValueError("{} not found in select list".format(value)) - + def select_nested(self, values): - """ - Selects the values we want from the type list in defined order - :param values: Dropdown values list in order we want to select - :return: Returns True if successful, otherwise raises an error - """ - if not isinstance(values, list): - raise ValueError("{} has to be of type list".format(value)) - - self.add_input.click() - popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") - dropdown_selector = ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' - for value in values: - found = False - self.elements.update( - { - "dropdown_options": Selector( - select=popoverid - + dropdown_selector - ) - } - ) - for each in self.get_elements("dropdown_options"): - if each.text.strip().lower() == value.lower(): - found = True - each.click() - break - if not found: - raise ValueError("{} not found in select list".format(value)) - return True + """ + Selects the values we want from the type list in defined order + :param values: Dropdown values list in order we want to select + :return: Returns True if successful, otherwise raises an error + """ + if not isinstance(values, list): + raise ValueError("{} has to be of type list".format(value)) + + self.add_input.click() + popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") + dropdown_selector = ( + ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' + ) + for value in values: + found = False + self.elements.update( + {"dropdown_options": Selector(select=popoverid + dropdown_selector)} + ) + for each in self.get_elements("dropdown_options"): + if each.text.strip().lower() == value.lower(): + found = True + each.click() + break + if not found: + raise ValueError("{} not found in select list".format(value)) + return True def select_input_type(self, value, open_dropdown=True): """ diff --git a/tests/ui/Example_UccLib/input_page.py b/tests/ui/Example_UccLib/input_page.py index 8befefe2..08b6ed5f 100644 --- a/tests/ui/Example_UccLib/input_page.py +++ b/tests/ui/Example_UccLib/input_page.py @@ -193,6 +193,7 @@ def __init__(self, browser, container): ) self.title = BaseComponent(browser, Selector(select=' [data-test="title"]')) + class ExampleInputThree(Entity): """ Form to configure a new Input @@ -218,7 +219,8 @@ def __init__(self, browser, container): browser, Selector(select=' [data-test="control-group"][data-name="interval"]'), ) - + + class ExampleInputFour(Entity): """ Form to configure a new Input diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index fbc7750d..4ee8c900 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -261,7 +261,13 @@ def test_inputs_input_type_list_values( ): """Verifies input type filter list""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - type_filter_list = ["All", "Example Input One", "Example Input Two", "Example Input Three", "Example Input Four"] + type_filter_list = [ + "All", + "Example Input One", + "Example Input Two", + "Example Input Three", + "Example Input Four", + ] self.assert_util(input_page.type_filter.get_input_type_list, type_filter_list) input_page.type_filter.select_input_type( "Example Input One", open_dropdown=False @@ -347,7 +353,7 @@ def test_inputs_title_and_description( self.assert_util( input_page.description.wait_to_display, "Manage your data inputs" ) - + @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @pytest.mark.input @@ -361,10 +367,8 @@ def test_inputs_create_new_input_list_nested_values( "Example Input Four", ] input_page.create_new_input.select("Group One") - self.assert_util( - input_page.create_new_input.get_inputs_list, value_to_test - ) - + self.assert_util(input_page.create_new_input.get_inputs_list, value_to_test) + @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @pytest.mark.input @@ -373,16 +377,10 @@ def test_inputs_create_new_input_list_nested_values_back( ): """Verifies Back button after dropdown multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - value_to_test = [ - "Example Input One", - "Example Input Two", - "Group One" - ] + value_to_test = ["Example Input One", "Example Input Two", "Group One"] input_page.create_new_input.select_nested(["Group One", "Back"]) - self.assert_util( - input_page.create_new_input.get_inputs_list, value_to_test - ) - + self.assert_util(input_page.create_new_input.get_inputs_list, value_to_test) + @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @pytest.mark.input From b023a480914a9941047504a68136b97af68afc90 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Thu, 26 Oct 2023 16:30:06 +0200 Subject: [PATCH 04/15] fix: handle multivalue in dropdown, related tests --- .../components/dropdown.py | 31 ++++++ .../Splunk_TA_UCCExample/globalConfig.json | 98 +++++++++++++++++++ tests/ui/Example_UccLib/input_page.py | 58 +++++++++++ ...st_splunk_ta_example_addon_input_common.py | 61 ++++++++++++ 4 files changed, 248 insertions(+) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index 2c16efa8..865d1953 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -100,6 +100,37 @@ def select(self, value): return True else: raise ValueError("{} not found in select list".format(value)) + + def select_nested(self, values): + """ + Selects the values we want from the type list in defined order + :param values: Dropdown values list in order we want to select + :return: Returns True if successful, otherwise raises an error + """ + if not isinstance(values, list): + raise ValueError("{} has to be of type list".format(value)) + + self.add_input.click() + popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") + dropdown_selector = ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' + for value in values: + found = False + self.elements.update( + { + "dropdown_options": Selector( + select=popoverid + + dropdown_selector + ) + } + ) + for each in self.get_elements("dropdown_options"): + if each.text.strip().lower() == value.lower(): + found = True + each.click() + break + if not found: + raise ValueError("{} not found in select list".format(value)) + return True def select_input_type(self, value, open_dropdown=True): """ diff --git a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json index 10bd09c2..094bd855 100644 --- a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json +++ b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json @@ -870,9 +870,107 @@ } ], "title": "Example Input Two" + }, + { + "name": "example_input_three", + "restHandlerName": "splunk_ta_uccexample_rh_three_custom", + "entity": [ + { + "type": "text", + "label": "Name", + "validators": [ + { + "type": "regex", + "errorMsg": "Input Name must begin with a letter and consist exclusively of alphanumeric characters and underscores.", + "pattern": "^[a-zA-Z]\\w*$" + }, + { + "type": "string", + "errorMsg": "Length of input name should be between 1 and 100", + "minLength": 1, + "maxLength": 100 + } + ], + "field": "name", + "help": "A unique name for the data input.", + "required": true + }, + { + "type": "text", + "label": "Interval", + "validators": [ + { + "type": "regex", + "errorMsg": "Interval must be an integer.", + "pattern": "^\\-[1-9]\\d*$|^\\d*$" + } + ], + "field": "interval", + "help": "Time interval of the data input, in seconds.", + "required": true + } + ], + "title": "Example Input Three" + }, + { + "name": "example_input_four", + "restHandlerModule": "splunk_ta_uccexample_custom_rh", + "restHandlerClass": "CustomRestHandler", + "entity": [ + { + "type": "text", + "label": "Name", + "validators": [ + { + "type": "regex", + "errorMsg": "Input Name must begin with a letter and consist exclusively of alphanumeric characters and underscores.", + "pattern": "^[a-zA-Z]\\w*$" + }, + { + "type": "string", + "errorMsg": "Length of input name should be between 1 and 100", + "minLength": 1, + "maxLength": 100 + } + ], + "field": "name", + "help": "A unique name for the data input.", + "required": true + }, + { + "type": "text", + "label": "Interval", + "validators": [ + { + "type": "regex", + "errorMsg": "Interval must be an integer.", + "pattern": "^\\-[1-9]\\d*$|^\\d*$" + } + ], + "field": "interval", + "help": "Time interval of the data input, in seconds.", + "required": true + } + ], + "title": "Example Input Four" } ], "title": "Inputs", + "groupsMenu": [ + { + "groupName": "example_input_one", + "groupTitle": "Example Input One" + }, + { + "groupName": "example_input_two", + "groupTitle": "Example Input Two" + }, + { + "groupName": "group_one", + "groupTitle": "Group One", + "groupServices": ["example_input_three", "example_input_four"] + } + ], "description": "Manage your data inputs", "table": { "actions": [ diff --git a/tests/ui/Example_UccLib/input_page.py b/tests/ui/Example_UccLib/input_page.py index 41452d3b..8befefe2 100644 --- a/tests/ui/Example_UccLib/input_page.py +++ b/tests/ui/Example_UccLib/input_page.py @@ -193,6 +193,58 @@ def __init__(self, browser, container): ) self.title = BaseComponent(browser, Selector(select=' [data-test="title"]')) +class ExampleInputThree(Entity): + """ + Form to configure a new Input + """ + + def __init__(self, browser, container): + """ + :param browser: The selenium webdriver + :param container: The container in which the entity is located in + """ + add_btn = Button( + browser, Selector(select=container.select + ' [id="addInputBtn"]') + ) + entity_container = Selector(select=' [data-test="modal"]') + + super().__init__(browser, entity_container, add_btn=add_btn) + + # Controls + self.name = TextBox( + browser, Selector(select='[data-test="control-group"][data-name="name"]') + ) + self.interval = TextBox( + browser, + Selector(select=' [data-test="control-group"][data-name="interval"]'), + ) + +class ExampleInputFour(Entity): + """ + Form to configure a new Input + """ + + def __init__(self, browser, container): + """ + :param browser: The selenium webdriver + :param container: The container in which the entity is located in + """ + add_btn = Button( + browser, Selector(select=container.select + ' [id="addInputBtn"]') + ) + entity_container = Selector(select=' [data-test="modal"]') + + super().__init__(browser, entity_container, add_btn=add_btn) + + # Controls + self.name = TextBox( + browser, Selector(select='[data-test="control-group"][data-name="name"]') + ) + self.interval = TextBox( + browser, + Selector(select=' [data-test="control-group"][data-name="interval"]'), + ) + class InputPage(Page): """ @@ -237,6 +289,12 @@ def __init__( self.entity2 = ExampleInputTwo( ucc_smartx_selenium_helper.browser, input_container ) + self.entity3 = ExampleInputThree( + ucc_smartx_selenium_helper.browser, input_container + ) + self.entity4 = ExampleInputFour( + ucc_smartx_selenium_helper.browser, input_container + ) self.pagination = Dropdown( ucc_smartx_selenium_helper.browser, Selector(select=".dropdownPage") ) diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index 00d5143a..1a6cff2e 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -343,3 +343,64 @@ def test_inputs_title_and_description( self.assert_util( input_page.description.wait_to_display, "Manage your data inputs" ) + + @pytest.mark.execute_enterprise_cloud_true + @pytest.mark.forwarder + @pytest.mark.input + def test_inputs_create_new_input_list_nested_values( + self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper + ): + """Verifies input list dropdown after multivalue select""" + input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) + value_to_test = [ + "Example Input Three", + "Example Input Four", + ] + input_page.create_new_input.select("Group One") + self.assert_util( + input_page.create_new_input.get_inputs_list, value_to_test + ) + + @pytest.mark.execute_enterprise_cloud_true + @pytest.mark.forwarder + @pytest.mark.input + def test_inputs_create_new_input_list_nested_values_back( + self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper + ): + """Verifies Back button after dropdown multivalue select""" + input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) + value_to_test = [ + "Example Input One", + "Example Input Two", + "Group One" + ] + input_page.create_new_input.select_nested(["Group One", "Back"]) + self.assert_util( + input_page.create_new_input.get_inputs_list, value_to_test + ) + + @pytest.mark.execute_enterprise_cloud_true + @pytest.mark.forwarder + @pytest.mark.input + def test_inputs_create_new_input_from_nested_value( + self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper + ): + """Verifies input creations after nested value select""" + input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) + group_one_list = [ + "Example Input Three", + "Example Input Four", + ] + input_page.create_new_input.select_nested(["Group One", "Example Input Three"]) + input_page.entity3.name.set_value("input_three") + input_page.entity3.interval.set_value("50") + input_page.entity3.save() + value_to_test = { + "account": "dummy_input_three", + "interval": "50", + } + backend_stanza = input_page.backend_conf.get_stanza( + "example_input_three://dummy_input_three" + ) + for each_key, each_value in value_to_test.items(): + self.assert_util(each_value, backend_stanza[each_key]) From 08d2501ee6f020a4d791fd0cf476157de0cdffdc Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Thu, 26 Oct 2023 16:37:45 +0200 Subject: [PATCH 05/15] test: fix test cases --- .../ui/test_splunk_ta_example_addon_input_common.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index 1a6cff2e..fbc7750d 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -244,7 +244,7 @@ def test_inputs_create_new_input_list_values( ): """Verifies input list dropdown""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - create_new_input_list = ["Example Input One", "Example Input Two"] + create_new_input_list = ["Example Input One", "Example Input Two", "Group One"] self.assert_util( input_page.create_new_input.get_inputs_list, create_new_input_list ) @@ -261,7 +261,7 @@ def test_inputs_input_type_list_values( ): """Verifies input type filter list""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - type_filter_list = ["All", "Example Input One", "Example Input Two"] + type_filter_list = ["All", "Example Input One", "Example Input Two", "Example Input Three", "Example Input Four"] self.assert_util(input_page.type_filter.get_input_type_list, type_filter_list) input_page.type_filter.select_input_type( "Example Input One", open_dropdown=False @@ -269,6 +269,10 @@ def test_inputs_input_type_list_values( self.assert_util(input_page.table.get_row_count, 1) input_page.type_filter.select_input_type("Example Input Two") self.assert_util(input_page.table.get_row_count, 1) + input_page.type_filter.select_input_type("Example Input Three") + self.assert_util(input_page.table.get_row_count, 0) + input_page.type_filter.select_input_type("Example Input Four") + self.assert_util(input_page.table.get_row_count, 0) @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @@ -350,7 +354,7 @@ def test_inputs_title_and_description( def test_inputs_create_new_input_list_nested_values( self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper ): - """Verifies input list dropdown after multivalue select""" + """Verifies input list dropdown after multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) value_to_test = [ "Example Input Three", @@ -367,7 +371,7 @@ def test_inputs_create_new_input_list_nested_values( def test_inputs_create_new_input_list_nested_values_back( self, ucc_smartx_selenium_helper, ucc_smartx_rest_helper ): - """Verifies Back button after dropdown multivalue select""" + """Verifies Back button after dropdown multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) value_to_test = [ "Example Input One", From 74e9f31351a2d568801da7c6d663133831bcbe9d Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Thu, 26 Oct 2023 16:39:20 +0200 Subject: [PATCH 06/15] chore: fix precommit --- .../components/dropdown.py | 57 +++++++++---------- tests/ui/Example_UccLib/input_page.py | 4 +- ...st_splunk_ta_example_addon_input_common.py | 28 +++++---- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index 865d1953..d1a0da87 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -100,37 +100,34 @@ def select(self, value): return True else: raise ValueError("{} not found in select list".format(value)) - + def select_nested(self, values): - """ - Selects the values we want from the type list in defined order - :param values: Dropdown values list in order we want to select - :return: Returns True if successful, otherwise raises an error - """ - if not isinstance(values, list): - raise ValueError("{} has to be of type list".format(value)) - - self.add_input.click() - popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") - dropdown_selector = ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' - for value in values: - found = False - self.elements.update( - { - "dropdown_options": Selector( - select=popoverid - + dropdown_selector - ) - } - ) - for each in self.get_elements("dropdown_options"): - if each.text.strip().lower() == value.lower(): - found = True - each.click() - break - if not found: - raise ValueError("{} not found in select list".format(value)) - return True + """ + Selects the values we want from the type list in defined order + :param values: Dropdown values list in order we want to select + :return: Returns True if successful, otherwise raises an error + """ + if not isinstance(values, list): + raise ValueError("{} has to be of type list".format(value)) + + self.add_input.click() + popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") + dropdown_selector = ( + ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' + ) + for value in values: + found = False + self.elements.update( + {"dropdown_options": Selector(select=popoverid + dropdown_selector)} + ) + for each in self.get_elements("dropdown_options"): + if each.text.strip().lower() == value.lower(): + found = True + each.click() + break + if not found: + raise ValueError("{} not found in select list".format(value)) + return True def select_input_type(self, value, open_dropdown=True): """ diff --git a/tests/ui/Example_UccLib/input_page.py b/tests/ui/Example_UccLib/input_page.py index 8befefe2..08b6ed5f 100644 --- a/tests/ui/Example_UccLib/input_page.py +++ b/tests/ui/Example_UccLib/input_page.py @@ -193,6 +193,7 @@ def __init__(self, browser, container): ) self.title = BaseComponent(browser, Selector(select=' [data-test="title"]')) + class ExampleInputThree(Entity): """ Form to configure a new Input @@ -218,7 +219,8 @@ def __init__(self, browser, container): browser, Selector(select=' [data-test="control-group"][data-name="interval"]'), ) - + + class ExampleInputFour(Entity): """ Form to configure a new Input diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index fbc7750d..4ee8c900 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -261,7 +261,13 @@ def test_inputs_input_type_list_values( ): """Verifies input type filter list""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - type_filter_list = ["All", "Example Input One", "Example Input Two", "Example Input Three", "Example Input Four"] + type_filter_list = [ + "All", + "Example Input One", + "Example Input Two", + "Example Input Three", + "Example Input Four", + ] self.assert_util(input_page.type_filter.get_input_type_list, type_filter_list) input_page.type_filter.select_input_type( "Example Input One", open_dropdown=False @@ -347,7 +353,7 @@ def test_inputs_title_and_description( self.assert_util( input_page.description.wait_to_display, "Manage your data inputs" ) - + @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @pytest.mark.input @@ -361,10 +367,8 @@ def test_inputs_create_new_input_list_nested_values( "Example Input Four", ] input_page.create_new_input.select("Group One") - self.assert_util( - input_page.create_new_input.get_inputs_list, value_to_test - ) - + self.assert_util(input_page.create_new_input.get_inputs_list, value_to_test) + @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @pytest.mark.input @@ -373,16 +377,10 @@ def test_inputs_create_new_input_list_nested_values_back( ): """Verifies Back button after dropdown multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) - value_to_test = [ - "Example Input One", - "Example Input Two", - "Group One" - ] + value_to_test = ["Example Input One", "Example Input Two", "Group One"] input_page.create_new_input.select_nested(["Group One", "Back"]) - self.assert_util( - input_page.create_new_input.get_inputs_list, value_to_test - ) - + self.assert_util(input_page.create_new_input.get_inputs_list, value_to_test) + @pytest.mark.execute_enterprise_cloud_true @pytest.mark.forwarder @pytest.mark.input From bd4b2c190e49780f024a516d9543b1f7d7b5b5dc Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 12:33:16 +0100 Subject: [PATCH 07/15] chore: fix globalconfig --- tests/testdata/Splunk_TA_UCCExample/globalConfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json index 094bd855..a9cfaa61 100644 --- a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json +++ b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json @@ -873,7 +873,6 @@ }, { "name": "example_input_three", - "restHandlerName": "splunk_ta_uccexample_rh_three_custom", "entity": [ { "type": "text", From 2ae8e614e6731096cd06910b7ecf10c9235bec76 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 12:54:13 +0100 Subject: [PATCH 08/15] chore: bump ucc-framework to 5.32.0 --- poetry.lock | 188 ++----------------------------------------------- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 185 deletions(-) diff --git a/poetry.lock b/poetry.lock index 25574ef0..05b64a8d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -22,21 +22,6 @@ files = [ {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"}, ] -[[package]] -name = "arrow" -version = "1.2.3" -description = "Better dates & times for Python" -optional = false -python-versions = ">=3.6" -files = [ - {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"}, - {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"}, -] - -[package.dependencies] -python-dateutil = ">=2.7.0" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - [[package]] name = "attrs" version = "23.1.0" @@ -72,20 +57,6 @@ files = [ [package.dependencies] pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} -[[package]] -name = "binaryornot" -version = "0.4.4" -description = "Ultra-lightweight pure Python package to check if a file is binary or text." -optional = false -python-versions = "*" -files = [ - {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"}, - {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"}, -] - -[package.dependencies] -chardet = ">=3.0.2" - [[package]] name = "certifi" version = "2023.7.22" @@ -97,17 +68,6 @@ files = [ {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, ] -[[package]] -name = "chardet" -version = "5.2.0" -description = "Universal encoding detector for Python 3" -optional = false -python-versions = ">=3.7" -files = [ - {file = "chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"}, - {file = "chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7"}, -] - [[package]] name = "charset-normalizer" version = "3.2.0" @@ -192,21 +152,6 @@ files = [ {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, ] -[[package]] -name = "click" -version = "8.1.7" -description = "Composable command line interface toolkit" -optional = false -python-versions = ">=3.7" -files = [ - {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, - {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - [[package]] name = "colorama" version = "0.4.6" @@ -218,27 +163,6 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -[[package]] -name = "cookiecutter" -version = "2.3.0" -description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template." -optional = false -python-versions = ">=3.7" -files = [ - {file = "cookiecutter-2.3.0-py3-none-any.whl", hash = "sha256:7e87944757c6e9f8729cf89a4139b6a35ab4d6dcbc6ae3e7d6360d44ad3ad383"}, - {file = "cookiecutter-2.3.0.tar.gz", hash = "sha256:942a794981747f6d7f439d6e49d39dc91a9a641283614160c93c474c72c29621"}, -] - -[package.dependencies] -arrow = "*" -binaryornot = ">=0.4.4" -click = ">=7.0,<9.0.0" -Jinja2 = ">=2.7,<4.0.0" -python-slugify = ">=4.0.0" -pyyaml = ">=5.3.1" -requests = ">=2.23.0" -rich = "*" - [[package]] name = "cssselect" version = "1.2.0" @@ -615,31 +539,6 @@ html5 = ["html5lib"] htmlsoup = ["BeautifulSoup4"] source = ["Cython (>=0.29.35)"] -[[package]] -name = "markdown-it-py" -version = "2.2.0" -description = "Python port of markdown-it. Markdown parsing, done right!" -optional = false -python-versions = ">=3.7" -files = [ - {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"}, - {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"}, -] - -[package.dependencies] -mdurl = ">=0.1,<1.0" -typing_extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} - -[package.extras] -benchmarking = ["psutil", "pytest", "pytest-benchmark"] -code-style = ["pre-commit (>=3.0,<4.0)"] -compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "mistletoe (>=1.0,<2.0)", "mistune (>=2.0,<3.0)", "panflute (>=2.3,<3.0)"] -linkify = ["linkify-it-py (>=1,<3)"] -plugins = ["mdit-py-plugins"] -profiling = ["gprof2dot"] -rtd = ["attrs", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"] -testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] - [[package]] name = "markupsafe" version = "2.1.3" @@ -667,16 +566,6 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -709,17 +598,6 @@ files = [ {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"}, ] -[[package]] -name = "mdurl" -version = "0.1.2" -description = "Markdown URL utilities" -optional = false -python-versions = ">=3.7" -files = [ - {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, - {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, -] - [[package]] name = "msedge-selenium-tools" version = "3.141.4" @@ -1034,23 +912,6 @@ files = [ [package.extras] cli = ["click (>=5.0)"] -[[package]] -name = "python-slugify" -version = "8.0.1" -description = "A Python slugify application that also handles Unicode" -optional = false -python-versions = ">=3.7" -files = [ - {file = "python-slugify-8.0.1.tar.gz", hash = "sha256:ce0d46ddb668b3be82f4ed5e503dbc33dd815d83e2eb6824211310d3fb172a27"}, - {file = "python_slugify-8.0.1-py2.py3-none-any.whl", hash = "sha256:70ca6ea68fe63ecc8fa4fcf00ae651fc8a5d02d93dcd12ae6d4fc7ca46c4d395"}, -] - -[package.dependencies] -text-unidecode = ">=1.3" - -[package.extras] -unidecode = ["Unidecode (>=1.1.1)"] - [[package]] name = "pytz" version = "2023.3.post1" @@ -1074,7 +935,6 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, - {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -1082,15 +942,8 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, - {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, - {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, - {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, - {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1107,7 +960,6 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, - {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1115,7 +967,6 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, - {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -1142,25 +993,6 @@ urllib3 = ">=1.21.1,<3" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] -[[package]] -name = "rich" -version = "13.5.2" -description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "rich-13.5.2-py3-none-any.whl", hash = "sha256:146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808"}, - {file = "rich-13.5.2.tar.gz", hash = "sha256:fb9d6c0a0f643c99eed3875b5377a184132ba9be4d61516a55273d3554d75a39"}, -] - -[package.dependencies] -markdown-it-py = ">=2.2.0" -pygments = ">=2.13.0,<3.0.0" -typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9\""} - -[package.extras] -jupyter = ["ipywidgets (>=7.5.1,<9)"] - [[package]] name = "selenium" version = "3.141.0" @@ -1393,18 +1225,17 @@ test = ["pytest"] [[package]] name = "splunk-add-on-ucc-framework" -version = "5.28.6" +version = "5.32.0" description = "Splunk Add-on SDK formerly UCC is a build and code generation framework" optional = false python-versions = ">=3.7,<4.0" files = [ - {file = "splunk_add_on_ucc_framework-5.28.6-py3-none-any.whl", hash = "sha256:a98f4a1fd21580d0a040e9ecc7cea6ecde2d7b11dc7200995c724ef8ceef5dac"}, - {file = "splunk_add_on_ucc_framework-5.28.6.tar.gz", hash = "sha256:870a9d014ebe985a9af8143e0f4f21540d968a07e00ec49b4b406148e180f490"}, + {file = "splunk_add_on_ucc_framework-5.32.0-py3-none-any.whl", hash = "sha256:cc3ad7f3f1f4c734aadfbf07067703085ca004e2c636b1756385f700fe7e538a"}, + {file = "splunk_add_on_ucc_framework-5.32.0.tar.gz", hash = "sha256:fcadad146ab2a5effc54d222e7c972e724e996077c1600caf8fc390643f6e8cd"}, ] [package.dependencies] addonfactory-splunk-conf-parser-lib = ">=0.3.3,<0.4.0" -cookiecutter = ">=2.1.1,<3.0.0" defusedxml = ">=0.7.1,<0.8.0" dunamai = ">=1.9.0,<2.0.0" jinja2 = ">=2,<4" @@ -1440,17 +1271,6 @@ defusedxml = ">=0.7.1,<0.8.0" httplib2 = ">=0.20.0" splunk-sdk = ">=1.6.20" -[[package]] -name = "text-unidecode" -version = "1.3" -description = "The most basic Text::Unidecode port" -optional = false -python-versions = "*" -files = [ - {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"}, - {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"}, -] - [[package]] name = "tomli" version = "2.0.1" @@ -1553,4 +1373,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.7" -content-hash = "3add4fe46e9d99c0dc41230a04c21bca44eb07a7178fe923c70d284cf767e597" +content-hash = "4b59f39070ba8f13f7969c9505ec166ad60ddd6ec08477673e1ebe905c0eb190" diff --git a/pyproject.toml b/pyproject.toml index de7d6e9b..cb65f5b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ pytest = ">=5.4, <7.3" Sphinx = "*" sphinx_rtd_theme = "*" sphinx-panels = "*" -splunk-add-on-ucc-framework = "^5.28.5" +splunk-add-on-ucc-framework = "5.32.0" pytest-rerunfailures = "^12.0" [build-system] From df9eb9f3712cdec813dd5656bc918919896cbb1a Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 13:07:37 +0100 Subject: [PATCH 09/15] chore: align globalconfig --- tests/testdata/Splunk_TA_UCCExample/globalConfig.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json index a9cfaa61..b1c3ff20 100644 --- a/tests/testdata/Splunk_TA_UCCExample/globalConfig.json +++ b/tests/testdata/Splunk_TA_UCCExample/globalConfig.json @@ -913,8 +913,6 @@ }, { "name": "example_input_four", - "restHandlerModule": "splunk_ta_uccexample_custom_rh", - "restHandlerClass": "CustomRestHandler", "entity": [ { "type": "text", From 1d3e1364392a5c4d3f6b0cf02e59051fb431449d Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 14:09:11 +0100 Subject: [PATCH 10/15] chore: revert ucc-framework bump --- poetry.lock | 168 +++++++++++++++++++++++++++++++++++++++++++++++-- pyproject.toml | 2 +- 2 files changed, 165 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 05b64a8d..5cdd28bb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -22,6 +22,21 @@ files = [ {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"}, ] +[[package]] +name = "arrow" +version = "1.2.3" +description = "Better dates & times for Python" +optional = false +python-versions = ">=3.6" +files = [ + {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"}, + {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"}, +] + +[package.dependencies] +python-dateutil = ">=2.7.0" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + [[package]] name = "attrs" version = "23.1.0" @@ -57,6 +72,20 @@ files = [ [package.dependencies] pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} +[[package]] +name = "binaryornot" +version = "0.4.4" +description = "Ultra-lightweight pure Python package to check if a file is binary or text." +optional = false +python-versions = "*" +files = [ + {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"}, + {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"}, +] + +[package.dependencies] +chardet = ">=3.0.2" + [[package]] name = "certifi" version = "2023.7.22" @@ -68,6 +97,17 @@ files = [ {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, ] +[[package]] +name = "chardet" +version = "5.2.0" +description = "Universal encoding detector for Python 3" +optional = false +python-versions = ">=3.7" +files = [ + {file = "chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"}, + {file = "chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7"}, +] + [[package]] name = "charset-normalizer" version = "3.2.0" @@ -152,6 +192,21 @@ files = [ {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, ] +[[package]] +name = "click" +version = "8.1.7" +description = "Composable command line interface toolkit" +optional = false +python-versions = ">=3.7" +files = [ + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + [[package]] name = "colorama" version = "0.4.6" @@ -163,6 +218,27 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] +[[package]] +name = "cookiecutter" +version = "2.4.0" +description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template." +optional = false +python-versions = ">=3.7" +files = [ + {file = "cookiecutter-2.4.0-py3-none-any.whl", hash = "sha256:8344663028abc08ec09b912e663636a97e1775bffe973425ec0107431acd390e"}, + {file = "cookiecutter-2.4.0.tar.gz", hash = "sha256:6d1494e66a784f23324df9d593f3e43af3db4f4b926b9e49e6ff060169fc042a"}, +] + +[package.dependencies] +arrow = "*" +binaryornot = ">=0.4.4" +click = ">=7.0,<9.0.0" +Jinja2 = ">=2.7,<4.0.0" +python-slugify = ">=4.0.0" +pyyaml = ">=5.3.1" +requests = ">=2.23.0" +rich = "*" + [[package]] name = "cssselect" version = "1.2.0" @@ -539,6 +615,31 @@ html5 = ["html5lib"] htmlsoup = ["BeautifulSoup4"] source = ["Cython (>=0.29.35)"] +[[package]] +name = "markdown-it-py" +version = "2.2.0" +description = "Python port of markdown-it. Markdown parsing, done right!" +optional = false +python-versions = ">=3.7" +files = [ + {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"}, + {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"}, +] + +[package.dependencies] +mdurl = ">=0.1,<1.0" +typing_extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} + +[package.extras] +benchmarking = ["psutil", "pytest", "pytest-benchmark"] +code-style = ["pre-commit (>=3.0,<4.0)"] +compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "mistletoe (>=1.0,<2.0)", "mistune (>=2.0,<3.0)", "panflute (>=2.3,<3.0)"] +linkify = ["linkify-it-py (>=1,<3)"] +plugins = ["mdit-py-plugins"] +profiling = ["gprof2dot"] +rtd = ["attrs", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"] +testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] + [[package]] name = "markupsafe" version = "2.1.3" @@ -598,6 +699,17 @@ files = [ {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"}, ] +[[package]] +name = "mdurl" +version = "0.1.2" +description = "Markdown URL utilities" +optional = false +python-versions = ">=3.7" +files = [ + {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, + {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, +] + [[package]] name = "msedge-selenium-tools" version = "3.141.4" @@ -912,6 +1024,23 @@ files = [ [package.extras] cli = ["click (>=5.0)"] +[[package]] +name = "python-slugify" +version = "8.0.1" +description = "A Python slugify application that also handles Unicode" +optional = false +python-versions = ">=3.7" +files = [ + {file = "python-slugify-8.0.1.tar.gz", hash = "sha256:ce0d46ddb668b3be82f4ed5e503dbc33dd815d83e2eb6824211310d3fb172a27"}, + {file = "python_slugify-8.0.1-py2.py3-none-any.whl", hash = "sha256:70ca6ea68fe63ecc8fa4fcf00ae651fc8a5d02d93dcd12ae6d4fc7ca46c4d395"}, +] + +[package.dependencies] +text-unidecode = ">=1.3" + +[package.extras] +unidecode = ["Unidecode (>=1.1.1)"] + [[package]] name = "pytz" version = "2023.3.post1" @@ -993,6 +1122,25 @@ urllib3 = ">=1.21.1,<3" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] +[[package]] +name = "rich" +version = "13.6.0" +description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" +optional = false +python-versions = ">=3.7.0" +files = [ + {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"}, + {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"}, +] + +[package.dependencies] +markdown-it-py = ">=2.2.0" +pygments = ">=2.13.0,<3.0.0" +typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9\""} + +[package.extras] +jupyter = ["ipywidgets (>=7.5.1,<9)"] + [[package]] name = "selenium" version = "3.141.0" @@ -1225,17 +1373,18 @@ test = ["pytest"] [[package]] name = "splunk-add-on-ucc-framework" -version = "5.32.0" +version = "5.28.5" description = "Splunk Add-on SDK formerly UCC is a build and code generation framework" optional = false python-versions = ">=3.7,<4.0" files = [ - {file = "splunk_add_on_ucc_framework-5.32.0-py3-none-any.whl", hash = "sha256:cc3ad7f3f1f4c734aadfbf07067703085ca004e2c636b1756385f700fe7e538a"}, - {file = "splunk_add_on_ucc_framework-5.32.0.tar.gz", hash = "sha256:fcadad146ab2a5effc54d222e7c972e724e996077c1600caf8fc390643f6e8cd"}, + {file = "splunk_add_on_ucc_framework-5.28.5-py3-none-any.whl", hash = "sha256:3172cd78d64643ff16705fd8c12f804256ff4e33992bb6c976216adeef041f6d"}, + {file = "splunk_add_on_ucc_framework-5.28.5.tar.gz", hash = "sha256:5a72ea0839203598853e81247e40a0bd7bcbeb9343d673453c810c6906670bb5"}, ] [package.dependencies] addonfactory-splunk-conf-parser-lib = ">=0.3.3,<0.4.0" +cookiecutter = ">=2.1.1,<3.0.0" defusedxml = ">=0.7.1,<0.8.0" dunamai = ">=1.9.0,<2.0.0" jinja2 = ">=2,<4" @@ -1271,6 +1420,17 @@ defusedxml = ">=0.7.1,<0.8.0" httplib2 = ">=0.20.0" splunk-sdk = ">=1.6.20" +[[package]] +name = "text-unidecode" +version = "1.3" +description = "The most basic Text::Unidecode port" +optional = false +python-versions = "*" +files = [ + {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"}, + {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"}, +] + [[package]] name = "tomli" version = "2.0.1" @@ -1373,4 +1533,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.7" -content-hash = "4b59f39070ba8f13f7969c9505ec166ad60ddd6ec08477673e1ebe905c0eb190" +content-hash = "71f1aa5a6f6be97606af9308d0e0c4bb492af32bdea4586540ee4e5412965414" diff --git a/pyproject.toml b/pyproject.toml index cb65f5b0..7cd26dfc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ pytest = ">=5.4, <7.3" Sphinx = "*" sphinx_rtd_theme = "*" sphinx-panels = "*" -splunk-add-on-ucc-framework = "5.32.0" +splunk-add-on-ucc-framework = "5.28.5" pytest-rerunfailures = "^12.0" [build-system] From e4d6e2e7328243a6221d2ea14e4446b96c62c8cc Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 16:42:31 +0100 Subject: [PATCH 11/15] chore: fix select_nested and related tests --- .../components/dropdown.py | 16 ++++++---------- .../test_splunk_ta_example_addon_input_common.py | 6 ++++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index d1a0da87..29a9603a 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -14,13 +14,8 @@ # limitations under the License. # -import re import time - -from selenium.common import exceptions from selenium.webdriver.common.by import By -from selenium.webdriver.common.keys import Keys - from .base_component import BaseComponent, Selector @@ -90,7 +85,7 @@ def select(self, value): { "values": Selector( select=popoverid - + ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' + + ' [data-test="item"] [data-test="label"]' ) } ) @@ -108,12 +103,12 @@ def select_nested(self, values): :return: Returns True if successful, otherwise raises an error """ if not isinstance(values, list): - raise ValueError("{} has to be of type list".format(value)) + raise ValueError("{} has to be of type list".format(values)) self.add_input.click() popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") dropdown_selector = ( - ' [data-test="item"]:not([data-test-selected="true"]) [data-test="label"]' + ' [data-test="item"] [data-test="label"]' ) for value in values: found = False @@ -124,16 +119,17 @@ def select_nested(self, values): if each.text.strip().lower() == value.lower(): found = True each.click() + time.sleep(1) break if not found: raise ValueError("{} not found in select list".format(value)) - return True + return True def select_input_type(self, value, open_dropdown=True): """ Selects the input type option that the user specifies in value :param value: The value in which we want to select - :param open_dropdown: Whether or not the dropdown should be opened + :param open_dropdown: Whether the dropdown should be opened :return: Returns True if successful, otherwise raises an error """ if open_dropdown: diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index 4ee8c900..30c3cdf2 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -363,6 +363,7 @@ def test_inputs_create_new_input_list_nested_values( """Verifies input list dropdown after multilevel select""" input_page = InputPage(ucc_smartx_selenium_helper, ucc_smartx_rest_helper) value_to_test = [ + "Back", "Example Input Three", "Example Input Four", ] @@ -394,12 +395,13 @@ def test_inputs_create_new_input_from_nested_value( "Example Input Four", ] input_page.create_new_input.select_nested(["Group One", "Example Input Three"]) - input_page.entity3.name.set_value("input_three") + input_page.entity3.name.set_value("dummy_input_three") input_page.entity3.interval.set_value("50") input_page.entity3.save() value_to_test = { - "account": "dummy_input_three", + "index": "default", "interval": "50", + "disabled": False } backend_stanza = input_page.backend_conf.get_stanza( "example_input_three://dummy_input_three" From d1ff493e4dd44387c53c1832737dd6182f090e15 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 16:49:17 +0100 Subject: [PATCH 12/15] chore: pre-commit fixes --- pytest_splunk_addon_ui_smartx/components/dropdown.py | 4 +--- tests/ui/test_splunk_ta_example_addon_input_common.py | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index 5f31826c..ab5d332d 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -108,9 +108,7 @@ def select_nested(self, values): self.add_input.click() popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") - dropdown_selector = ( - ' [data-test="item"] [data-test="label"]' - ) + dropdown_selector = ' [data-test="item"] [data-test="label"]' for value in values: found = False self.elements.update( diff --git a/tests/ui/test_splunk_ta_example_addon_input_common.py b/tests/ui/test_splunk_ta_example_addon_input_common.py index 30c3cdf2..4da6cd0d 100644 --- a/tests/ui/test_splunk_ta_example_addon_input_common.py +++ b/tests/ui/test_splunk_ta_example_addon_input_common.py @@ -398,11 +398,7 @@ def test_inputs_create_new_input_from_nested_value( input_page.entity3.name.set_value("dummy_input_three") input_page.entity3.interval.set_value("50") input_page.entity3.save() - value_to_test = { - "index": "default", - "interval": "50", - "disabled": False - } + value_to_test = {"index": "default", "interval": "50", "disabled": False} backend_stanza = input_page.backend_conf.get_stanza( "example_input_three://dummy_input_three" ) From cbc82367eda74fd2c89da0d26011ba9c33854aaf Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 17:07:39 +0100 Subject: [PATCH 13/15] chore: add explanation for sleep() in dropdown --- pytest_splunk_addon_ui_smartx/components/dropdown.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index ab5d332d..b174d2f4 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -118,7 +118,7 @@ def select_nested(self, values): if each.text.strip().lower() == value.lower(): found = True each.click() - time.sleep(1) + time.sleep(1) #sleep here prevents broken animation resulting in unclicable button break if not found: raise ValueError("{} not found in select list".format(value)) From 2321702e69e06c1c8d89d7c65db426bacc5e5941 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 17:18:36 +0100 Subject: [PATCH 14/15] chore: pre-commit fixes --- pytest_splunk_addon_ui_smartx/components/dropdown.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index b174d2f4..402960f5 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -118,7 +118,9 @@ def select_nested(self, values): if each.text.strip().lower() == value.lower(): found = True each.click() - time.sleep(1) #sleep here prevents broken animation resulting in unclicable button + time.sleep( + 1 + ) # sleep here prevents broken animation resulting in unclicable button break if not found: raise ValueError("{} not found in select list".format(value)) From cfd0073ef83818e7fd15ff8b6e43c3eb3ce20a15 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 18:00:25 +0100 Subject: [PATCH 15/15] chore: align to removed add_input key with root key --- pytest_splunk_addon_ui_smartx/components/dropdown.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytest_splunk_addon_ui_smartx/components/dropdown.py b/pytest_splunk_addon_ui_smartx/components/dropdown.py index 402960f5..e978ce25 100644 --- a/pytest_splunk_addon_ui_smartx/components/dropdown.py +++ b/pytest_splunk_addon_ui_smartx/components/dropdown.py @@ -106,8 +106,8 @@ def select_nested(self, values): if not isinstance(values, list): raise ValueError("{} has to be of type list".format(values)) - self.add_input.click() - popoverid = "#" + self.add_input.get_attribute("data-test-popover-id") + self.root.click() + popoverid = "#" + self.root.get_attribute("data-test-popover-id") dropdown_selector = ' [data-test="item"] [data-test="label"]' for value in values: found = False