diff --git a/cfme/tests/services/test_dialog_element_in_catalog.py b/cfme/tests/services/test_dialog_element_in_catalog.py index db261be48c..852b1313bd 100644 --- a/cfme/tests/services/test_dialog_element_in_catalog.py +++ b/cfme/tests/services/test_dialog_element_in_catalog.py @@ -1194,3 +1194,38 @@ def test_dynamic_dropdown_refresh_load(appliance, import_datastore, import_data, matched_patterns=['We are in B'], failure_patterns=["We are in A"]).waiting(timeout=120): view.fields(ele_label).dropdown.fill("b") + + +@pytest.mark.meta(automates=[1614436]) +@pytest.mark.customer_scenario +@pytest.mark.parametrize( + "import_data", [DatastoreImport("bz_1614436.zip", "bz_1614436", None)], ids=["domain"], ) +@pytest.mark.parametrize("file_name", ["bz_1614436.yml"], ids=["dialog"]) +def test_dynamic_dialog_field_to_static_field(appliance, import_datastore, + generic_catalog_item_with_imported_dialog): + """ + Bugzilla: + 1614436 + Polarion: + assignee: nansari + casecomponent: Services + testtype: functional + initialEstimate: 1/4h + startsin: 5.10 + """ + auto_log = '/var/www/miq/vmdb/log/automation.log' + catalog_item, sd, ele_label = generic_catalog_item_with_imported_dialog + service_catalogs = ServiceCatalogs(appliance, catalog_item.catalog, catalog_item.name) + + navigate_to(sd, "Edit") + # update dynamic field to static + view = appliance.browser.create_view(EditElementView) + view.element.edit_element(ele_label) + view.element_information.dynamic_chkbox.fill(False) + view.ele_save_button.click() + view.save_button.click() + + # Text area field should not be loaded in automation log + with LogValidator(auto_log, failure_patterns=["TEXT AREA REFRESH DIALOG"] + ).waiting(timeout=120): + navigate_to(service_catalogs, "Order") diff --git a/cfme/tests/services/test_service_catalog_dialog_manual.py b/cfme/tests/services/test_service_catalog_dialog_manual.py index 6fa8fc232b..497f5f55d5 100644 --- a/cfme/tests/services/test_service_catalog_dialog_manual.py +++ b/cfme/tests/services/test_service_catalog_dialog_manual.py @@ -125,66 +125,6 @@ def test_request_filter_on_request_page(): pass -@pytest.mark.manual -@pytest.mark.tier(3) -def test_edit_catalog_item_after_remove_resource_pool(): - """ Create catalog item with a resource pool , Remove resource pool from - the provider and then edit catalog item. - Polarion: - assignee: nansari - casecomponent: Services - testtype: functional - initialEstimate: 1/8h - startsin: 5.5 - tags: service - testSteps: - 1. Create a catalog item - 2. Select cluster and resource pool and Save - 3. Remove resource pool from provider - 4. Edit catalog - expectedResults: - 1. - 2. - 3. - 4. Validation message should be shown - """ - pass - - -@pytest.mark.manual -@pytest.mark.tier(3) -def test_dialog_dropdown_ui_values_in_the_dropdown_should_be_visible_in_edit_mode(): - """ - Polarion: - assignee: nansari - casecomponent: Services - testtype: functional - initialEstimate: 1/16h - startsin: 5.9 - tags: service - Bugzilla: - 1557508 - """ - pass - - -@pytest.mark.manual -@pytest.mark.tier(3) -def test_triggered_refresh_shouldnt_occurs_for_dialog_after_changing_type_to_static(): - """ Triggered Refresh shouldn't Occurs for Dialog After Changing Type to Static - Polarion: - assignee: nansari - casecomponent: Services - testtype: functional - initialEstimate: 1/4h - startsin: 5.9 - tags: service - Bugzilla: - 1614436 - """ - pass - - @pytest.mark.manual @pytest.mark.tier(3) def test_default_dialog_entries_should_localized_when_ordering_catalog_item_in_french(): @@ -200,54 +140,3 @@ def test_default_dialog_entries_should_localized_when_ordering_catalog_item_in_f 1592573 """ pass - - -@pytest.mark.manual -@pytest.mark.tier(2) -def test_in_dynamic_dropdown_list_the_default_value_should_not_contain_all_the_value_of_the_list(): - """ - Polarion: - assignee: nansari - casecomponent: Services - testtype: functional - initialEstimate: 1/4h - startsin: 5.10 - tags: service - Bugzilla: - 1568440 - """ - pass - - -@pytest.mark.manual -@pytest.mark.tier(2) -def test_user_should_be_able_to_change_the_order_of_values_of_the_drop_down_list(): - """ - Polarion: - assignee: nansari - initialEstimate: 1/16h - casecomponent: Services - testtype: functional - startsin: 5.10 - tags: service - Bugzilla: - 1594301 - """ - pass - - -@pytest.mark.manual -@pytest.mark.tier(3) -def test_entries_shouldnt_be_mislabeled_for_dropdown_element_in_dialog_editor(): - """ - Polarion: - assignee: nansari - casecomponent: Services - initialEstimate: 1/16h - testtype: functional - startsin: 5.10 - tags: service - Bugzilla: - 1597802 - """ - pass diff --git a/cfme/tests/ssui/test_ssui_service_catalogs.py b/cfme/tests/ssui/test_ssui_service_catalogs.py index db00a1b298..ebec0d3a35 100644 --- a/cfme/tests/ssui/test_ssui_service_catalogs.py +++ b/cfme/tests/ssui/test_ssui_service_catalogs.py @@ -50,21 +50,6 @@ def test_service_catalog_crud_ssui(appliance, setup_provider, service.order() -@pytest.mark.manual -@pytest.mark.tier(2) -def test_ssui_myservice_myrequests_and_service_catalog_filter_links(): - """ Check Filter Links of all pages - Polarion: - assignee: nansari - casecomponent: SelfServiceUI - testtype: functional - initialEstimate: 1/8h - startsin: 5.5 - tags: ssui - """ - pass - - @pytest.mark.manual @pytest.mark.tier(3) def test_ssui_test_all_language_translations(): @@ -125,23 +110,6 @@ def test_ssui_disable_notification(request, appliance, user_self_service_role, assert view.alert.read() == "Shopping cart is empty." -@pytest.mark.manual -@pytest.mark.tier(2) -def test_in_ssui_portal_reconfigure_service_should_shows_available_provisioning_dialog(): - """ - Polarion: - assignee: nansari - casecomponent: SelfServiceUI - testtype: functional - initialEstimate: 1/2h - startsin: 5.9 - tags: ssui - Bugzilla: - 1633453 - """ - pass - - @pytest.mark.tier(1) def test_refresh_ssui_page(appliance, generic_service): """ @@ -163,23 +131,6 @@ def test_refresh_ssui_page(appliance, generic_service): assert view.is_displayed -@pytest.mark.manual -@pytest.mark.tier(3) -def test_able_to_access_openstack_instance_console_from_self_service_portal(): - """ - Polarion: - assignee: nansari - casecomponent: SelfServiceUI - initialEstimate: 1/2h - testtype: functional - startsin: 5.9 - tags: ssui - Bugzilla: - 1624573 - """ - pass - - @pytest.mark.manual @pytest.mark.tier(2) def test_notifications_should_appear_in_sui_after_enableing_embedded_ansible_role(): @@ -246,21 +197,6 @@ def test_disabling_dashboard_under_service_ui_for_a_role_shall_disable_the_dashb pass -@pytest.mark.manual -@pytest.mark.tier(3) -def test_sui_order_and_request_should_be_sorted_by_time(): - """ - Polarion: - assignee: nansari - casecomponent: SelfServiceUI - testtype: functional - initialEstimate: 1/4h - startsin: 5.8 - tags: ssui - """ - pass - - @pytest.mark.manual @pytest.mark.tier(3) def test_sui_create_snapshot_when_no_provider_is_connected():