mozilla
diff --git a/‎playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
Lines changed: 13 additions & 27 deletions b/‎playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
Lines changed: 13 additions & 27 deletions
diff --git a/‎playwright_tests/flows/contributor_threads_flows/contributor_threads_flows.py
Lines changed: 7 additions & 4 deletions b/‎playwright_tests/flows/contributor_threads_flows/contributor_threads_flows.py
Lines changed: 7 additions & 4 deletions
@@ -18,26 +18,17 @@ def submit_an_aaq_question(self, **kwargs):
 
     # Submitting an aaq question for a product flow.
     # Mozilla VPN has an extra optional dropdown menu for choosing an operating system.
-    def _submit_an_aaq_question(self,
-                                subject: str,
-                                body: str,
-                                topic_name='',
-                                attach_image=False,
-                                is_premium=False,
-                                email="",
-                                is_loginless=False,
+    def _submit_an_aaq_question(self, subject: str, body: str, topic_name='', attach_image=False,
+                                is_premium=False, email="", is_loginless=False,
                                 expected_locator=None):
         question_subject = ''
         if is_premium:
             self.add_valid_data_to_all_premium_products_aaq_fields(subject, body, is_loginless,
                                                                    email)
         else:
             question_subject = self.add__valid_data_to_all_aaq_fields_without_submitting(
-                subject,
-                topic_name,
-                body,
-                attach_image
-            )
+                subject, topic_name, body, attach_image)
+
         # Submitting the question.
         self.aaq_form_page.click_aaq_form_submit_button(expected_locator=expected_locator)
 
@@ -88,7 +79,9 @@ def add_valid_data_to_all_premium_products_aaq_fields(self, subject: str, body:
                                                           is_loginless: bool, email: str):
         if is_loginless:
             self.aaq_form_page.fill_contact_email_field(email)
+
         self.aaq_form_page.select_random_topic_by_value()
+
         if self.aaq_form_page.is_os_dropdown_menu_visible():
             self.aaq_form_page.select_random_os_by_value()
         self.aaq_form_page.add_text_to_premium_aaq_form_subject_field(subject)
@@ -138,10 +131,8 @@ def _editing_reply_flow(self, reply_body: str, submit_reply=True):
         self.aaq_form_page.clear_the_question_body_textarea_field()
         self.aaq_form_page.add_text_to_aaq_textarea_field(reply_body)
 
-        if submit_reply:
-            self.aaq_form_page.click_on_update_answer_button()
-        else:
-            self.aaq_form_page.click_aaq_form_cancel_button()
+        self.aaq_form_page.click_on_update_answer_button() if submit_reply else (
+            self.aaq_form_page.click_aaq_form_cancel_button())
 
     def delete_question_reply(self, **kwargs):
         return self.utilities.re_call_function_on_error(
@@ -152,22 +143,17 @@ def _delete_question_reply(self, answer_id: str, delete_reply: bool):
         self.question_page.click_on_reply_more_options_button(answer_id)
         self.question_page.click_on_delete_this_post_for_a_certain_reply(answer_id)
 
-        if delete_reply:
-            self.question_page.click_delete_this_question_button()
-        else:
-            self.question_page.click_on_cancel_delete_button()
+        self.question_page.click_delete_this_question_button() if delete_reply else (
+            self.question_page.click_on_cancel_delete_button())
 
     def post_question_reply_flow(self, **kwargs):
         return self.utilities.re_call_function_on_error(
             lambda: self._post_question_reply_flow(**kwargs)
         )
 
-    def _post_question_reply_flow(self,
-                                  repliant_username: str,
-                                  reply='',
-                                  submit_reply=True,
-                                  quoted_reply=False,
-                                  reply_for_id='') -> str:
+    def _post_question_reply_flow(self, repliant_username: str, reply='', submit_reply=True,
+                                  quoted_reply=False, reply_for_id='') -> str:
+
         if quoted_reply:
             self.question_page.click_on_reply_more_options_button(reply_for_id)
             self.question_page.click_on_quote_for_a_certain_reply(reply_for_id)
 
@@ -37,12 +37,15 @@ def post_a_new_thread(self, thread_title: str, thread_body: str, cancel=False) -
         """
         if "/new" not in self.utilities.get_page_url():
             self.forum_discussions_page.click_on_new_thread_button()
+
         self.new_thread_page.fill_title_input_field(thread_title)
         self.new_thread_page.fill_content_textarea_field(thread_body)
-        if cancel:
-            self.new_thread_page.click_on_cancel_button()
-        else:
-            self.new_thread_page.click_on_post_thread_button()
+
+        action = self.new_thread_page.click_on_cancel_button if cancel else (
+            self.new_thread_page.click_on_post_thread_button)
+        action()
+
+        if not cancel:
             return re.search(r'last=(\d+)', self.utilities.get_page_url()).group(1)
 
     def move_thread_to_a_different_forum(self, target_forum: str):