scoutui 2.0.5.3 → 2.0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db798dd9204d670c8e974c52ceb79caf4f341be2
-  data.tar.gz: 3fe4396541ad339a40b15b22dd81b73857b868fd
+  metadata.gz: bbf796808a18143060a52ebcb6221e3d4a0bb388
+  data.tar.gz: 841d44e21a34f8f5d2db8fd55c0e27e1d9c0b710
 SHA512:
-  metadata.gz: 77616d28177972da4e747ce348d05c73d09f26f35021cc5240968590e994442441b5eb477f7bb889132a6a8993ace38111a7906bb02dc248288d91d694654f6a
-  data.tar.gz: e0afdb0325c6356a76ffe5c6d95a21c12e91066e68017a7e9dd8787b9ea88d4e4d9563d507bdb698a31fc3537a59f99841489ec2397b2ee2bf2df8d2e4c9c163
+  metadata.gz: 851555770f4079642021e5e9579d802e27031f4af7a8a0b88641b10ae1200ce5d4b110f315974b376aec837a9171626246eb639566c62ae0805c5f95fa5276c3
+  data.tar.gz: 75361076e0fa9eb6b02fceb7c3abe2f057edee95499d59e42aa89c2e48215f7ab1ffaa8728e197307c5dd1694963111c568892c709e53304cfdce9eec2069ec7

data/lib/scoutui/base/assertions.rb

@@ -20,7 +20,7 @@ module Scoutui::Base
           { :cmd => 'visible',     :pattern => '^\s*[!]*visible\((.*)\)\s*$', :parse => nil },
           { :cmd => 'isUrl',       :pattern => '^\s*isUrl\((.*)\)\s*$', :parse => lambda { |_a| _parseWith('isUrl', _a) } },
           { :cmd => 'url',         :pattern => '^\s*url\((.*)\)\s*$', :parse => lambda { |_a| _parseWith('url', _a) } },
-          { :cmd => 'compare',     :pattern => '/^\s*(\$\{.*\})\s*(==|!=)(.*)$', :parse => nil }
+          { :cmd => 'compare',     :pattern => '^\s*(\$\{.*\})\s*(==|!=)(.*)$', :parse => nil }
       ]
 
     end
@@ -430,7 +430,7 @@ module Scoutui::Base
         if _obj.is_a?(Selenium::WebDriver::Element)
           _v = _obj.text.to_s
 
-          puts __FILE__ + (__LINE__).to_s + " isText(#{_locator.to_s}) : #{_v}  (tagname: #{_obj.tag_name}, displayed: #{_obj.displayed?.to_s}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isText(#{_locator.to_s}) : #{_v}  (tagname: #{_obj.tag_name}, displayed: #{_obj.displayed?.to_s}"
           rc=!_v.match(/#{_t['expected_value']}/).nil?
 
           if _t['cmd'].match(/^!\s*is[tT]ext/i)
@@ -498,11 +498,17 @@ module Scoutui::Base
 
         if !_t.nil?
           _locator = _t['locator']
+
+          Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " Locator : #{_locator}"
           _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
 
+          Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " Normalize() => #{_locator}"
+
 
           _locator = Scoutui::Base::UserVars.instance.get(_locator)
 
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Get(#{_locator}) : #{_locator}"
+
           if _t.has_key?('frame') && !_t['frame'].nil?
             Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
           end
@@ -516,16 +522,22 @@ module Scoutui::Base
            _locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
           end
 
-
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Locator : #{_locator}"
            _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Normalize() => #{_locator}"
+
            _locator = Scoutui::Base::UserVars.instance.get(_locator)
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Get(#{_locator}) : #{_locator}"
+
         else
           Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " invalid visible cmd: #{_execute_when}"
         end
 
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " visible => #{_locator}"
 
-        (0..3).each do |_retry|
+        (0..1).each do |_retry|
           begin
             wait = Selenium::WebDriver::Wait.new(:timeout =>  10)
 
@@ -544,17 +556,17 @@ module Scoutui::Base
             break if _state
 
           rescue Selenium::WebDriver::Error::TimeOutError
-            puts __FILE__ + (__LINE__).to_s + " Timed out => #{_locator}"
+            Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Timed out => #{_locator}"
 
           rescue Selenium::WebDriver::Error::StaleElementReferenceError
-            puts __FILE__ + (__LINE__).to_s + " StaleElementReferenceError:  retry #{_retry} : #{_locator}";
+            Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " StaleElementReferenceError:  retry #{_retry} : #{_locator}";
             sleep(0.5)
           end
         end
 
 
         if !_state
-          puts __FILE__ + (__LINE__).to_s + " Paused due to fail to find #{_locator}"; #STDIN.gets();
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Paused due to fail to find #{_locator}"; #STDIN.gets();
         end
 
         if !_enableAsserts

data/lib/scoutui/base/q_browser.rb

@@ -310,7 +310,7 @@ module Scoutui::Base
 
       rescue => ex
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex}"
-        puts ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn  ex.backtrace
       end
 
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | isStale?(#{_obj}) : nosuch=#{_noSuch},  stale=#{_isStale}"
@@ -444,7 +444,7 @@ module Scoutui::Base
 
     # 5150
     def self.findElements(opts)
-      puts __FILE__ + (__LINE__).to_s + " findElements(#{opts})"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " findElements(#{opts})"
       driver=opts[:driver]
       locator=opts[:locator]
       locateBy=:xpath
@@ -458,16 +458,16 @@ module Scoutui::Base
         locateBy = :css
       end
 
-      puts __FILE__ + (__LINE__).to_s + "  driver  : #{driver.class}"
-      puts __FILE__ + (__LINE__).to_s + "  locator : #{locator}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  driver  : #{driver.class}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  locator : #{locator}"
 
       begin
       _timeout=Scoutui::Commands::Utils.instance.getTimeout
       Selenium::WebDriver::Wait.new(timeout: _timeout).until { hits=driver.find_elements( locateBy => locator) }
 
       rescue => ex
-        puts __FILE__ + (__LINE__).to_s + "  #{ex.class}"
-        puts ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + "  #{ex.class}"
+        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
 
       end
       hits
@@ -492,17 +492,17 @@ module Scoutui::Base
     # http://stackoverflow.com/questions/14288917/selenium-webdriver-get-attributes-after-finding-an-element
     def self.isAccessible(opts)
 
-      puts __FILE__ + (__LINE__).to_s + " == isAccessible(#{opts}) =="
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == isAccessible(#{opts}) =="
       hits = Scoutui::Base::QBrowser.findElements(opts)
 
-      puts __FILE__ + (__LINE__).to_s + " HITS => #{hits.length}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " HITS => #{hits.length}"
 
 
       i=0
       begin
         hits.each do | obj |
             if obj.displayed?
-              puts __FILE__ + (__LINE__).to_s + " #{i}. #{obj.tag_name}"
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{i}. #{obj.tag_name}"
 
               tagName=obj.tag_name.to_s.strip
 
@@ -517,12 +517,12 @@ module Scoutui::Base
 
                 if parent_li
                   forId = parent_li['for']
-                  puts __FILE__ + (__LINE__).to_s + "    parent: #{parent_li.tag_name}"
-                  puts __FILE__ + (__LINE__).to_s + "    assert <id, for>: #{id}, #{forId}"
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    parent: #{parent_li.tag_name}"
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    assert <id, for>: #{id}, #{forId}"
 
                   Testmgr::TestReport.instance.getReq('WCAG').testcase(tagName).add(id==forId, "Verify matching label for #{tagName} has same id (#{id}) and for (#{forId}) values")
                 else
-                  puts __FILE__ + (__LINE__).to_s + "  => Missing associated label for #{tagName}"
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  => Missing associated label for #{tagName}"
                 end
 
 
@@ -534,13 +534,13 @@ module Scoutui::Base
                 alt=obj.attribute('alt')
                 longdesc=obj.attribute('longdesc')
 
-                puts __FILE__ + (__LINE__).to_s + " ** #{i}. process #{tagName}  <alt, longdesc>::<#{alt.nil?}, #{longdesc.nil?}, #{src}> **"
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ** #{i}. process #{tagName}  <alt, longdesc>::<#{alt.nil?}, #{longdesc.nil?}, #{src}> **"
 
                 Testmgr::TestReport.instance.getReq('WCAG').testcase(tagName).add(!(alt.nil? && longdesc.nil?), "Verify alt/longdesc (#{alt.to_s} exists for img[#{i}] (#{src})")
 
 
               else
-                puts __FILE__ + (__LINE__).to_s + " == #{tagName} out of scope for Acccessibility"
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == #{tagName} out of scope for Acccessibility"
 
               end
 
@@ -551,8 +551,8 @@ module Scoutui::Base
         end
 
       rescue => ex
-        puts __FILE__ + (__LINE__).to_s + " #{ex.class}"
-        puts ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class}"
+        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
       end
 
 
@@ -560,7 +560,7 @@ module Scoutui::Base
 
     def self.findElementwithinFrame(drv, _locator, _frames, _timeout=nil)
 
-      puts __FILE__ + (__LINE__).to_s + " frameElementWithinFrame(#{_locator}, #{_frames}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " frameElementWithinFrame(#{_locator}, #{_frames}"
 
       # 5150
 
@@ -583,7 +583,7 @@ module Scoutui::Base
 
       end
 
-      puts __FILE__ + (__LINE__).to_s + " [return]:frameElementsWithinFrame(#{_locator}, #{_frames}) => #{obj.class}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " [return]:frameElementsWithinFrame(#{_locator}, #{_frames}) => #{obj.class}"
       obj
     end
 
@@ -609,7 +609,7 @@ module Scoutui::Base
 
       if Scoutui::ApplicationModel::QModel.isPageObject?(_locator) #  _locator.match(/^page\([\w\d]+\)/)
         pg = Scoutui::Utils::TestUtils.instance.getPageElement(_locator)
-        puts __FILE__ + (__LINE__).to_s + " [parseLocator]: pageObject(#{_locator}) => #{pg}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " [parseLocator]: pageObject(#{_locator}) => #{pg}"
 
         if pg.is_a?(Hash)
 
@@ -647,8 +647,8 @@ module Scoutui::Base
       Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s +  " parseIt2:  #{locator} => #{rc}"
 
       if rc
-        puts "o rc[1] : #{rc[1]}"
-        puts "o rc[2] : #{rc[2]}"
+        Scoutui::Logger::LogMgr.instance.debug "o rc[1] : #{rc[1]}"
+        Scoutui::Logger::LogMgr.instance.debug "o rc[2] : #{rc[2]}"
         return { 'locator' => rc[2] }
       end
 
@@ -680,11 +680,11 @@ module Scoutui::Base
 
       else
 
-        puts __FILE__ + (__LINE__).to_s + " Analyze locator : #{_locator}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Analyze locator : #{_locator}"
 
         _parsed = Scoutui::Base::QBrowser.parseLocator(_locator)
 
-        puts __FILE__ + (__LINE__).to_s + " _parsed(#{_locator}) => #{_parsed}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _parsed(#{_locator}) => #{_parsed}"
 
         if _parsed.has_key?('frame') && _parsed.has_key?('locator')
           obj = Scoutui::Base::QBrowser.findElementwithinFrame(drv, _parsed['locator'], _parsed['frame'], _timeout)
@@ -990,7 +990,7 @@ module Scoutui::Base
           drv.execute_script("hlt = function(c) { c#{parents}.style.border='solid 1px rgb(#{color}, 0, 0)'; }; return hlt(arguments[0]);", element)
         end
       else
-        puts __FILE__ + (__LINE__).to_s + " SKIP ANCES"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " SKIP ANCES"
       end
 
 #      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " PAUSE on highlight"; gets

data/lib/scoutui/base/user_vars.rb

@@ -76,13 +76,34 @@ module Scoutui::Base
       _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
     end
 
+    def _reduce(t)
+      s = t.clone
+      _vars = s.scan(/(\$\{.*?\})/)
+      _vars.each do | _v|
+        if _v.length==1
 
-    def normalize(s)
+          _u = Scoutui::Base::UserVars.instance.get(_v[0].to_s)
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Normalize(#{_v}) => #{_u}"
 
-      if s.is_a?(TrueClass) || s.nil? || s.empty?
-        return s
+          s.gsub!(_v[0].to_s, _u)
+        end
+
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _reduce(#{t}) => #{s}";
+      s
+    end
+
+    def normalize(src)
+
+
+
+      if src.is_a?(TrueClass) || src.nil? || src.empty?
+        return src
       end
 
+      s = src.clone
+
       begin
         if Scoutui::Base::UserVars.instance.isTestData?(s)
 
@@ -92,25 +113,28 @@ module Scoutui::Base
           return Scoutui::Base::TestData.instance.get(_dataID, _getter)
         end
 
-        _vars = s.scan(/(\$\{.*?\})/)
-        _vars.each do | _v|
-          if _v.length==1
+        hydrate = _reduce(s)
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " hydrate(#{s}) => #{hydrate}"
 
-            _u = Scoutui::Base::UserVars.instance.get(_v[0].to_s)
-            puts __FILE__ + (__LINE__).to_s + " Normalize(#{_v}) => #{_u}"
+        while hydrate.match(/\$\{.*\}/)
+          _t = _reduce(hydrate)
 
-            s.gsub!(_v[0].to_s, _u)
+          if _t==hydrate
+            break
           end
 
+          hydrate=_t
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " hydrate2() => #{hydrate}";
         end
 
       rescue => ex
-        puts __FILE__ + (__LINE__).to_s + " #{ex.class}"
-        puts ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn  __FILE__ + (__LINE__).to_s + " #{ex.class}"
+        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
       end
 
 
-      s
+      hydrate
     end
 
     def get(_k)
@@ -149,7 +173,12 @@ module Scoutui::Base
       elsif !_rc.nil?
         k=_rc[1].to_s
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " User Var found => #{k}"
-        if Scoutui::Utils::TestUtils.instance.getTestConfig().has_key?("user_vars")
+
+        if Scoutui::Utils::TestUtils.instance.getTestConfig().nil?
+
+          ;
+
+        elsif Scoutui::Utils::TestUtils.instance.getTestConfig().has_key?("user_vars")
 
           if Scoutui::Utils::TestUtils.instance.getTestConfig()["user_vars"].has_key?(k)
             v=Scoutui::Utils::TestUtils.instance.getTestConfig()["user_vars"][k].to_s

data/lib/scoutui/base/visual_test_framework.rb

@@ -345,7 +345,7 @@ module Scoutui::Base
 
 
     def self.verifyCondition(my_driver, xpath)
-      rc=false
+      wasProcessed=false
 
       if !xpath.match(/^page\([\w\d]+\)/).nil?
 
@@ -374,6 +374,8 @@ module Scoutui::Base
 
               _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator)
 
+              wasProcessed=true
+
               Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{!_obj.nil?}"
             end
 
@@ -382,6 +384,7 @@ module Scoutui::Base
 
         end
 
+        wasProcessed
       end
 
     end
@@ -443,6 +446,11 @@ module Scoutui::Base
               _bm=Benchmark.measure {
                 _rc=Scoutui::Base::Assertions.instance.isUrlMatch(my_driver, _a)
               }
+
+            elsif _assertType[:cmd]=='compare'
+              _bm=Benchmark.measure {
+                _rc=Scoutui::Base::Assertions.instance.compareValue(_a)
+              }
             end
 
           elsif Scoutui::Base::Assertions.instance.isRoleCmd?(_a)
@@ -465,9 +473,9 @@ module Scoutui::Base
             }
 
 
-          elsif _a.match(/^\s*focused\(.*\)\s*$/)
+          elsif _a.match(/^\s*[fF]ocused\(.*\)\s*$/)
 
-            _locator = _a.match(/^\s*focused\((.*)\)\s*$/)[1]
+            _locator = _a.match(/^\s*[fF]ocused\((.*)\)\s*$/)[1]
 
             _bm=Benchmark.measure {
               _activeElt = my_driver.switch_to.active_element
@@ -483,8 +491,8 @@ module Scoutui::Base
               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
+          elsif _a.match(/^\s*([fF]ocused\.[Vv]alue\((.*)\))\s*$/)
+            _expectedValue = _a.match(/^\s*([fF]ocused.[Vv]alue\((.*)\))\s*$/)[2].to_s
             _activeElt=nil
             _value=nil
 
@@ -506,9 +514,9 @@ module Scoutui::Base
 
 
 
-          elsif _a.match(/^\s*(focused\.[Tt]ext\((.*)\))\s*$/)
+          elsif _a.match(/^\s*([!]*[fF]ocused\.[Tt]ext\((.*)\))\s*$/)
 
-            _targetTxt = _a.match(/^\s*(focused.[Tt]ext\((.*)\))\s*$/)[2].to_s
+            _targetTxt = _a.match(/^\s*([!]*[fF]ocused.[Tt]ext\((.*)\))\s*$/)[2].to_s
 
 
             _targetTxt = Scoutui::Base::UserVars.instance.normalize(_targetTxt)
@@ -527,6 +535,12 @@ module Scoutui::Base
                 end
 
                 _rc=!(_activeElt.text.to_s.match(/#{_targetTxt}/).nil?) # || _activeElt.text.to_s==_targetTxt.to_s
+
+                if _a.match(/^\s*!focused/)
+                  Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " verify #{_targetTxt} != #{_activeElt.text} => #{_rc}"
+                  _rc=!_rc
+                end
+
                 Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  FocusedText : #{_activeElt.text} => #{_rc}"
               end
             }
@@ -746,11 +760,16 @@ module Scoutui::Base
         expected_list=e[STEP_KEY]['expected']
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{expected_list}"
 
+        _expectedResults=processAsserts(my_driver, expected_list, false)
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " expectedResults => #{_expectedResults}"
 
         if expected_list.is_a?(Array)
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process Arr of Expected"
+
           expected_list.each do |_condition|
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " processExpected.Condition : #{_condition}"
             verifyCondition(my_driver, _condition)
           end
         end
@@ -1309,7 +1328,7 @@ module Scoutui::Base
             _args=[]
 
             e[STEP_KEY]['executejs'][fcnToCall].each do |arg|
-              puts __FILE__ + (__LINE__).to_s + " ||| arg:  #{arg}"
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ||| arg:  #{arg}"
 
               if arg.match(/^\s*\//)
                 _args << Scoutui::Base::QBrowser.getObject(my_driver, arg, Scoutui::Commands::Utils.instance.getTimeout)
@@ -1331,7 +1350,7 @@ module Scoutui::Base
             end
 
 
-            puts __FILE__ + (__LINE__).to_s + " Execute => #{fcnToCall}(#{argString})"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Execute => #{fcnToCall}(#{argString})"
 
          #   _obj = Scoutui::Base::QBrowser.getObject(my_driver, '//body', Scoutui::Commands::Utils.instance.getTimeout)
 
@@ -1415,6 +1434,7 @@ module Scoutui::Base
               processCommand(_action, e, my_driver)
             else
               if Scoutui::Utils::TestUtils.instance.isFailFast? && !_command.passed?
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "FAIL FAST => #{_command.passed?}"
                 Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Failfast.";
                 Scoutui::Utils::TestUtils.instance.setState(:abort)
                 takeScreenShot(my_driver, "step_#{i}.failed")

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

@@ -4,15 +4,26 @@ module Scoutui::Commands
   class DoUntil
 
     attr_accessor :drv
+    attr_accessor :passed
 
     def initialize(driver)
       @drv=driver
       @pageElt=nil
+      @passed=true
+      @executed=false
     end
 
+    def passed?
+      @passed
+    end
+
+    def wasExecuted?
+      @executed
+    end
 
     def execute(pageElt)
 
+      @executed=true
       rc=true
       cmdList=nil
 
@@ -34,11 +45,12 @@ module Scoutui::Commands
 
     def do_until(pageElt)
 
-      puts __FILE__ + (__LINE__).to_s + " do_until : #{pageElt}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " do_until : #{pageElt}"
 
       thenList=nil
       untilList=nil
       whenPassed=nil
+      whenFailed=nil
       _alwaystrue=false
 
       if pageElt.is_a?(Hash) && pageElt.has_key?('page')
@@ -55,6 +67,10 @@ module Scoutui::Commands
           whenPassed=pageElt['page']['whenPassed']
         end
 
+        if pageElt['page'].has_key?('whenFailed') && pageElt['page']['whenFailed'].is_a?(Array)
+          whenFailed=pageElt['page']['whenFailed']
+        end
+
       elsif pageElt.is_a?(Hash) && pageElt.has_key?('do') && pageElt.has_key?('until')
         thenList = pageElt['do']
         untilList = pageElt['until']
@@ -64,6 +80,10 @@ module Scoutui::Commands
           whenPassed=pageElt['whenPassed']
         end
 
+        if pageElt.has_key?('whenFailed') && pageElt['whenFailed'].is_a?(Array)
+          whenFailed=pageElt['whenFailed']
+        end
+
       end
 
       if thenList # !pageElt.nil? && pageElt['page'].has_key?('do') && pageElt['page'].has_key?('until')
@@ -107,7 +127,7 @@ module Scoutui::Commands
 
           if _loop &&  untilList # !pageElt.nil? && pageElt['page'].has_key?('until')
 
-            puts __FILE__ + (__LINE__).to_s + " untilList => #{untilList.class}, #{untilList.size}, #{untilList[0]}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " untilList => #{untilList.class}, #{untilList.size}, #{untilList[0]}"
 
             if untilList.is_a?(Array) && untilList.size==1 && untilList[0]==true
               _expected=false
@@ -153,9 +173,9 @@ module Scoutui::Commands
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ===== end.whenPassed : #{_whenPassed} ====="
 
 
-        elsif !_bUntil && pageElt.has_key?('page') && pageElt['page'].has_key?('whenFailed') && pageElt['page']['whenFailed'].is_a?(Array)
+        elsif !_bUntil && !whenFailed.nil? #pageElt.has_key?('page') && pageElt['page'].has_key?('whenFailed') && pageElt['page']['whenFailed'].is_a?(Array)
 
-          _whenFailed = execute(pageElt['page']['whenFailed'])
+          _whenFailed = execute(whenFailed) # execute(pageElt['page']['whenFailed'])
 
         elsif _alwaystrue
           _rc=true
@@ -169,10 +189,12 @@ module Scoutui::Commands
         _rc=true
       end
 
-      _rc
+      @passed=_rc
     end
 
 
+
+
   end
 
 end

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

@@ -0,0 +1,116 @@
+
+module Scoutui::Commands
+
+  class WhileDo < Command
+
+
+    def initialize(driver)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " WhileDo.init()"
+      @drv=driver
+      @pageElt=nil
+      @passed=true
+
+      @executed_result=nil
+    end
+
+
+    def execute(pageElt)
+      setResult(while_do(pageElt))
+    end
+
+    def _process(untilList)
+
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " _process(#{untilList})"
+
+
+      if untilList.is_a?(Array) && untilList.size==1 && (untilList[0]==true || untilList[0]==false)
+        return untilList[0]
+      end
+
+      rc=Scoutui::Base::VisualTestFramework::processAsserts(@drv, untilList, false)
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + "   _process(#{untilList}) => #{rc}"
+
+      rc
+
+    end
+
+
+
+    def while_do(pageElt)
+
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " do_until : #{pageElt}"
+
+      thenList=nil
+      untilList=nil
+      whenPassed=nil
+      whenFailed=nil
+      _alwaystrue=false
+
+      if pageElt.is_a?(Hash) && pageElt.has_key?('page')
+
+
+        if pageElt['page'].has_key?('while') && pageElt['page'].has_key?('do')
+          thenList=pageElt['page']['do']
+          whileList=pageElt['page']['while']
+        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
+
+        if pageElt['page'].has_key?('whenFailed') && pageElt['page']['whenFailed'].is_a?(Array)
+          whenFailed=pageElt['page']['whenFailed']
+        end
+
+      elsif pageElt.is_a?(Hash) && pageElt.has_key?('while') && pageElt.has_key?('do')
+        thenList = pageElt['do']
+        whileList = pageElt['while']
+
+
+        if pageElt.has_key?('whenPassed') && pageElt['whenPassed'].is_a?(Array)
+          whenPassed=pageElt['whenPassed']
+        end
+
+        if pageElt.has_key?('whenFailed') && pageElt['whenFailed'].is_a?(Array)
+          whenFailed=pageElt['whenFailed']
+        end
+
+      end
+
+      if thenList # !pageElt.nil? && pageElt['page'].has_key?('do') && pageElt['page'].has_key?('until')
+
+        _max =  25
+        _i=0
+        _historyElts={}
+
+        begin
+          while (_i < _max) &&  _process(whileList) do
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == process #{_i}. #{thenList}"
+
+            rc=Scoutui::Commands.simpleCommands(@drv, thenList)
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == returned process #{_i} => #{rc}"
+             _i+=1
+
+
+          end  # while()
+
+        rescue => ex
+          Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Error during processing: #{ex.message}"
+          Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+        end
+
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ==== While Do Pause"; #STDIN.gets
+
+      setResult(@passed)
+    end
+
+
+  end
+
+end

data/lib/scoutui/commands/click_object.rb

@@ -64,7 +64,7 @@ module Scoutui::Commands
       # _locator = Scoutui::Base::UserVars.instance.get(_locator)
       _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
 
-      Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " | translate : #{_locator}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.command.debug __FILE__ + (__LINE__).to_s + " | translate : #{_locator}"
 
       _clicked=false
 
@@ -96,7 +96,13 @@ module Scoutui::Commands
 
                 if isEnabled # && obj.is_a?(Selenium::WebDriver::Element)
 
-                  @drv.action.move_to(obj).perform
+                  begin
+                    @drv.action.move_to(obj).perform
+                  rescue => ex
+                    Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{ex.class.to_s}"
+                    Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s +  ex.backtrace.join("\n\t")
+                  end
+
                   bm=Benchmark.measure {
                     obj.click
                   }

data/lib/scoutui/commands/command.rb

@@ -52,6 +52,7 @@ module Scoutui::Commands
     end
 
     def setResult(r)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " setResult(#{r}) - #{@cmd.to_s}"
       Scoutui::Logger::LogMgr.instance.commands.debug " #{@cmd.to_s} : setResult(#{r.to_s})"
       @executed=true
       @executed_result=r

data/lib/scoutui/commands/commands.rb

@@ -33,6 +33,10 @@ module Scoutui::Commands
           if _subcmd.match(/^\s*press\(__TAB__\)$/)
             drv.action.send_keys(:tab).perform
 
+          elsif Scoutui::Commands::Utils.instance.isHighlight?(_subcmd)
+
+            processCommand(_subcmd, nil, drv)
+
           elsif _subcmd.match(/^\s*press\(__SHIFT_TAB__\)\s*$/)
             drv.action.key_down(:shift).send_keys(:tab).perform;
             drv.action.key_up(:shift).perform;
@@ -138,7 +142,7 @@ module Scoutui::Commands
 
             _text=_subcmd.match(/^\s*[fF]ocused.[Tt]ype[!]*\((.*)\)$/)[1].to_s
 
-            puts __FILE__ + (__LINE__).to_s + "  =>  #{_text}   is empty : #{_text.empty?}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  =>  #{_text}   is empty : #{_text.empty?}"
 
 
             _activeElt.send_keys(_text)
@@ -154,6 +158,9 @@ module Scoutui::Commands
             #_c = Scoutui::Commands::ClickObject.new(_subcmd)
             #_c.run(driver: drv)
 
+          elsif Scoutui::Commands::Utils.instance.isPause?(_subcmd)
+            processCommand(_subcmd, nil, drv)
+
           elsif _subcmd.match(/^\s*select\((.*)\)\s*$/)
 
             _c=Scoutui::Commands.processCommand(_subcmd, nil, drv)
@@ -243,7 +250,25 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " WebDriverError.switch_to.alert"
       end
 
-      if Scoutui::Commands::Utils.instance.isPause?(_action)
+      if Scoutui::Commands::Utils.instance.isWhileDo?(_action)
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " === WhileDo ==="
+        _cmd='whileDo'
+        _c = Scoutui::Commands::WhileDo.new(my_driver)
+        _c.execute(e['page']['action'])
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "   WHileDo Pause post-execute"; #STDIN.gets
+
+      elsif Scoutui::Commands::Utils.instance.isDoUntil?(_action)
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == process DoUntil : #{e}"
+        _cmd='doUntil'
+        _c = Scoutui::Commands::DoUntil.new(my_driver)
+        _c.do_until(e['page']['action'])
+
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Pause on DO_UNTIL => #{_c}  passed? : #{_c.passed?}"; # STDIN.gets
+
+
+      elsif Scoutui::Commands::Utils.instance.isPause?(_action)
         _cmd='pause'
         _c = Scoutui::Commands::Pause.new(nil)
         _c.execute(e);
@@ -287,7 +312,8 @@ module Scoutui::Commands
         if e['page'].has_key?('vars')
           e['page']['vars'].each do |_a|
 
-            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + "  Process Assignment.var : #{_a}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " process assign var: #{_a}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  Process Assignment.var : #{_a}"
 
             begin
               _caborted=false
@@ -299,9 +325,13 @@ module Scoutui::Commands
 
               _c = Scoutui::Commands::AssignVar.new(_a)
               _rc=_c.run(driver: my_driver, dut: e)
-              _c.setResult(_rc)
+           #  _c.setResult(_rc)
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{_a}  => #{_rc}"
             rescue => ex
               _caborted=true
+              Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class.to_s} : Error during processing: #{ex.message}"
+              Scoutui::Logger::LogMgr.instance.warn " Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
             end
 
             _testcase = Scoutui::Utils::TestUtils.instance.getTC() || _cmd.downcase
@@ -312,6 +342,7 @@ module Scoutui::Commands
 
 
       elsif Scoutui::Commands::Utils.instance.isAssignVar?(_action)
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == AssignVar : #{_action}"
         _cmd='assignvar'
         _c = Scoutui::Commands::AssignVar.new(_action)
         _c.run(driver: my_driver, dut: e)

data/lib/scoutui/commands/type.rb

@@ -16,7 +16,7 @@ module Scoutui::Commands
         '__TAB__'   => { :val => :tab },
         '__SHIFT_TAB__' => {:val => :custom,
                             :run => lambda { |drv|
-                                 puts __FILE__ + (__LINE__).to_s + " *** SHIFT_TAB ***"
+                              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " *** SHIFT_TAB ***"
                                  drv.action.key_down(:shift).send_keys(:tab).perform;
                                  drv.action.key_up(:shift).perform;
                             }}
@@ -99,6 +99,8 @@ module Scoutui::Commands
 
           if KEYBOARD_CMDS.has_key?(_val)
             _val = KEYBOARD_CMDS[_val][:val]
+          else
+            _val=Scoutui::Base::UserVars.instance.normalize(_val)
           end
 
           _xpath="[focused]"

data/lib/scoutui/commands/update_url.rb

@@ -55,6 +55,8 @@ module Scoutui::Commands
       Testmgr::TestReport.instance.getReq(_req).testcase(_testcase).add(_rc, Scoutui::Base::UserVars.instance.normalize("Verify navigate to url #{normUrl}"), _duration)
 
 
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " update_url => #{_rc}"
+
       setResult(_rc)
 
     end

data/lib/scoutui/commands/utils.rb

@@ -16,6 +16,7 @@ module Scoutui::Commands
       @command_list=['pause',
                      'assignvar',
                      'assignments',
+                     'doUntil',
                      'existsAlert',
                      'clickJsAlert',
                      'dumpvars',
@@ -40,7 +41,8 @@ module Scoutui::Commands
                      'uploadfiles',
                      'verifyelt',
                      'verifyelement',
-                     'verifyform']
+                     'verifyform',
+                     'whileDo']
       @totalCommands={}
       @timeout=30
       @command_list.each do |c|
@@ -228,120 +230,132 @@ module Scoutui::Commands
       @timeout.to_i
     end
 
+    def isDoUntil?(_action)
+      _action.is_a?(Hash) && _action.has_key?('do') && !_action.has_key?('while')
+    end
+
+    def isWhileDo?(_action)
+      _action.is_a?(Hash) && _action.has_key?('while') && _action.has_key?('do')
+    end
+
     def isAssignments?(_action)
-      !_action.match(/^\s*(assignments)\s*$/).nil?
+      _action.is_a?(String) &&  !_action.match(/^\s*(assignments)\s*$/).nil?
     end
 
     def isAssignVar?(_action)
-      !_action.match(/assign\(([\w]+)\s*\,(.*)\)\s*$/i).nil?
+      _action.is_a?(String) &&  !_action.match(/assign\(([\w]+)\s*\,(.*)\)\s*$/i).nil?
     end
 
     def isSelectWindow?(_action)
-      !_action.match(/^\s*select_window/i).nil?
+      _action.is_a?(String) &&  !_action.match(/^\s*select_window/i).nil?
     end
 
     def isExistsAlert?(_action)
-      !_action.match(/(exist[s]*_*alert|existAlert|existsAlert|existsJsAlert|existsJsConfirm|existsJsPrompt)\(/i).nil?
+      _action.is_a?(String) &&  !_action.match(/(exist[s]*_*alert|existAlert|existsAlert|existsJsAlert|existsJsConfirm|existsJsPrompt)\(/i).nil?
     end
 
     def isFrame?(_action)
-      _action.match(/^\s*(frame|switchframe|switch_frame)\s*\(/i)
+      _action.is_a?(String) &&  _action.match(/^\s*(frame|switchframe|switch_frame)\s*\(/i)
     end
 
     def isHighlight?(_action)
-      _action.match(/^\s*(highlight)/i)
+      _action.is_a?(String) &&   _action.match(/^\s*(highlight)/i)
     end
 
     def isVerifyElt?(_action)
-      !_action.match(/(verifyelt|verifyelement)\(/i).nil?
+      _action.is_a?(String) && !_action.match(/(verifyelt|verifyelement)\(/i).nil?
     end
 
     def isClick?(_action)
-      !_action.match(/click\(/i).nil?
+      _action.is_a?(String) &&  !_action.match(/click\(/i).nil?
     end
 
     def isGetAlert?(_action)
-      !_action.match(/(get_*alert|clickjsconfirm|clickjsprompt|clickjsalert)/i).nil?
+      _action.is_a?(String) &&  !_action.match(/(get_*alert|clickjsconfirm|clickjsprompt|clickjsalert)/i).nil?
     end
 
     def isFillForm?(_action)
-      !_action.match(/fillform\(/i).nil?
+      _action.is_a?(String) &&  !_action.match(/fillform\(/i).nil?
     end
 
     def isConnect?(_action)
-      !_action.match(/^\s*connect\s*$/i).nil?
+      _action.is_a?(String) &&  !_action.match(/^\s*connect\s*$/i).nil?
     end
 
     def isDumpVars?(_action)
-      !_action.match(/^\s*dumpvars\s*$/i).nil?
+      _action.is_a?(String) &&  !_action.match(/^\s*dumpvars\s*$/i).nil?
     end
 
     def isLoadDB?(_action)
-      !_action.match(/^\s*loaddb\s*$/i).nil?
+      _action.is_a?(String) &&  !_action.match(/^\s*loaddb\s*$/i).nil?
     end
 
     def isExecuteCommands?(_action)
-      !_action.match(/^\s*executecommand[s]*\s*$/i).nil?
+      _action.is_a?(String) && !_action.match(/^\s*executecommand[s]*\s*$/i).nil?
     end
 
     def isDefineCommands?(_action)
-      !_action.match(/^\s*definecommand[s]*\s*$/i).nil?
+      _action.is_a?(String) && !_action.match(/^\s*definecommand[s]*\s*$/i).nil?
     end
 
     def isLoadData?(_action)
-      !_action.match(/^\s*loaddata\s*$/i).nil?
+      _action.is_a?(String) && !_action.match(/^\s*loaddata\s*$/i).nil?
     end
 
     def isLoadJs?(_action)
-      !_action.match(/^\s*loadjs\s*$/i).nil?
+      _action.is_a?(String) && !_action.match(/^\s*loadjs\s*$/i).nil?
     end
 
 
     def isLoadRequirements?(_action)
-      !_action.match(/^\s*loadrequirements\s*$/i).nil?
+      _action.is_a?(String) && !_action.match(/^\s*loadrequirements\s*$/i).nil?
     end
 
     def isMouseOver?(_action)
-      !_action.match(/mouseover\(/).nil?
+      _action.is_a?(String) && !_action.match(/mouseover\(/).nil?
     end
 
     def isType?(_action)
-      !_action.match(/type[\!]*\(/).nil?
+      _action.is_a?(String) && !_action.match(/type[\!]*\(/).nil?
     end
 
     def isSubmitForm?(_action)
-      !_action.match(/submitform\(/).nil?
+      _action.is_a?(String) && !_action.match(/submitform\(/).nil?
     end
 
     def isVerifyForm?(_action)
-      !_action.match(/verifyform\(/).nil?
+      _action.is_a?(String) && !_action.match(/verifyform\(/).nil?
     end
 
     def isPause?(_action)
-      !_action.match(/pause/).nil?
+      _action.is_a?(String) && !_action.match(/pause/).nil?
     end
 
     def isSelect?(_action)
-      !_action.nil? && _action.match(/^\s*select\s*\(/i)
+      !_action.nil? && _action.is_a?(String) && _action.match(/^\s*select\s*\(/i)
     end
 
     def isSleep?(_action)
-      !_action.nil? && _action.match(/^\s*sleep\s*\(\s*\d+\s*\)\s*$/i)
+      !_action.nil? && _action.is_a?(String) && _action.match(/^\s*sleep\s*\(\s*\d+\s*\)\s*$/i)
     end
 
     def isUploadFiles?(_action)
-      !_action.nil? && _action.match(/^\s*uploadfiles\s*$/i)
+      !_action.nil? && _action.is_a?(String) && _action.match(/^\s*uploadfiles\s*$/i)
     end
 
     def isNavigate?(_action)
-      !_action.nil? && _action.match(/(navigate|url)\(/i)
+      !_action.nil? && _action.is_a?(String) && _action.match(/(navigate|url)\(/i)
     end
 
     def isValid?(cmd)
 
       rc=true
 
-      if isPause?(cmd)
+      if isDoUntil?(cmd)
+        @totalCommands['doUntil']+=1
+      elsif isWhileDo?(cmd)
+        @totalCommands['whileDo']+=1
+      elsif isPause?(cmd)
         @totalCommands['pause']+=1
       elsif isAssignVar?(cmd)
         @totalCommands['assignvar']+=1

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.5.3"
+  VERSION = "2.0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.5.3
+  version: 2.0.5.4
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,6 +251,7 @@ files:
 - lib/scoutui/commands/assign_var.rb
 - lib/scoutui/commands/clauses/do_until.rb
 - lib/scoutui/commands/clauses/then_clause.rb
+- lib/scoutui/commands/clauses/while_do.rb
 - lib/scoutui/commands/click_object.rb
 - lib/scoutui/commands/command.rb
 - lib/scoutui/commands/commands.rb