final

airgun/entities/contentview_new.py

@@ -40,7 +40,8 @@ def search(self, value):
         self.browser.plugin.ensure_page_safe(timeout='5s')
         view.wait_displayed()
         if not view.table.is_displayed:
-            return None  # no table present, no CVs in this org
+            # no table present, no CVs in this Org
+            return None
         return view.search(value)
 
     def publish(self, entity_name, values=None, promote=False, lce=None):
@@ -329,10 +330,11 @@ class PublishContentViewVersion(NavigateStep):
 
     def prerequisite(self, *args, **kwargs):
         """Open Content View first."""
-        return self.navigate_to(self.obj, 'Edit', entity_name=kwargs.get('entity_name'))
+        return self.navigate_to(self.obj, 'Edit', entity_name=kwargs.get('entity_name'), timeout=20)
 
     def step(self, *args, **kwargs):
         """Click 'Publish new version' button"""
+        self.parent.publish.wait_displayed()
         self.parent.publish.click()
 
 
@@ -351,5 +353,7 @@ def prerequisite(self, *args, **kwargs):
 
     def step(self, *args, **kwargs):
         version_name = kwargs.get('version_name')
+        self.parent.versions.wait_displayed()
         self.parent.versions.search(version_name)
+        self.parent.version.table.wait_displayed()
         self.parent.versions.table[0][7].widget.item_select('Promote')