Fix ContentView view (SatelliteQE#1734) (SatelliteQE#1734)

There were few minor fixes needed for new contentview view and entities.

    Contentview Views:

1.    version_dropdown = Dropdown(
    locator='.//div[@data-ouia-component-id="cv-version-header-actions-dropdown"]'
    )
    locator was mentioned twice in views which could be confusing.
2.    Fixed lce_selector locator.

    Contentview Entities:

1. Renamed version_name variable to version to maintain consistency in the module.
2. def promote does not handle errors in case incorrect lce or invalid promote happens, added a check for handing and reading the error message.
3. There is no lce variable in views so updated it to lce_selector.
4. Updated class PromoteContentViewVersion in views

Author: shweta83

airgun/entities/contentview_new.py

@@ -262,19 +262,24 @@ def republish_metadata_error(self, entity_name, version):
                 return True
         return 'No error was found, metadata unexpectedly was able to be published.'
 
-    def promote(self, entity_name, version_name, lce_name):
+    def promote(self, entity_name, version, lce_name, err_message=''):
         """Promotes the selected version of content view to given environment.
         :return: dict with new content view version table row; contains keys
         like 'Version', 'Status', 'Environments' etc.
         """
-        view = self.navigate_to(self, 'Promote', entity_name=entity_name, version_name=version_name)
+        view = self.navigate_to(self, 'Promote', entity_name=entity_name, version=version)
         modal = ContentViewVersionPromoteView(self.browser)
         if modal.is_displayed:
-            modal.lce.fill({lce_name: True})
+            modal.lce_selector.fill({lce_name: True})
             modal.promote_btn.click()
+            if err_message:
+                view.flash.wait_displayed()
+                message = view.flash.read()
+                return message
         view = self.navigate_to(self, 'Edit', entity_name=entity_name)
-        view.versions.search(version_name)
-        return view.versions.table.row(version=version_name).read()
+        view.wait_displayed()
+        view.versions.search(version)
+        return view.versions.table.row(version=version).read()
 
     def update(self, entity_name, values):
         """Update existing content view"""
@@ -326,12 +331,12 @@ class EditContentView(NavigateStep):
 
     VIEW = ContentViewEditView
 
-    def prerequisite(self, *args, **kwargs):
-        return self.navigate_to(self.obj, 'All')
+    prerequisite = NavigateToSibling('All')
 
     def step(self, *args, **kwargs):
         entity_name = kwargs.get('entity_name')
-        self.parent.search(entity_name)
+        self.parent.search.search(entity_name)
+        self.parent.table.wait_displayed()
         self.parent.table.row(name=entity_name)['Name'].widget.click()
 
 
@@ -349,6 +354,7 @@ def step(self, *args, **kwargs):
         self.parent.versions.wait_displayed()
         self.parent.versions.search(version)
         self.parent.versions.table.wait_displayed()
+        self.parent.versions.search(version).click()
         self.parent.versions.table.row(version=version)['Version'].widget.click()
 
 
@@ -385,8 +391,8 @@ def prerequisite(self, *args, **kwargs):
         return self.navigate_to(self.obj, 'Edit', entity_name=kwargs.get('entity_name'))
 
     def step(self, *args, **kwargs):
-        version_name = kwargs.get('version_name')
+        version = kwargs.get('version')
         self.parent.versions.wait_displayed()
-        self.parent.versions.search(version_name)
-        self.parent.version.table.wait_displayed()
+        self.parent.versions.search(version)
+        self.parent.versions.table.wait_displayed()
         self.parent.versions.table[0][7].widget.item_select('Promote')

airgun/views/common.py

@@ -1,5 +1,3 @@
-from functools import partial
-
 from selenium.common.exceptions import ElementNotInteractableException
 from widgetastic.widget import (
     Checkbox,
@@ -15,7 +13,7 @@
 from widgetastic_patternfly import BreadCrumb, Tab, TabWithDropdown
 from widgetastic_patternfly4 import Button
 from widgetastic_patternfly4.navigation import Navigation
-from widgetastic_patternfly5 import OptionsMenu
+from widgetastic_patternfly5 import Dropdown as PF5Dropdown
 from widgetastic_patternfly5.ouia import (
     Dropdown as PF5OUIADropdown,
     PatternflyTable,
@@ -336,9 +334,11 @@ class PF5LCECheckSelectorGroup(PF5LCESelectorGroup):
 
 
 # PF5 kebab menu present in table rows
-TableRowKebabMenu = partial(
-    OptionsMenu, './/button[contains(@data-ouia-component-type, "MenuToggle")]/..'
-)
+class TableRowKebabMenu(PF5Dropdown):
+    """Dropdown that supports both PF5 dropdown and menu-toggle kebab buttons."""
+
+    ROOT = '.'
+    TOGGLE = './/button[contains(@class, "pf-v5-c-menu-toggle") and contains(@aria-label, "Kebab toggle")]'
 
 
 class PF5LCEGroup(ParametrizedLocator):

airgun/views/contentview_new.py

@@ -19,7 +19,6 @@
     BaseLoggedInView,
     NewAddRemoveResourcesView,
     PF5LCECheckSelectorGroup,
-    PF5LCESelectorGroup,
     SearchableViewMixinPF4,
     TableRowKebabMenu,
 )
@@ -73,6 +72,7 @@ def is_displayed(self):
 class ContentViewTableView(BaseLoggedInView, SearchableViewMixinPF4):
     title = PF5Text(component_id='cvPageHeaderText')
     create_content_view = PF5Button(component_id='create-content-view')
+    search = PF4Search()
     table = ExpandableTable(
         component_id='content-views-table',
         column_widgets={
@@ -227,6 +227,7 @@ class ContentViewVersionPublishView(BaseLoggedInView):
     close_button = Button('Close')
     progressbar = PF5ProgressBar()
     lce_selector = ParametrizedView.nested(PF5LCECheckSelectorGroup)
+    close = Button('Close')
 
     @property
     def is_displayed(self):
@@ -257,7 +258,7 @@ class ContentViewVersionPromoteView(Modal):
     ROOT = './/div[@data-ouia-component-id="promote-version"]'
 
     description = Text('.//h2[@data-ouia-component-id="description-text-value"]')
-    lce_selector = ParametrizedView.nested(PF5LCESelectorGroup)
+    lce_selector = ParametrizedView.nested(PF5LCECheckSelectorGroup)
     promote_btn = Button(locator='//button[normalize-space(.)="Promote"]')
     cancel_btn = Button(locator='//button[normalize-space(.)="Cancel"]')