- Removing some repetitive steps inside the "KB - Restricted Visibili…

…ty" tests & adding a helper function for the restricted visibility group removal flow.

playwright_tests/flows/explore_articles_flows/article_flows/edit_article_meta_flow.py

@@ -87,3 +87,10 @@ def edit_article_metadata(self, title=None,
                 super()._click_needs_change_checkbox()
 
         super()._click_on_save_changes_button()
+
+    def _remove_a_restricted_visibility_group(self, group_name=''):
+        if KBArticleRevision.KB_EDIT_METADATA not in super()._get_current_page_url():
+            super()._click_on_edit_article_metadata()
+
+        super()._delete_a_restricted_visibility_group_metadata(group_name)
+        super()._click_on_save_changes_button()

playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py

@@ -45,11 +45,11 @@ def _add_and_select_restrict_visibility_group_metadata(self, group_name: str):
         super()._fill(self.__kb_article_restrict_visibility_field, group_name)
         super()._click(f"//div[@class='option active']/span[text()='{group_name}']")
 
-    def _delete_a_restricted_visibility_group_metadata(self, group_name: str):
-        super()._click(f"//div[@class='item' and text()='{group_name}']/a")
-
-    def _delete_all_restricted_visibility_groups_metadata(self):
-        super()._click(self.__kb_article_restrict_visibility_delete_all_groups)
+    def _delete_a_restricted_visibility_group_metadata(self, group_name=''):
+        if group_name != '':
+            super()._click(f"//div[@class='item' and text()='{group_name}']/a")
+        else:
+            super()._click(self.__kb_article_restrict_visibility_delete_all_groups)
 
     def _get_text_of_title_input_field(self) -> str:
         return super()._get_element_input_value(self.__title_input_field)

playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py

@@ -148,11 +148,11 @@ def test_kb_restricted_visibility_metadata_edit(self, article_url):
                 self.user_secrets_accounts["TEST_ACCOUNT_MODERATOR"]
             ))
             self.navigate_to_link(article_url)
-            self.sumo_pages.kb_article_page._click_on_edit_article_metadata()
             if (self.sumo_pages.kb_article_edit_article_metadata_page
                     ._is_clear_all_restricted_visibility_group_selection_visible()):
-                (self.sumo_pages.kb_article_edit_article_metadata_page
-                    ._clear_all_restricted_visibility_group_selections())
+                self.sumo_pages.edit_article_metadata_flow._remove_a_restricted_visibility_group(
+                    group_name=''
+                )
             self.sumo_pages.edit_article_metadata_flow.edit_article_metadata(
                 single_group=super(
                 ).kb_article_test_data['restricted_visibility_groups'][0]
@@ -176,7 +176,6 @@ def test_kb_restricted_visibility_metadata_edit(self, article_url):
                 self.user_secrets_accounts["TEST_ACCOUNT_MODERATOR"]
             ))
             self.navigate_to_link(article_url)
-            self.sumo_pages.kb_article_page._click_on_edit_article_metadata()
             self.sumo_pages.edit_article_metadata_flow.edit_article_metadata(
                 single_group=super().kb_article_test_data['restricted_visibility_groups'][1]
             )
@@ -208,11 +207,8 @@ def test_kb_restricted_visibility_metadata_edit(self, article_url):
             self.start_existing_session(super().username_extraction_from_email(
                 self.user_secrets_accounts["TEST_ACCOUNT_MODERATOR"]
             ))
-            self.sumo_pages.kb_article_page._click_on_edit_article_metadata()
-            (self.sumo_pages.kb_article_edit_article_metadata_page
-                ._delete_a_restricted_visibility_group_metadata(
-                    super().kb_article_test_data['restricted_visibility_groups'][0]))
-            self.sumo_pages.kb_article_edit_article_metadata_page._click_on_save_changes_button()
+            self.sumo_pages.edit_article_metadata_flow._remove_a_restricted_visibility_group(
+                super().kb_article_test_data['restricted_visibility_groups'][0])
 
         with allure.step("Signing in with an account belonging to the removed group"):
             self.start_existing_session(super().username_extraction_from_email(
@@ -242,11 +238,9 @@ def test_kb_restricted_visibility_metadata_edit(self, article_url):
             self.start_existing_session(super().username_extraction_from_email(
                 self.user_secrets_accounts["TEST_ACCOUNT_MODERATOR"]
             ))
-            self.sumo_pages.kb_article_page._click_on_edit_article_metadata()
-            (self.sumo_pages.kb_article_edit_article_metadata_page
-             ._delete_all_restricted_visibility_groups_metadata())
-            (self.sumo_pages.kb_article_edit_article_metadata_page
-             ._click_on_save_changes_button())
+            self.sumo_pages.edit_article_metadata_flow._remove_a_restricted_visibility_group(
+                group_name=''
+            )
 
         with allure.step("Deleting user session"):
             self.delete_cookies()
@@ -1135,7 +1129,6 @@ def test_whitelisting_a_different_group(self):
         for key, value in self.restricted_kb_articles.items():
             if key.endswith("_url"):
                 self.navigate_to_link(value)
-                self.sumo_pages.kb_article_page._click_on_edit_article_metadata()
                 self.sumo_pages.edit_article_metadata_flow.edit_article_metadata(
                     single_group=super().kb_article_test_data['restricted_visibility_groups'][1]
                 )
@@ -1149,11 +1142,9 @@ def test_removing_all_article_restrictions(self):
         for key, value in self.restricted_kb_articles.items():
             if key.endswith("_url"):
                 self.navigate_to_link(value)
-                self.sumo_pages.kb_article_page._click_on_edit_article_metadata()
-                (self.sumo_pages.kb_article_edit_article_metadata_page
-                 ._delete_all_restricted_visibility_groups_metadata())
-                (self.sumo_pages.kb_article_edit_article_metadata_page
-                 ._click_on_save_changes_button())
+                self.sumo_pages.edit_article_metadata_flow._remove_a_restricted_visibility_group(
+                    group_name=''
+                )
 
     @pytest.mark.restrictedArticleCreation
     def test_create_articles_for_restriction_test(self):