From 62a4c40afad3a6e41b1e9ba3d56134c37572c5db Mon Sep 17 00:00:00 2001
From: Churikova Tetiana <churikova.tm@gmail.com>
Date: Tue, 23 Aug 2022 17:14:56 +0200
Subject: [PATCH] e2e: report fixes

---
 test/appium/support/github_report.py   |  8 +++-----
 test/appium/support/testrail_report.py |  4 ++--
 test/appium/views/base_view.py         | 11 +++++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/test/appium/support/github_report.py b/test/appium/support/github_report.py
index f14d9ea2ec..0e30871ea0 100644
--- a/test/appium/support/github_report.py
+++ b/test/appium/support/github_report.py
@@ -120,7 +120,7 @@ class GithubHtmlReport(BaseTestReport):
         for step in last_testrun.steps:
             test_steps_html.append("<div>%s</div>" % step)
         if last_testrun.error:
-            error = last_testrun.error[:255]
+            error = last_testrun.error
             if test_steps_html:
                 html += "<p>"
                 html += "<blockquote>"
@@ -130,13 +130,11 @@ class GithubHtmlReport(BaseTestReport):
                 html += "</p>"
             code_error, no_code_error_str, _ = self.separate_xfail_error(error)
             if no_code_error_str:
-                html += "<code>%s</code>" % code_error
+                html += "\n\n```\n%s\n```\n\n" % code_error
                 html += "<b>%s</b>" % no_code_error_str
             else:
-                html += "<code>%s</code>" % error.replace("[[", "<b>[[").replace("]]", "]]</b>")
+                html += "\n\n```\n%s\n```\n\n" % error.replace("[[", "<b>[[").replace("]]", "]]</b>")
             html += "<br/><br/>"
-        if test.group_name:
-            html += "<p><b>Class: %s</b></p>" % test.group_name
         if last_testrun.jobs:
             html += self.build_device_sessions_html(last_testrun)
         html += "</td></tr>"
diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py
index ad78ec7ef3..45ef42edc5 100644
--- a/test/appium/support/testrail_report.py
+++ b/test/appium/support/testrail_report.py
@@ -249,14 +249,14 @@ class TestrailReport(BaseTestReport):
             if failed_tests:
                 for test in failed_tests:
                     if test.group_name:
-                        group_blocks[test.group_name] = "-------\n## Class: %s:\n" % test.group_name
+                        group_blocks[test.group_name] = "\n-------\n## Class: %s:\n" % test.group_name
                 for test in failed_tests:
                     last_testrun = test.testruns[-1]
                     test_rail_link = self.get_test_result_link(self.run_id, test.testrail_case_id)
                     ids_failed_test.append(test.testrail_case_id)
                     case_title = '\n'
                     case_title += '-------\n'
-                    case_title += "## ID %s: [%s](%s) \n" % (test.testrail_case_id, test.name, test_rail_link)
+                    case_title += "### ID %s: [%s](%s) \n" % (test.testrail_case_id, test.name, test_rail_link)
                     full_error = last_testrun.error[-255:]
                     (code_error, no_code_error_str, issue_id) = self.separate_xfail_error(full_error)
                     if issue_id:
diff --git a/test/appium/views/base_view.py b/test/appium/views/base_view.py
index 7f6d5a7135..32801bfe85 100644
--- a/test/appium/views/base_view.py
+++ b/test/appium/views/base_view.py
@@ -23,7 +23,6 @@ class BackButton(Button):
         return self.navigate()
 
 
-
 class AllowButton(Button):
     def __init__(self, driver):
         super().__init__(driver, translation_id="allow", uppercase=True)
@@ -539,16 +538,16 @@ class BaseView(object):
 
     def get_back_to_home_view(self, times_to_click_on_back_btn=3):
         counter = 0
-        while BackButton(self.driver).is_element_displayed(2) or self.close_button.is_element_displayed(2) or self.navigate_up_button.is_element_displayed(2):
+        while self.back_button.is_element_displayed(2) or self.close_button.is_element_displayed(2) or self.navigate_up_button.is_element_displayed(2):
             try:
                 if counter >= times_to_click_on_back_btn:
                     break
-                if BackButton(self.driver).is_element_displayed(2):
-                    self.back_button.click()
+                if self.back_button.is_element_displayed(2):
+                    self.back_button.click_until_presence_of_element(self.home_button)
                 elif self.close_button.is_element_displayed(2):
-                    self.close_button.click()
+                    self.close_button.click_until_presence_of_element(self.home_button)
                 else:
-                    self.navigate_up_button.click()
+                    self.navigate_up_button.click_until_presence_of_element(self.home_button)
                 counter += 1
             except (NoSuchElementException, TimeoutException):
                 continue