scoutui 2.0.5.1.1.pre → 2.0.5.2

data/lib/scoutui/base/user_vars.rb

@@ -79,7 +79,7 @@ module Scoutui::Base
 
     def normalize(s)
 
-      if s.nil? || s.empty?
+      if s.is_a?(TrueClass) || s.nil? || s.empty?
         return s
       end
 

data/lib/scoutui/base/visual_test_framework.rb

@@ -16,17 +16,18 @@ module Scoutui::Base
       _saveScreenAs=Scoutui::Utils::TestUtils.instance.sanitize_filename(_name)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ScreenSave : #{_saveScreenAs}"
 
+      _dir = Scoutui::Utils::TestUtils.instance.screenShotsDir
       rc=false
       begin
 
-        if !File.directory?(Scoutui::Utils::TestUtils.instance.screenShotsDir)
+        if !_dir.nil? && !File.directory?(_dir)
           FileUtils::mkdir_p Scoutui::Utils::TestUtils.instance.screenShotsDir
         end
 
-        _fullPath=Scoutui::Utils::TestUtils.instance.screenShotsDir + '/' + _saveScreenAs + '.png'
-        drv.save_screenshot(_fullPath)
+        _dir='.' if _dir.nil?
+        _fullPath=_dir + '/' + _saveScreenAs + '.png'
+        rc=Scoutui::Base::QBrowser.saveScreenShot(drv, _fullPath)
 
-        rc=true
       rescue => ex
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Error during processing screenshot with name #{_name.to_s}: #{ex}"
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
@@ -138,7 +139,11 @@ module Scoutui::Base
 
                 #  _locator = Scoutui::Utils::TestUtils.instance.getPageElement(_v['locator'])
 
-                _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator, Scoutui::Commands::Utils.instance.getTimeout())
+                if _v.has_key?('frame')
+                  _obj=Scoutui::Base::QBrowser.findElementwithinFrame(my_driver, _locator, _v['frame'],  Scoutui::Commands::Utils.instance.getTimeout)
+                else
+                  _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator, Scoutui::Commands::Utils.instance.getTimeout())
+                end
 
                 Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{(!_obj.nil?).to_s}"
               end
@@ -434,7 +439,7 @@ module Scoutui::Base
               _bm=Benchmark.measure {
                 _rc=Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
               }
-            elsif _assertType[:cmd]=='url'
+            elsif _assertType[:cmd].match(/(url|isUrl)/)
               _bm=Benchmark.measure {
                 _rc=Scoutui::Base::Assertions.instance.isUrlMatch(my_driver, _a)
               }
@@ -459,9 +464,55 @@ module Scoutui::Base
               _rc=Scoutui::Base::Assertions.instance.isTitle(my_driver, _a)
             }
 
+
+          elsif _a.match(/^\s*focused\(.*\)\s*$/)
+
+            _locator = _a.match(/^\s*focused\((.*)\)\s*$/)[1]
+
+            _bm=Benchmark.measure {
+              _activeElt = my_driver.switch_to.active_element
+              obj = Scoutui::Base::QBrowser.getElement(my_driver,
+                                                       _locator,
+                                                       Scoutui::Commands::Utils.instance.getFrameSearch(),
+                                                       Scoutui::Commands::Utils.instance.getTimeout)
+
+              _rc = (obj==_activeElt)
+            }
+
+            if _rc
+              puts __FILE__ + (__LINE__).to_s + "  focused() - MATCHED"
+            end
+
+          elsif _a.match(/^\s*(focused\.[Vv]alue\((.*)\))\s*$/)
+            _expectedValue = _a.match(/^\s*(focused.[Vv]alue\((.*)\))\s*$/)[2].to_s
+            _activeElt=nil
+            _value=nil
+
+            _bm=Benchmark.measure {
+              _activeElt = my_driver.switch_to.active_element
+              _value=_activeElt.attribute('value')
+
+              if !_activeElt.nil? && _value
+
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  activeElt.value  : |#{_value.to_s}|"
+
+                _rc=!(_value.to_s.match(/#{_expectedValue}/).nil?)
+              end
+            }
+
+            if _activeElt.is_a?(Selenium::WebDriver::Element)
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ASSERT: focusValue: #{_expectedValue} vs #{_value} => #{_rc}"
+            end
+
+
+
           elsif _a.match(/^\s*(focused\.[Tt]ext\((.*)\))\s*$/)
 
             _targetTxt = _a.match(/^\s*(focused.[Tt]ext\((.*)\))\s*$/)[2].to_s
+
+
+            _targetTxt = Scoutui::Base::UserVars.instance.normalize(_targetTxt)
+
             _activeElt=nil
 
             _bm=Benchmark.measure {
@@ -475,7 +526,7 @@ module Scoutui::Base
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  activeElt.value : |#{_activeElt.attribute('value').to_s}|"
                 end
 
-                _rc=!(_activeElt.text.to_s.match(/#{_targetTxt}/).nil?)
+                _rc=!(_activeElt.text.to_s.match(/#{_targetTxt}/).nil?) # || _activeElt.text.to_s==_targetTxt.to_s
                 Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  FocusedText : #{_activeElt.text} => #{_rc}"
               end
             }
@@ -731,23 +782,31 @@ module Scoutui::Base
             end
 
             # Not Visible
-            if !xpath.match(/^\s*!visible\(.*\)$/).nil?
+            if !xpath.match(/^\s*[!]*visible\(.*\)$/).nil?
               _rc = false
               _e=nil
               _timeout=12
+              _msg="is visible"
+
+              if xpath.match(/^\s*!visible/)
+                _msg="is not visible"
+              end
 
-              if xpath.match(/^\s*!visible\((.*,\s*\d+\s*)\)$/)
-                _e = xpath.match(/^\s*!visible\((.*),\s*\d+\s*\)$/)[1].to_s.strip
-                _timeout=xpath.match(/^\s*!visible\((.*),\s*(\d+)\s*\)$/)[2].to_i
+              if xpath.match(/^\s*[!]*visible\((.*,\s*\d+\s*)\)$/)
+                _e = xpath.match(/^\s*[!]*visible\((.*),\s*\d+\s*\)$/)[1].to_s.strip
+                _timeout=xpath.match(/^\s*[!]*visible\((.*),\s*(\d+)\s*\)$/)[2].to_i
               else
-                _e = xpath.match(/^\s*!visible\((.*)\)$/)[1].to_s.strip
+                _e = xpath.match(/^\s*[!]*visible\((.*)\)$/)[1].to_s.strip
               end
 
               _obj =  Scoutui::Base::QBrowser.getObject(my_driver, _e, Scoutui::Commands::Utils.instance.getTimeout)
 
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Wait until element #{xpath} => #{_e} is not visible #{_obj}.class.to_s"
 
-              if _obj.nil?
+              if _obj.nil? && xpath.match(/^\s*!visible\((.*)\)$/)
+                _rc = true
+
+              elsif !_obj.nil? && xpath.match(/^\s*visible\((.*)\)$/)
                 _rc = true
               else
                 Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _obj => #{_obj} : exists: #{!_obj.nil?}"
@@ -767,9 +826,9 @@ module Scoutui::Base
 
               end
 
-              Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify #{_e} - is not visible - #{_rc}"
+              Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify #{_e} - #{_msg} - #{_rc}"
               if Scoutui::Utils::TestUtils.instance.assertExpected?
-                Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(_rc, "Verify #{_e} - is not visible")
+                Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(_rc, "Verify #{_e} - #{_msg}")
               end
 
               next
@@ -1518,6 +1577,10 @@ module Scoutui::Base
           eyeScout.getStrategy().processCommand('navigate(' + url + ')', e)
         end
 
+        ## 5150 Do-Until
+        doUntil = Scoutui::Commands::DoUntil.new(my_driver)
+        _bUntil = doUntil.do_until(e[STEP_KEY])
+
         Scoutui::Logger::LogMgr.instance.info "\to Expected:  #{e[STEP_KEY]['expected'].class.to_s}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
         processExpected(my_driver, e)

data/lib/scoutui/commands/clauses/do_until.rb

@@ -19,6 +19,8 @@ module Scoutui::Commands
       if !pageElt.nil? && pageElt.is_a?(Hash) && pageElt.has_key?('page') && pageElt['page'].has_key?('do')
         @pageElt=pageElt
         cmdList=pageElt['page']['do']
+      elsif !pageElt.nil? && pageElt.is_a?(Hash) && pageElt.has_key?('do')
+        cmdList=pageElt['do']
       elsif pageElt.is_a?(Array)
         cmdList=pageElt
       end
@@ -32,20 +34,36 @@ module Scoutui::Commands
 
     def do_until(pageElt)
 
+      puts __FILE__ + (__LINE__).to_s + " do_until : #{pageElt}"
+
       thenList=nil
       untilList=nil
+      whenPassed=nil
       _alwaystrue=false
 
       if pageElt.is_a?(Hash) && pageElt.has_key?('page')
 
+
         if pageElt['page'].has_key?('do') && pageElt['page'].has_key?('until')
           thenList=pageElt['page']['do']
           untilList=pageElt['page']['until']
+        elsif pageElt['page'].has_key?('do')
+          thenList=pageElt['page']['do']
+        end
+
+        if pageElt['page'].has_key?('whenPassed') && pageElt['page']['whenPassed'].is_a?(Array)
+          whenPassed=pageElt['page']['whenPassed']
         end
 
       elsif pageElt.is_a?(Hash) && pageElt.has_key?('do') && pageElt.has_key?('until')
         thenList = pageElt['do']
         untilList = pageElt['until']
+
+
+        if pageElt.has_key?('whenPassed') && pageElt['whenPassed'].is_a?(Array)
+          whenPassed=pageElt['whenPassed']
+        end
+
       end
 
       if thenList # !pageElt.nil? && pageElt['page'].has_key?('do') && pageElt['page'].has_key?('until')
@@ -78,7 +96,7 @@ module Scoutui::Commands
 
 
             if _historyElts.size > 0 && _historyElts.has_key?(_activeElt)
-              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "****** WRAPPED ******"
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "****** WRAPPED (#{_historyElts.size}) #{_historyElts.has_key?(_activeElt)} ******"
 
               _loop=false
             else
@@ -127,15 +145,15 @@ module Scoutui::Commands
         _rc=_bUntil
 
 
-        if _bUntil && pageElt['page'].has_key?('whenPassed') && pageElt['page']['whenPassed'].is_a?(Array)
+        if _bUntil && whenPassed.is_a?(Array) #pageElt['page'].has_key?('whenPassed') && pageElt['page']['whenPassed'].is_a?(Array)
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ==== whenPassed #{_rc} ======="
-          _whenPassed = execute(pageElt['page']['whenPassed'])
+          _whenPassed = execute(whenPassed)
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ===== end.whenPassed : #{_whenPassed} ====="
 
 
-        elsif !_bUntil && pageElt['page'].has_key?('whenFailed') && pageElt['page']['whenFailed'].is_a?(Array)
+        elsif !_bUntil && pageElt.has_key?('page') && pageElt['page'].has_key?('whenFailed') && pageElt['page']['whenFailed'].is_a?(Array)
 
           _whenFailed = execute(pageElt['page']['whenFailed'])
 
@@ -144,8 +162,9 @@ module Scoutui::Commands
         end
 
 
-      elsif !pageElt.nil? && pageElt['page'].has_key?('do')
-        _rc=execute(pageElt)
+      elsif thenList # !pageElt.nil? && pageElt.has_key?('page') && pageElt['page'].has_key?('do')
+        #_rc=execute(pageElt)
+        _rc=execute(thenList)
       else
         _rc=true
       end

data/lib/scoutui/commands/clauses/then_clause.rb

@@ -48,6 +48,7 @@ module Scoutui::Commands
             # Check for list of elements to click
 
           elsif _subcmd.match(/^\s*press\(__DOWN__\)$/)
+            puts __FILE__ + (__LINE__).to_s + " Press down"
             drv.action.send_keys(:arrow_down).perform
 
           elsif _subcmd.match(/^\s*press\(__UP__\)$/)
@@ -69,6 +70,17 @@ module Scoutui::Commands
             _c = Scoutui::Commands::ClickObject.new(_subcmd)
             _c.run(driver: drv)
 
+          elsif  Scoutui::Commands::Utils.instance.isMouseOver?(_subcmd)
+            _cmd='MouseOver'
+            _c = Scoutui::Commands::MouseOver.new(_subcmd)
+            _c.execute(drv)
+
+          elsif Scoutui::Commands::Utils.instance.isPause?(_subcmd)
+              _cmd='pause'
+              _c = Scoutui::Commands::Pause.new(nil)
+              _c.execute();
+
+
           elsif _subcmd.match(/^\s*press\((.*)\)\s*$/)
             _locator = _subcmd.match(/^\s*press\((.*)\)\s*$/)[1].to_s
             _locator = Scoutui::Base::UserVars.instance.normalize(_locator)

data/lib/scoutui/commands/click_object.rb

@@ -61,7 +61,6 @@ module Scoutui::Commands
       _locator = @cmd.match(/^\s*click\s*\((.*)\)\s*$/i)[1].to_s.strip
       Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " clickObject => #{_locator}"
 
-
       # _locator = Scoutui::Base::UserVars.instance.get(_locator)
       _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
 
@@ -118,7 +117,11 @@ module Scoutui::Commands
                     Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight then click : #{obj}"
                   end
 
-                  thenClause = Scoutui::Commands::ThenClause.new(@drv)
+                  if e.is_a?(Hash) && e['page'].has_key?('then')
+                    thenClause = Scoutui::Commands::ThenClause.new(@drv)
+                    thenClause.execute(e);
+                  end
+
                   doUntil = Scoutui::Commands::DoUntil.new(@drv)
 
                   _tm= {:start => Time.now, :end => 0 }

data/lib/scoutui/commands/commands.rb

@@ -33,6 +33,15 @@ module Scoutui::Commands
           if _subcmd.match(/^\s*press\(__TAB__\)$/)
             drv.action.send_keys(:tab).perform
 
+          elsif _subcmd.match(/^\s*press\(__SHIFT_TAB__\)\s*$/)
+            drv.action.key_down(:shift).send_keys(:tab).perform;
+            drv.action.key_up(:shift).perform;
+
+          elsif _subcmd.match(/^\s*press\(__DELETE__\)\s*$/)
+
+            drv.action.send_keys(:delete).perform
+            _activeElt = drv.switch_to.active_element
+
           elsif _subcmd.match(/^\s*press\((__ESC__|__ESCAPE__)\)$/)
             drv.action.send_keys(:escape).perform
 
@@ -61,6 +70,9 @@ module Scoutui::Commands
 
           elsif _subcmd.match(/^\s*press\(__DOWN__\)$/)
             drv.action.send_keys(:arrow_down).perform
+            _activeElt = drv.switch_to.active_element
+            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " activeElt.Value: #{_activeElt.attribute('value').to_s}"
+
 
           elsif _subcmd.match(/^\s*press\(__UP__\)$/)
             drv.action.send_keys(:arrow_up).perform
@@ -68,7 +80,24 @@ module Scoutui::Commands
           elsif _subcmd.match(/^\s*press\(__ENTER__\)\s*$/)
             drv.action.send_keys(:enter).perform
 
-          elsif _subcmd.match(/^\s*focused\.[Hh]ighlight\s*$/i)
+
+          elsif _subcmd.match(/^\s*[fF]ocused\.[Cc]lick\s*$/i)
+            _rc=true
+            _text=""
+            _tagName=""
+            begin
+              _activeElt = drv.switch_to.active_element
+              _tagName=_activeElt.tag_name.to_s
+              _text=_activeElt.text
+
+              _activeElt.click
+            rescue => ex
+              _rc=false
+            end
+
+            Testmgr::TestReport.instance.getReq('Simple').get_child('focused.Click').add(_rc, "#{_subcmd.to_s} #{_tagName} #{_text}")
+
+          elsif _subcmd.match(/^\s*[fF]ocused\.[Hh]ighlight(\(.*\))*/i)
 
             _activeElt = drv.switch_to.active_element
 
@@ -77,21 +106,62 @@ module Scoutui::Commands
             _onclick=_activeElt.attribute('onclick')
 
             if !_id.nil?
-              puts __FILE__ + (__LINE__).to_s + " => highlight id : #{_id}"
+              Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " => highlight id : #{_id}"
             end
 
-            puts __FILE__ + (__LINE__).to_s +  " => type   : #{_type}" if !_type.nil?
-            puts __FILE__ + (__LINE__).to_s +  " => onclick : #{_onclick}" if !_onclick.nil?
+            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s +  " => type    : #{_type}" if !_type.nil?
+            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s +  " => onclick : #{_onclick}" if !_onclick.nil?
 
             if !_activeElt.nil?
-              Scoutui::Base::QBrowser.highlight(drv, _activeElt, tyle={"color" => 255, "border" => 2}, false)
+
+              _color='red'
+              if _subcmd.match(/^\s*[fF]ocused\.[Hh]ighlight\s*\((.*)\)/)
+                _color=_subcmd.match(/^\s*[fF]ocused\.[Hh]ighlight\s*\((.*)\)/)[1].to_s
+              end
+
+             # Scoutui::Base::QBrowser.highlight(drv, _activeElt, style={"color" => 'rgb(255,16,16)', "border" => 2}, false)
+              Scoutui::Base::QBrowser.highlight(drv, _activeElt, style={"color" => _color, "border" => 2}, false)
+            end
+
+          elsif _subcmd.match(/^\s*[fF]ocused\.[Hh]over\s*$/i)
+
+            _activeElt = drv.switch_to.active_element
+            drv.action.move_to(_activeElt).perform
+
+          elsif _subcmd.match(/^\s*[fF]ocused.[Tt]ype[!]*\(.*\)$/)
+
+            _activeElt = drv.switch_to.active_element
+
+            if _subcmd.match(/^\s*[fF]ocused.[Tt]ype!\(.*\)$/)
+              _activeElt.clear
             end
 
-          elsif _subcmd.match(/^\s*click\((.*)\)\s*$/)
+            _text=_subcmd.match(/^\s*[fF]ocused.[Tt]ype[!]*\((.*)\)$/)[1].to_s
+
+            puts __FILE__ + (__LINE__).to_s + "  =>  #{_text}   is empty : #{_text.empty?}"
+
+
+            _activeElt.send_keys(_text)
+
+          elsif _subcmd.match(/^\s*[cC]lick\((.*)\)\s*$/)
             # Click on the locator
 
-            _c = Scoutui::Commands::ClickObject.new(_subcmd)
-            _c.run(driver: drv)
+            _c=Scoutui::Commands.processCommand(_subcmd, nil, drv)
+            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " click : #{_c.passed?}"
+            Testmgr::TestReport.instance.getReq('Simple').get_child('click').add(_c.passed?, "#{_subcmd.to_s}")
+
+
+            #_c = Scoutui::Commands::ClickObject.new(_subcmd)
+            #_c.run(driver: drv)
+
+          elsif _subcmd.match(/^\s*select\((.*)\)\s*$/)
+
+            _c=Scoutui::Commands.processCommand(_subcmd, nil, drv)
+            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " passsed? : #{_c.passed?}"
+            Testmgr::TestReport.instance.getReq('Simple').get_child('select').add(_c.passed?, "#{_subcmd.to_s}")
+
+       #     _c = Scoutui::Commands::SelectObject.new(_subcmd)
+       #     _c.run(driver: drv)
 
           elsif _subcmd.match(/^\s*press\((.*)\)\s*$/)
             _locator = _subcmd.match(/^\s*press\((.*)\)\s*$/)[1].to_s
@@ -104,6 +174,11 @@ module Scoutui::Commands
             _c = Scoutui::Commands::AssignVar.new(_subcmd)
             _c.run(driver: drv)
 
+          elsif Scoutui::Commands::Utils.instance.isType?(_subcmd)
+            _cmd='Type'
+            _c = Scoutui::Commands::Type.new(_subcmd)
+            _c.run(driver: drv)
+
           end
 
 
@@ -212,7 +287,7 @@ module Scoutui::Commands
         if e['page'].has_key?('vars')
           e['page']['vars'].each do |_a|
 
-            puts __FILE__ + (__LINE__).to_s + "  Process Assignment.var : #{_a}"
+            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + "  Process Assignment.var : #{_a}"
 
             begin
               _caborted=false
@@ -349,7 +424,7 @@ module Scoutui::Commands
     rescue => e
       Scoutui::Logger::LogMgr.instance.debug "#{e.class.to_s} Error during processing: #{$!}"
       Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-      puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+      Scoutui::Logger::LogMgr.instance.debug  "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
       _aborted=true
       rc=false
     end

data/lib/scoutui/commands/highlight.rb

@@ -10,14 +10,40 @@ module Scoutui::Commands
       Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " highlight => #{obj}"
       if !obj.nil?
 
-        if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('style')
-          style=e['page']['style']
-          obj=Scoutui::Base::QBrowser.highlight(@drv, obj, style)
-        else
-          obj=Scoutui::Base::QBrowser.highlight(@drv, obj)
+        begin
+
+          if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('style')
+            style=e['page']['style']
+            obj=Scoutui::Base::QBrowser.highlight(@drv, obj, style)
+
+          elsif e.is_a?(Hash) && e.has_key?(:color)
+
+            # TODO: refactor with q_browser.highlight
+            if e[:color].match(/blue/i)
+              _style={"color" => 'rgb(0, 0, 255)', "border" => 2}
+            elsif e[:color].match(/red/i)
+              _style={"color" => 'rgb(255, 0, 0)', "border" => 2}
+            elsif e[:color].match(/yellow/i)
+              _style={"color" => 'rgb(255, 255, 0)', "border" => 2}
+            elsif e[:color].match(/green/i)
+              _style={"color" => 'rgb(0, 255, 0)', "border" => 2}
+            elsif e[:color].match(/gray/i)
+              _style={"color" => 'rgb(128, 128, 128)', "border" => 2}
+            end
+
+            obj=Scoutui::Base::QBrowser.highlight(@drv, obj, _style)
+          else
+            obj=Scoutui::Base::QBrowser.highlight(@drv, obj)
+          end
+
+          _rc=true
+
+
+        rescue => ex
+          Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Error during processing: #{$!}"
+          Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
         end
 
-        _rc=true
       end
 
       _rc
@@ -25,6 +51,7 @@ module Scoutui::Commands
 
     def execute(drv, e=nil)
       rc=true
+      _color=nil
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Highlight.execute(#{@cmd}), req:#{_req}"
@@ -35,9 +62,17 @@ module Scoutui::Commands
 
         locators=[]
 
-        if @cmd.match(/highlight\s*\((.*)\)/)
-          _locator = @cmd.match(/highlight\s*\((.*)\)/)[1].to_s.strip
-          locators << _locator
+        if @cmd.match(/highlight\s*\((.*)\)([(\.blue|\.gray|\.green|\.red|\.yellow)]*)/)
+#       if @cmd.match(/highlight\s*\((.*)\)/)
+          _m = @cmd.match(/highlight\s*\((.*)\)/)
+          _m = @cmd.match(/highlight\s*\((.*)\)([(\.blue|\.gray|\.green|\.red|\.yellow)]*)/)
+          locators << _m[1].to_s
+
+
+          if !(_m[2].nil? || _m[2].empty?)
+            _color=_m[2].to_s
+          end
+
         elsif e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('locators')
           locators = e['page']['locators']
         end
@@ -45,32 +80,48 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight.locators => #{locators}"
 
         locators.each do |elt|
+          q=nil
 
+          # TODO: _parsed = Scoutui::Base::QBrowser.parseLocator(elt)
 
-          q=Scoutui::Base::Assertions.instance._parseFrameLocator(elt)
+          if elt.is_a?(String) && elt=='focused'
+            obj=@drv.switch_to.active_element
 
-          if q.has_key?('frame')
-            Scoutui::Commands::Utils.instance.setEnableFrameSearch(q['frame'])
-            elt = q['locator']
-          end
+          elsif elt.is_a?(String) && elt.match((/^\s*([(frame\([^\(]*?\)\.)]*)\.(locator\((.*)\))\s*$/))
+            obj=Scoutui::Base::QBrowser.getElement(@drv, elt, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
+          else
+
+            q=Scoutui::Base::Assertions.instance._parseFrameLocator(elt)
 
+            if q.has_key?('frame')
+              Scoutui::Commands::Utils.instance.setEnableFrameSearch(q['frame'])
+              elt = q['locator']
+            end
 
-          _loc = Scoutui::Base::UserVars.instance.normalize(elt)
 
-          obj = Scoutui::Base::QBrowser.findElement(@drv,
-                                                    _loc,
-                                                    Scoutui::Commands::Utils.instance.getFrameSearch(),
-                                                    Scoutui::Commands::Utils.instance.getTimeout)
+            _loc = Scoutui::Base::UserVars.instance.normalize(elt)
+
+            obj = Scoutui::Base::QBrowser.findElement(@drv,
+                                                      _loc,
+                                                      Scoutui::Commands::Utils.instance.getFrameSearch(),
+                                                      Scoutui::Commands::Utils.instance.getTimeout)
+          end
+
 
           if !obj.is_a?(Selenium::WebDriver::Element)
             Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " highlight : unable to find #{_loc}"
           end
 
-          _rc = _highlight(obj, e)
+          if _color.nil?
+            _rc = _highlight(obj, e)
+          else
+            _rc = _highlight(obj, { :color => _color })
+          end
+
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight(#{e}) : #{_rc}"
 
-          if q.has_key?('frame')
+          if q && q.has_key?('frame')
             @drv.switch_to.default_content
             Scoutui::Commands::Utils.instance.resetFrameSearch
           end

data/lib/scoutui/commands/mouse_over.rb

@@ -50,6 +50,8 @@ module Scoutui::Commands
 
       begin
         _locator = @cmd.match(/^\s*mouseover\s*\((.*)\)/)[1].to_s.strip
+        _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
+
         obj = Scoutui::Base::QBrowser.getObject(@drv, _locator, Scoutui::Commands::Utils.instance.getTimeout)
 
         if !obj.nil?
@@ -78,10 +80,10 @@ module Scoutui::Commands
       #         _tObj = Scoutui::Base::VisualTestFramework.processPageElement(@drv, 'peter', _pageObj)
 
                 _tLocator = Scoutui::Utils::TestUtils.instance.getPageElement(_pageObj)
-                _tObj = Scoutui::Base::QBrowser.getFirstObject(@drv, _tLocator['locator'])
+                _tObj = Scoutui::Base::QBrowser.getFirstObject(@drv, _tLocator['locator'])  # TODO: Avoid using getFirstObject
 
               else
-                _tObj = Scoutui::Base::QBrowser.getFirstObject(@drv, _pageObj, Scoutui::Commands::Utils.instance.getTimeout())
+                _tObj = Scoutui::Base::QBrowser.getFirstObject(@drv, _pageObj, Scoutui::Commands::Utils.instance.getTimeout())  # TODO: Avoid using getFirstObject
               end
 
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " HIT #{_pageObj} => #{!_tObj.nil?}"

data/lib/scoutui/commands/pause.rb

@@ -8,9 +8,16 @@ module Scoutui::Commands
       rc=true
       h=""
       begin
-        if e.is_a?(Hash) && e.has_key?('page')
-          h=e['page']['name'].to_s
+        if e.is_a?(Hash)
+          if e.has_key?('page')
+            h=e['page']['name'].to_s
+          elsif e.has_key?('name')
+            h=e['name']
+          end
+        elsif e.is_a?(String)
+          h=e
         end
+
         puts "====== PAUSE - HIT ENTER #{h} ========="
         STDIN.gets()
       rescue => ex