fix for web (openshift#2686)

dpuniaredhat · Feb 15, 2022 · b531e59 · b531e59
1 parent 4b4233f
commit b531e59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/lib/rules/web/admin_console/4.10/dashboards.xyaml b/lib/rules/web/admin_console/4.10/dashboards.xyaml
@@ -63,7 +63,7 @@ check_grafana_dashboard_body_loaded:
   element:
     selector:
       xpath: //div[contains(@class,'co-dashboard-body')]//*[contains(@class,'monitoring-dashboards')]
-    timeout: 30
+    timeout: 90
 click_dashboard_dropdown:
   element:
     selector:
@@ -131,7 +131,7 @@ check_chart_loaded:
   elements:
   - selector:
       xpath: //div[contains(@class,'pf-c-chart')]
-    timeout: 40
+    timeout: 90
 change_namespace:
   params:
     label_text: namespace

diff --git a/lib/rules/web/admin_console/4.10/operator_hub.xyaml b/lib/rules/web/admin_console/4.10/operator_hub.xyaml
@@ -528,14 +528,13 @@ check_default_view_is_form_view:
   element:
     selector:
       xpath: //input[@type='radio' and @value='form' and @checked]
-open_edit_form_view:
-  elements:
-  - selector:
-      xpath: //label[contains(.,'Form view')]//input
-    op: click
+open_edit_form_view: {}
 switch_to_yaml_view:
   params:
     radio_text: yaml
+  scripts:
+  - command: return document.querySelector("input[value=yaml]").scrollIntoView(false)
+    expect_result: ~
   action: click_radio_input
   action: wait_box_loaded
   element:

diff --git a/lib/webauto/web4cucumber.rb b/lib/webauto/web4cucumber.rb
@@ -157,10 +157,10 @@ def browser
         # options.add_extension proxy_chrome_ext_file if proxy_chrome_ext_file
         options[:extensions] = [proxy_chrome_ext_file] if proxy_chrome_ext_file
         if @selenium_url
-          @browser = Watir::Browser.new :chrome, options: options, url: @selenium_url
+          @browser = Watir::Browser.new :chrome, :http_client=>client, options: options, url: @selenium_url
         else
           options["goog:chromeOptions"][:switches] = chrome_switches
-          @browser = Watir::Browser.new :chrome, options: options
+          @browser = Watir::Browser.new :chrome, :http_client=>client, options: options
         end
         logger.info "#{browser.driver.capabilities[:browser_name]} version is #{browser.driver.capabilities[:browser_version]}"
         logger.info "Chromedriver version is #{browser.driver.capabilities['chrome']['chromedriverVersion']}"