From 468943d6b9ffdb0ce4d1919b969e2df460a3f5d8 Mon Sep 17 00:00:00 2001
From: Sam Bible <sbible@redhat.com>
Date: Wed, 10 Jul 2024 10:28:59 -0500
Subject: [PATCH] Remove pytest reference and change is_displayed

---
 airgun/entities/contentview_new.py | 14 +++++---------
 airgun/views/contentview_new.py    |  3 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/airgun/entities/contentview_new.py b/airgun/entities/contentview_new.py
index 7958815da..1f8f6b9ed 100644
--- a/airgun/entities/contentview_new.py
+++ b/airgun/entities/contentview_new.py
@@ -1,5 +1,4 @@
 from navmazing import NavigateToSibling
-import pytest
 from widgetastic.exceptions import NoSuchElementException
 from widgetastic_patternfly4.dropdown import DropdownItemDisabled
 
@@ -143,15 +142,12 @@ def republish_metadata_error(self, entity_name, version):
         view = self.navigate_to(self, 'Version', entity_name=entity_name, version=version)
         self.browser.plugin.ensure_page_safe(timeout='5s')
         view.wait_displayed()
-        with pytest.raises(DropdownItemDisabled) as error:
+        try:
             view.version_dropdown.item_select('Republish repository metadata')
-        if (
-            'Item "Republish repository metadata" of dropdown ".//div[@data-ouia-component-id="cv-version-header-actions-dropdown"]" is disabled'
-            in error.value.args[0]
-        ):
-            return True
-        else:
-            return 'No error was found, metadata unexpectedly was able to be published.'
+        except DropdownItemDisabled as error:
+            if 'Item "Republish repository metadata"' and 'is disabled' in error.args[0]:
+                return True
+        return 'No error was found, metadata unexpectedly was able to be published.'
 
 
 @navigator.register(NewContentViewEntity, 'All')
diff --git a/airgun/views/contentview_new.py b/airgun/views/contentview_new.py
index 26c9d88fc..5790c9b61 100644
--- a/airgun/views/contentview_new.py
+++ b/airgun/views/contentview_new.py
@@ -354,12 +354,13 @@ class errata(Tab):
     @property
     def is_displayed(self):
         breadcrumb_loaded = self.browser.wait_for_element(self.breadcrumb, exception=False)
+        title_loaded = self.browser.wait_for_element(self.version, exception=False)
         return (
             breadcrumb_loaded
+            and title_loaded
             and len(self.breadcrumb.locations) > LOCATION_NUM
             and self.breadcrumb.locations[0] == 'Content views'
             and self.breadcrumb.locations[2] == 'Versions'
-            and self.promoteButton.is_displayed
         )