scoutui 2.0.1 → 2.0.2

data/lib/scoutui/base/q_applitools.rb

@@ -1,6 +1,6 @@
 
-require 'eyes_selenium'
-require 'httparty'
+#require 'eyes_selenium'
+#require 'httparty'
 
 
 module Scoutui::Base

data/lib/scoutui/base/q_browser.rb

@@ -1,6 +1,6 @@
 
-require 'eyes_selenium'
-require 'selenium-webdriver'
+#require 'eyes_selenium'
+#require 'selenium-webdriver'
 
 module Scoutui::Base
 
@@ -35,9 +35,37 @@ module Scoutui::Base
       rc
     end
 
-    def self.getFirstObject(drv, _locator, _timeout=30)
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getFirstObject(#{_locator})" if Scoutui::Utils::TestUtils.instance.isDebug?
+    def self.existsAlert?(drv)
+      rc=false
+
+      begin
+        alert=drv.switch_to.alert
+
+        if alert.is_a?(Selenium::WebDriver::Alert)
+          rc=true
+        end
+
+
+      rescue Selenium::WebDriver::Error::NoSuchAlertError
+        ;
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " existsAlert?() => #{rc}"
+      rc
+    end
+
+    def self.getFirstObject(drv, _locator, _timeout=nil)
+
+      if _timeout.nil?
+        _timeout = Scoutui::Utils::TestUtils.instance.getDefaultWait
+      end
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getFirstObject(#{_locator}, #{_timeout})"
+
+      if _timeout > 30
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + "  A #{_timeout} second timeout is set high, may slow down tests"
+      end
+
       rc=nil
       locator=_locator
 
@@ -64,7 +92,12 @@ module Scoutui::Base
     end
 
     # http://stackoverflow.com/questions/15164742/combining-implicit-wait-and-explicit-wait-together-results-in-unexpected-wait-ti#answer-15174978
-    def self.getObject(drv, obj, _timeout=30)
+    def self.getObject(drv, obj, _timeout=nil)
+
+      if _timeout.nil?
+        _timeout = Scoutui::Utils::TestUtils.instance.getDefaultWait
+      end
+
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getObject(#{obj})  class:#{obj.class.to_s}   hash : #{obj.is_a?(Hash)}" if Scoutui::Utils::TestUtils.instance.isDebug?
       rc=nil
       visible_when=nil

data/lib/scoutui/base/q_form.rb

@@ -38,7 +38,7 @@ module Scoutui::Base
 
       _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
 
@@ -111,7 +111,7 @@ module Scoutui::Base
             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?
@@ -143,18 +143,18 @@ module Scoutui::Base
 
                 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}"
@@ -166,7 +166,7 @@ module Scoutui::Base
                   _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}"
 
 
@@ -220,7 +220,7 @@ module Scoutui::Base
 
             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

data/lib/scoutui/base/test_scout.rb

@@ -101,7 +101,8 @@ module Scoutui::Base
         teardown()
 
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.debug ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Error during processing: #{ex}"
+        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
       ensure
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__ ).to_s + " Close Eyes" if Scoutui::Utils::TestUtils.instance.isDebug?
         @eyeScout.closeOut()

data/lib/scoutui/base/user_vars.rb

@@ -42,9 +42,34 @@ module Scoutui::Base
       @globals[:host].to_s
     end
 
-    def get(k)
+    def normalize(s)
+      _vars = s.scan(/(\$\{.*?\})/)
+      _vars.each do | _v|
+        if _v.length==1
+
+          _u = Scoutui::Base::UserVars.instance.get(_v[0].to_s)
+          puts __FILE__ + (__LINE__).to_s + " Normalize(#{_v}) => #{_u}"
+
+          s.gsub!(_v[0].to_s, _u)
+        end
+
+      end
+
+      s
+    end
+
+    def get(_k)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " get(#{_k})"
       foundKey=true
 
+      k=_k
+
+      if _k.is_a?(Array)
+        k=_k[0].to_s
+      end
+
+
       v=k
 
       _rc = k.match(/\$\{(.*)\}$/)
@@ -56,13 +81,15 @@ module Scoutui::Base
         k=:password
       elsif k=='${host}'
         k=:host
+      elsif k=='${lang}'
+        k=:lang
       elsif k.is_a?(Symbol)
         foundKey=true
       elsif k=='__random_email__'
         return Faker::Internet.email
       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.isDebug?
+        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()["user_vars"].has_key?(k)

data/lib/scoutui/base/visual_test_framework.rb

@@ -12,6 +12,189 @@ module Scoutui::Base
     end
 
 
+    def self.processPageElement(my_driver, k, xpath)
+
+      puts __FILE__ + (__LINE__).to_s + " processPageElement(#{xpath})"
+      processed=false
+      _obj=nil
+
+      if !xpath.match(/^\s*page\(.*\)\s*$/).nil?
+
+        processed=true
+
+        # Check if this is a form
+
+        page_elt = Scoutui::Utils::TestUtils.instance.getPageElement(xpath)
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process page request #{page_elt} => #{page_elt.class.to_s}"
+
+
+        sub_elts=0
+        if page_elt.is_a?(Hash)
+          sub_elts = page_elt.select { |_s| page_elt[_s].has_key?("locator") if page_elt[_s].is_a?(Hash) &&  !page_elt[_s].nil?  }.size
+        end
+
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " SubElts => #{sub_elts}"
+
+        if page_elt.is_a?(Hash) && page_elt.has_key?('locator')
+
+          ##
+          # expected:
+          #   wait: page(abc).get(def)    where this page_elt has "locator"
+
+          xpath = page_elt['locator'].to_s
+
+          _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, xpath, Scoutui::Commands::Utils.instance.getTimeout)
+
+
+
+
+          _req = nil
+
+          if page_elt.has_key?('reqid')
+            _req=page_elt['reqid'].to_s
+          end
+
+          Scoutui::Base::Assertions.instance.assertPageElement(k, page_elt, _obj, my_driver, _req)
+
+
+
+        elsif sub_elts > 0
+          Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Validate form"
+
+
+
+          page_elt.each_pair do |_k, _v|
+
+            begin
+
+              Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " k,v :: #{_k.to_s}, #{_v.to_s}  (#{_v.class.to_s})"
+
+              _obj=nil
+
+              if _v.is_a?(Array)
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Arrays - TBD => #{_v}"
+              end
+
+
+              if _v.is_a?(String)
+                puts __FILE__ + (__LINE__).to_s + " #{_v} is a string - next"
+                next
+              end
+
+              if _v.has_key?('assert_when') && _v['assert_when'].match(/role\s*\=/i)
+                _role = _v['assert_when'].match(/role\s*\=(.*)/i)[1].to_s
+                _expected_role = Scoutui::Utils::TestUtils.instance.getRole()
+
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Trigger: expected : #{_expected_role.to_s}, actual: #{_role.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+
+                if !_expected_role.nil? && !_role.match(/#{_expected_role}/i)
+                  Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Skip assertion since conditional assertion #{_v['assert_when']} not met" if Scoutui::Utils::TestUtils.instance.isDebug?
+                  next
+                elsif _expected_role.nil?
+                  Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Skip role based assertion since role was not provided" if Scoutui::Utils::TestUtils.instance.isDebug?
+                  next
+                end
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Verify object exists since the role #{_role} matches expected role #{_expected_role.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+              end
+
+
+              if Scoutui::Base::Assertions.instance.visible_when_skip(_k, _v)
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " SKIP #{_k.to_s} - #{_v.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+                next
+              end
+
+              _req = nil
+
+              if _v.has_key?('reqid')
+                _req=_v['reqid'].to_s
+              end
+
+              if _v.has_key?('locator')
+                _locator = _v['locator'].to_s
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " " + _k.to_s + " => " + _locator
+
+                #  _locator = Scoutui::Utils::TestUtils.instance.getPageElement(_v['locator'])
+
+                _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator, Scoutui::Commands::Utils.instance.getTimeout())
+
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{(!_obj.nil?).to_s}"  # if Scoutui::Utils::TestUtils.instance.isDebug?
+              end
+
+              if Scoutui::Base::Assertions.instance.visible_when_always(_k, _v, _obj, _req)
+                next
+              elsif Scoutui::Base::Assertions.instance.visible_when_never(_k, _v, _obj, _req)
+                next
+              elsif Scoutui::Base::Assertions.instance.visible_when_title(_k, _v, _obj, my_driver, _req)
+                next
+              elsif Scoutui::Base::Assertions.instance.visible_when_value(_k, _v, my_driver, _req)
+                next
+              elsif _v.has_key?('visible_when') && !_v['visible_when'].is_a?(Array)
+
+                if _v['visible_when'].match(/role\=/i)
+                  _role = _v['visible_when'].match(/role\=(.*)/i)[1].to_s
+                  _expected_role = Scoutui::Utils::TestUtils.instance.getRole()
+
+                  Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Verify object exists if the role #{_role} matches expected role #{_expected_role.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+
+                  if _role==_expected_role.to_s
+                    Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{_k} #{_locator}  visible when role #{_role} - #{!_obj.nil?.to_s}"
+                    Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify #{_k} #{_locator}  visible when role #{_role}")
+                  end
+
+                end
+              elsif _v.has_key?('visible_when') && _v['visible_when'].is_a?(Array)
+                Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " visible_when : (Array) - TBD  #{_v['visible_when']}"
+
+                _v['visible_when'].each do |_vwhen|
+                  puts __FILE__ + (__LINE__).to_s + " #{_vwhen}  #{_vwhen.class}"
+
+                  Scoutui::Base::Assertions.instance.assertPageElement(_k, _vwhen, _obj, my_driver, _req)
+
+
+                end
+              end
+
+
+            rescue => ex
+              Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Error during processing: #{ex}"
+              puts __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+            end
+
+
+          end
+
+          return
+
+
+        elsif xpath.is_a?(Hash)
+          xpath.each_pair do |_k, _v|
+
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " k,v :: #{_k.to_s}, #{_v.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+
+            if _v.has_key?('locator')
+              _locator = _v['locator'].to_s
+              Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " " + _k.to_s + " => " + _locator if Scoutui::Utils::TestUtils.instance.isDebug?
+
+              #  _locator = Scoutui::Utils::TestUtils.instance.getPageElement(_v['locator'])
+
+              _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator)
+
+              Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{!_obj.nil?}" if Scoutui::Utils::TestUtils.instance.isDebug?
+            end
+
+          end
+
+          # next
+        end
+
+
+      end
+
+      _obj
+
+    end
+
+
     def self.processCommand(_action, e, my_driver)
       _req = Scoutui::Utils::TestUtils.instance.getReq()
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " ===  Process ACTION : #{_action}  ==="  if Scoutui::Utils::TestUtils.instance.isDebug?
@@ -57,7 +240,7 @@ module Scoutui::Base
 
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
-        obj = Scoutui::Base::QBrowser.getObject(my_driver, _xpath)
+        obj = Scoutui::Base::QBrowser.getObject(my_driver, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
 
         if !obj.nil? && !obj.attribute('type').downcase.match(/(text|password|email)/).nil?
           Scoutui::Logger::LogMgr.instance.commands.info "send_keys(#{_val})"
@@ -139,6 +322,11 @@ module Scoutui::Base
         return
       end
 
+      if !e[STEP_KEY]['assertions'].is_a?(Array)
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " \'assertions\' field must be type Array."
+        return
+      end
+
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
       puts __FILE__ + (__LINE__).to_s + "======= #{e[STEP_KEY]['assertions']} ========="
@@ -161,15 +349,33 @@ module Scoutui::Base
           _v=a
 
 
-          if _v.has_key?('locator')
+          if _v.has_key?('reqid')
+            _req = _v['reqid']
+
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Temp req #{_req} for assertion"
+          end
+
+
+          if _v.has_key?('locator')  && _v['locator'].is_a?(String) && !_v.has_key?('visible_when')
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process pageObject #{_v}"
+            isVisible=Scoutui::Base::Assertions.instance.isVisible(my_driver, _v['locator'], _req)
+          elsif _v.has_key?('locator')
             _locator = _v['locator'].to_s
-            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " " + _k.to_s + " => " + _locator if Scoutui::Utils::TestUtils.instance.isDebug?
 
-            #  _locator = Scoutui::Utils::TestUtils.instance.getPageElement(_v['locator'])
+            if !_locator.match(/^page\([\w\d]+\)/).nil?
+              _obj = processPageElement(my_driver, _k, _locator)
+              puts __FILE__ + (__LINE__).to_s + " Processed #{_locator} => #{_obj.class.to_s}"
+            else
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " " + _k.to_s + " => " + _locator
+
+              #  _locator = Scoutui::Utils::TestUtils.instance.getPageElement(_v['locator'])
 
-            _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator, Scoutui::Commands::Utils.instance.getTimeout())
+              _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator, Scoutui::Commands::Utils.instance.getTimeout())
+
+              Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{!_obj.nil?}" if Scoutui::Utils::TestUtils.instance.isDebug?
+            end
 
-            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{!_obj.nil?}" if Scoutui::Utils::TestUtils.instance.isDebug?
           end
 
           if _v.has_key?('visible_when')
@@ -177,9 +383,8 @@ module Scoutui::Base
             if _v['visible_when'].match(/always/i)
               Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify assertion #{_k} - #{_locator} visible - #{!_obj.nil?.to_s}"
               Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify assertion #{_k} - #{_locator} visible")
-            elsif _v['visible_when'].match(/never/i)
-              Scoutui::Logger::LogMgr.instance.asserts.info "Verify assertion #{_k} #{_locator} not visible - #{obj.nil?.to_s}"
-              Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(obj.nil?, "Verify assertion #{_k} #{_locator} not visible")
+            elsif Scoutui::Base::Assertions.instance.visible_when_never(_k, _v, _obj, _req)
+              ;
             elsif _v['visible_when'].match(/role\=/i)
               _role = _v['visible_when'].match(/role\=(.*)/i)[1].to_s
               _expected_role = Scoutui::Utils::TestUtils.instance.getRole()
@@ -192,6 +397,10 @@ module Scoutui::Base
               end
 
             end
+
+
+
+
           end
 
 
@@ -234,8 +443,31 @@ module Scoutui::Base
 
             Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s +  "\t\t#{link_name} => #{xpath}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
+
+            # Check if the verification is a "windows.*" verification
+
+            if !xpath.match(/window[s]\.length\s*\(\d+\)/).nil?
+              _expected_length=xpath.match(/window[s]\.length\s*\((.*)\)/i)[1].to_s
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "\tExpect window.length is #{_expected_length}"
+
+              if _expected_length =~ /\A\d+\z/
+                # 5150
+                totalWindows = my_driver.window_handles.length
+
+                if Scoutui::Utils::TestUtils.instance.assertExpected?
+                  Testmgr::TestReport.instance.getReq(_req).get_child('window_size').add(totalWindows==_expected_length.to_i, "Verify number of windows is #{_expected_length}  actual(#{totalWindows})")
+                end
+
+              end
+
+              next
+            end
+
+
             if !xpath.match(/\$\{.*\}/).nil?
-              xpath = Scoutui::Base::UserVars.instance.get(xpath)
+          #    xpath = Scoutui::Base::UserVars.instance.get(xpath)
+              xpath = Scoutui::Base::UserVars.instance.normalize(xpath)
             end
 
 
@@ -318,10 +550,18 @@ module Scoutui::Base
 
                       if _v['visible_when'].match(/always/i)
                         Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify #{_k} - #{_locator} visible - #{!_obj.nil?.to_s}"
-                        Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify #{_k} - #{_locator} visible")
+
+                        if Scoutui::Utils::TestUtils.instance.assertExpected?
+                          Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify #{_k} - #{_locator} visible")
+                        end
+
                       elsif _v['visible_when'].match(/never/i)
-                        Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{_k} #{_locator} not visible - #{obj.nil?.to_s}"
-                        Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(obj.nil?, "Verify #{_k} #{_locator} not visible")
+                        Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{_k} #{_locator} never visible - #{obj.nil?.to_s}"
+
+                        if Scoutui::Utils::TestUtils.instance.assertExpected?
+                          Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(obj.nil?, "Verify #{_k} #{_locator} not visible")
+                        end
+
                       elsif _v['visible_when'].match(/role\=/i)
                         _role = _v['visible_when'].match(/role\=(.*)/i)[1].to_s
                         _expected_role = Scoutui::Utils::TestUtils.instance.getRole()
@@ -330,7 +570,11 @@ module Scoutui::Base
 
                         if _role==_expected_role.to_s
                           Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{_k} #{_locator}  visible when role #{_role} - #{!_obj.nil?.to_s}"
-                          Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify #{_k} #{_locator}  visible when role #{_role}")
+
+                          if Scoutui::Utils::TestUtils.instance.assertExpected?
+                            Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify #{_k} #{_locator}  visible when role #{_role}")
+                          end
+
                         end
 
                       end
@@ -359,7 +603,7 @@ module Scoutui::Base
 
                   #  _locator = Scoutui::Utils::TestUtils.instance.getPageElement(_v['locator'])
 
-                    _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator)
+                    _obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, _locator, Scoutui::Commands::Utils.instance.getTimeout())
 
                     Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " HIT #{_locator} => #{!_obj.nil?}" if Scoutui::Utils::TestUtils.instance.isDebug?
                   end
@@ -372,13 +616,16 @@ module Scoutui::Base
 
             end
 
-            obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, xpath)
+            obj = Scoutui::Base::QBrowser.getFirstObject(my_driver, xpath, Scoutui::Commands::Utils.instance.getTimeout())
 
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " obj : #{obj}"
 
             Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify #{xpath} visible - #{obj.kind_of?(Selenium::WebDriver::Element).to_s}"
 
-            Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!obj.nil?, __FILE__ + (__LINE__).to_s + " Verify #{xpath} visible")
+
+            if Scoutui::Utils::TestUtils.instance.assertExpected?
+              Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!obj.nil?, __FILE__ + (__LINE__).to_s + " Verify #{xpath} visible")
+            end
 
             if obj.nil?
               Scoutui::Logger::LogMgr.instance.warn " NOT FOUND : #{link_name} with xpath #{xpath}" if Scoutui::Utils::TestUtils.instance.isDebug?
@@ -410,7 +657,7 @@ module Scoutui::Base
         dut_dupes = YAML.load_stream File.read(datafile)
         valid_file=true
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Invalid file: #{datafile} - abort processing."
+        Scoutui::Logger::LogMgr.instance.fatal __FILE__ + (__LINE__).to_s + " Invalid file: #{datafile} - abort processing."
         Scoutui::Logger::LogMgr.instance.info ex.backtrace
       end
 
@@ -426,7 +673,7 @@ module Scoutui::Base
         i+=1
 
         Scoutui::Utils::TestUtils.instance.setReq('UI')
-        Scoutui::Commands::Utils.instance.resetTimeout()
+        Scoutui::Commands::Utils.instance.resetTimeout(Scoutui::Utils::TestUtils.instance.getDefaultWait)
 
         _action = e[STEP_KEY]["action"]
         _name   = e[STEP_KEY]["name"]
@@ -434,14 +681,12 @@ module Scoutui::Base
         _skip   = e[STEP_KEY]["skip"]
         _region = e[STEP_KEY]["region"]
         _reqid  = e[STEP_KEY]["reqid"]
+        _execute_when = e[STEP_KEY]["execute_when"]
 
         if e[STEP_KEY].has_key?("timeout")
          Scoutui::Commands::Utils.instance.setTimeout(e[STEP_KEY]["timeout"])
         end
 
-
-
-
         if Scoutui::Utils::TestUtils.instance.isDebug?
           Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " action: #{_action}"
           Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " name: #{_name}"
@@ -455,9 +700,42 @@ module Scoutui::Base
           Testmgr::TestReport.instance.getReq(_reqid)
           Scoutui::Utils::TestUtils.instance.setReq(_reqid)
         else
-          puts __FILE__ + (__LINE__).to_s + "  REQID was not provided"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  REQID was not provided"
         end
 
+
+        if !_execute_when.nil? && !_execute_when.to_s.empty?
+
+          if _execute_when.is_a?(String) && _execute_when.match(/^\s*(existsalert|existsalert|exists\(alert\))/i)
+
+#            puts __FILE__ + (__LINE__).to_s + " DEBUG - pause"; gets;
+
+            if QBrowser.existsAlert?(my_driver)
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Execution continues - alert IS present #{e[STEP_KEY]}"
+
+#              puts __FILE__ + (__LINE__).to_s + " DEBUG - pause2"; gets;
+
+
+            else
+#              puts __FILE__ + (__LINE__).to_s + " + Execution skipped - alert is NOT present";; gets()
+              next;
+            end
+
+
+          elsif _execute_when.is_a?(String)
+            _rc=Scoutui::Base::Assertions.instance.isVisible(my_driver, _execute_when, _reqid, true)
+
+            puts __FILE__ + (__LINE__).to_s + " EXECUTE_WHEN  #{_rc}";
+
+            if !_rc
+              Scoutui::Logger::LogMgr.instance.info " Execute_When: true - skip #{e[STEP_KEY]}"
+              next
+            end
+          end
+
+        end
+
+
         skipIt = (!_skip.nil?) && (_skip.to_s.strip.downcase=='true')
         Scoutui::Logger::LogMgr.instance.info "\to skip : #{skipIt}" if Scoutui::Utils::TestUtils.instance.isDebug?
 
@@ -467,6 +745,8 @@ module Scoutui::Base
         end
 
 
+
+
         if !isRun(e).nil?
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ========> RUN <================="
@@ -489,6 +769,10 @@ module Scoutui::Base
 
           begin
 
+            if _action.is_a?(String) && _action=='stop'
+              Scoutui::Logger::LogMgr.instance.info " STOP TEST"
+              break;
+            end
 
             _command = eyeScout.getStrategy().processCommand(_action, e)
 
@@ -550,7 +834,7 @@ module Scoutui::Base
             Scoutui::Logger::LogMgr.instance.info "\t\t#{link_name} => #{xpath}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
 
-            obj = QBrowser.getObject(my_driver, xpath)
+            obj = QBrowser.getObject(my_driver, xpath, Scoutui::Commands::Utils.instance.getTimeout)
             Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " [click]: link object => #{obj.to_s}"  if Scoutui::Utils::TestUtils.instance.isDebug?
             obj.click