lib/scoutui/base/q_form.rb in scoutui-2.0.1 vs lib/scoutui/base/q_form.rb in scoutui-2.0.2

@@ -36,11 +36,11 @@
 
     def actionElement(drv, locator)
 
       _action=nil
 
-      obj = Scoutui::Base::QBrowser.getObject(drv, locator)
+      obj = Scoutui::Base::QBrowser.getObject(drv, locator, Scoutui::Commands::Utils.instance.getTimeout)
       _type = obj.attribute('type').to_s
       _tag = obj.tag_name.to_s
 
       Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " obj => type:#{_type}  tag:#{_tag}"
 
@@ -109,11 +109,11 @@
 
             k='visible_when'
             if v.is_a?(Hash) && v.has_key?(k) && v.has_key?('locator')
 
 
-              obj = Scoutui::Base::QBrowser.getObject(drv, v['locator'])
+              obj = Scoutui::Base::QBrowser.getObject(drv, v['locator'], Scoutui::Commands::Utils.instance.getTimeout)
 
               if !v[k].match(/always/i).nil?
                 _rc = !obj.nil? && obj.is_a?(Selenium::WebDriver::Element) && obj.displayed?
                 Scoutui::Logger::LogMgr.instance.asserts.info " Verify element #{n} with locator #{v['locator']} is always visible on form - #{_rc.to_s}"
                 Testmgr::TestReport.instance.getReq(_req).tc(k).add(_rc, __FILE__ + (__LINE__).to_s + " Verify element #{n} with locator #{v['locator']} is always visible on form")
@@ -141,22 +141,22 @@
                 _obj=_match[2]
                 _expected_val=_match[3]
 
                 Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " <cond, obj, when>::<#{_cond}, #{_obj}, #{_expected_val}"
 
-                depObj = Scoutui::Base::QBrowser.getObject(drv, _obj)
+                depObj = Scoutui::Base::QBrowser.getObject(drv, _obj, Scoutui::Commands::Utils.instance.getTimeout)
                 Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " hit => #{depObj.class.to_s} tag:#{depObj.tag_name}" if !depObj.nil?
 
                 desc=nil
                 if _expected_val.match(/true/i)
-                  obj = Scoutui::Base::QBrowser.getObject(drv, v['locator'])
+                  obj = Scoutui::Base::QBrowser.getObject(drv, v['locator'], Scoutui::Commands::Utils.instance.getTimeout)
 
                   _rc = !depObj.nil? && depObj.displayed? && !obj.nil? && obj.displayed?
                   Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{v['locator']} is displayed since #{_obj} is displayed - #{_rc.to_s}"
                   Testmgr::TestReport.instance.getReq(_req).tc(k).add(_rc, "Verify #{v['locator']} is displayed since #{_obj} is displayed")
                 elsif _expected_val.match(/false/i)
-                  obj = Scoutui::Base::QBrowser.getObject(drv, v['locator'])
+                  obj = Scoutui::Base::QBrowser.getObject(drv, v['locator'], Scoutui::Commands::Utils.instance.getTimeout)
 
                   _rc =  depObj.nil? && !obj.nil? && obj.displayed?
                   Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{v['locator']} is displayed since #{_obj} is not visible. - #{_rc.to_s}"
                   Testmgr::TestReport.instance.getReq(_req).tc(k).add(_rc, "Verify #{v['locator']} is displayed since #{_obj} is not visible.")
                 end
@@ -164,11 +164,11 @@
               elsif !v[k].match(/value\((.*)\)\=(.*)/).nil?
                   _match=v[k].match(/value\((.*)\)\=(.*)/)
                   _obj=_match[1]
                   _expected_val=_match[2]
 
-                  obj = Scoutui::Base::QBrowser.getObject(drv, _obj)
+                  obj = Scoutui::Base::QBrowser.getObject(drv, _obj, Scoutui::Commands::Utils.instance.getTimeout)
                   Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " hit => #{obj.class.to_s} tag:#{obj.tag_name}"
 
 
 
                   if !obj.nil? && obj.is_a?(Selenium::WebDriver::Element) && obj.tag_name=='select'
@@ -218,10 +218,10 @@
 
             Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " key(#{k}) : locator:#{_xpath} => #{dut[k].to_s}"
 
             if !drv.nil?
               @drv=drv
-              obj = Scoutui::Base::QBrowser.getObject(drv, _xpath)
+              obj = Scoutui::Base::QBrowser.getObject(drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
 
               _type = obj.attribute('type').to_s
               _tag = obj.tag_name.to_s
 
               Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " obj => type:#{_type}  tag:#{_tag}"