lib/scoutui/base/q_form.rb in scoutui-2.0.3.12.pre vs lib/scoutui/base/q_form.rb in scoutui-2.0.3.13.pre

@@ -2,11 +2,10 @@
 require 'selenium-webdriver'
 
 
 module Scoutui::Base
 
-
   class QForm
 
     attr_accessor :elements
     attr_accessor :drv
 
@@ -35,10 +34,11 @@
     end
 
     def actionElement(drv, locator)
 
       _action=nil
+      _rc=false
 
       obj = Scoutui::Base::QBrowser.getObject(drv, locator, Scoutui::Commands::Utils.instance.getTimeout)
       _type = obj.attribute('type').to_s
       _tag = obj.tag_name.to_s
 
@@ -49,25 +49,26 @@
 
         _v = Scoutui::Base::UserVars.instance.get(dut[k].to_s)
 
         _action="send_keys"
         obj.send_keys(_v)
+        _rc=true
       elsif !_type.match(/(date|number|search|tel|time|url|week)/i).nil?
         _v = Scoutui::Base::UserVars.instance.get(dut[k].to_s)
         _action="send_keys"
         obj.send_keys(_v)
+        _rc=true
       elsif !_type.match(/(button|checkbox|radio|submit)/i).nil?
         _action="click"
-        obj.click()
+        _rc=Scoutui::Base::QBrowser.click(obj)
       else
         _action="click"
-        obj.click()
+        _rc=Scoutui::Base::QBrowser.click(obj)
       end
 
-      Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " action : #{_action}"
-      _action
-
+      Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " action : #{_action} => #{_rc}"
+      _rc
     end
 
     def submitForm(drv=nil)
       Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " -- submit(#{drv.class.to_s} --"
 
@@ -80,11 +81,10 @@
       action_obj = @elements.select { |key, e| e.is_a?(Hash) && e.has_key?('action_object') && e['action_object']==true }
 
       if !action_obj.nil?
         # Find the submit action element
         Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " -- submit => #{action_obj}"
-        actionElement(drv, action_obj[action_obj.keys[0]])
-        rc=true
+        rc=actionElement(drv, action_obj[action_obj.keys[0]])
       else
         Scoutui::Logger::LogMgr.instance.commands.warn __FILE__ + (__LINE__).to_s + " WARN: missing action object."
       end
 
       rc