scoutui 2.0.3.8.pre → 2.0.3.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79994a0d4fd1486ba1b69e52c53818b71ea2e644
-  data.tar.gz: aa2f3f32e50bceef913ab4a4dcf9636a00f99a15
+  metadata.gz: 85f74f61ddde9a9f3780649cf4cb0a62025b50fb
+  data.tar.gz: e2c3e2c54903c23c6ce96052ed1557836f63e4a7
 SHA512:
-  metadata.gz: b44ef15a132347af422c4b6305254bf95980d994a65fafef8ef77d7860e6418d97103b5eb9c7d4e2d53f7ad175f3de51193795e6387e35a825a392a67a326e25
-  data.tar.gz: 60ebca8ff2beeafe10e75912a02719c0180bfb6646c4058de1d317a93a892051d68d99f8ecf9bb38c1ce5fea786f6676b6c75ca5a98c140b91de5f40e2049bb5
+  metadata.gz: 323b77c4659a4bd93744b57af6d20a7ef14288e2f373aaab2ff90d351e570648e59578478d9c5be44214eab20168dbf8984cf05e6c3d437d56b34177c042a3ef
+  data.tar.gz: 0edc3b3ded7801b002d2d0c176e1eba8d3cf12f8737b0160f4faf5ee2a9b94668c29bfcae447950515a8be22885522cd77473f20dc0ca453a14561af454e3ba5

data/lib/scoutui/appmodel/q_model.rb

@@ -50,7 +50,8 @@ module Scoutui::ApplicationModel
     def getPageElement(s)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getPageElement(#{s})"
 
-      if s.match(/^\s*\//) || s.match(/^\s*css\s*=/i)
+      if s.match(/^\s*\//) || s.match(/^\s*css\s*=/i) || s.match(/^\s*#/)
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getPageElement(#{s} return nil"
         return nil
       end
 
@@ -59,6 +60,8 @@ module Scoutui::ApplicationModel
       nodes = s.split(/\./)
 
       nodes.each { |elt|
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " process #{elt}"
         getter = elt.split(/\(/)[0]
         _obj = elt.match(/\((.*)\)/)[1]
 

data/lib/scoutui/base/q_browser.rb

@@ -173,7 +173,9 @@ module Scoutui::Base
       if !frames.nil?
         puts __FILE__ + (__LINE__).to_s + " [self.switch_frame]: frames => #{frames}";
 
-        frame_list=frames.split(/(frame\(.*\))\.(?=[\w])/)
+    #   frame_list=frames.split(/(frame\(.*\))\.(?=[\w])/)
+        frame_list=frames.split(/\.(?=frame)/)
+
 
         frame_list.each do |_f|
           puts __FILE__ + (__LINE__).to_s + " processing #{_f}"

data/lib/scoutui/base/user_vars.rb

@@ -123,6 +123,12 @@ module Scoutui::Base
 
     def getUserVar(_k)
       rc=nil
+
+      if _k=='${LOC}' || user_var=='${__LOC__}'
+        _k = :lang
+      end
+
+
       if @userVars.has_key?(_k)
         rc=@userVars[_k]
       end

data/lib/scoutui/base/visual_test_framework.rb

@@ -385,7 +385,31 @@ module Scoutui::Base
 
           if _v.has_key?('visible_when')
 
-            if _v['visible_when'].match(/always/i)
+            if _v['visible_when'].match(/value\((\$\{.*\})\)=(.*)/)
+
+              user_var = _v['visible_when'].match(/value\((\$\{.*\})\)=(.*)/)[1]
+              expected_v = _v['visible_when'].match(/value\((\$\{.*\})\)=(.*)/)[2]
+
+              _uservar_val = Scoutui::Base::UserVars.instance.getVar(user_var)
+
+
+
+              puts __FILE__ + (__LINE__).to_s + " _uservar_val : #{_uservar_val}"
+              puts __FILE__ + (__LINE__).to_s + " Assert user variable - #{user_var} matches #{expected_v} => #{_uservar_val.match(expected_v)}"
+
+
+              if _uservar_val.match(expected_v)
+                # 5150
+
+                Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + "Verify conditional assertion #{_k} - #{!_obj.nil?}"
+                Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify assertion #{_k} - #{_locator} visible when #{_v['visible_when']}")
+              else
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Conditional Assertion skipped - trigger #{_v['visible_when']} is false"
+              end
+
+
+
+            elsif _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 Scoutui::Base::Assertions.instance.visible_when_never(_k, _v, _obj, _req)

data/lib/scoutui/commands/click_object.rb

@@ -6,6 +6,8 @@ module Scoutui::Commands
 
     def _whenClicked(page_elt)
 
+      return if page_elt.nil?
+
       if page_elt.is_a?(Hash) && page_elt.has_key?('when_clicked')
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Verify #{page_elt['when_clicked']}"
 

data/lib/scoutui/commands/strategy.rb

@@ -160,6 +160,7 @@ module Scoutui::Commands
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Ruby bindings workaround for Edge"
               caps={}
             else
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " edge()"
               caps = Selenium::WebDriver::Remote::Capabilities.edge()
             end
 

data/lib/scoutui/commands/type.rb

@@ -48,11 +48,6 @@ module Scoutui::Commands
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
       begin
-#        _xpath = @cmd.match(/type[\!]*\((.*),\s*/)[1].to_s
-#        _val   = @cmd.match(/type[\!]*\(.*,\s*(.*)\)/)[1].to_s
-
-
-
 
         if @cmd.strip.match(/^\s*type\s*\(\s*__TAB__\s*\)\s*$/)
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " HIT TAB key"
@@ -68,7 +63,6 @@ module Scoutui::Commands
 
           Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"
 
-# 5150          obj = Scoutui::Base::QBrowser.getObject(@drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
           obj = Scoutui::Base::QBrowser.findElement(@drv, _xpath, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " type(#{_val})"

data/lib/scoutui/eyes/eye_scout.rb

@@ -143,15 +143,28 @@ module Scoutui::Eyes
     end
 
     def check_window(tag, region=nil)
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " check_window(#{tag.to_s})"  if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " check_window(#{tag.to_s}, #{region})"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
       return if !Scoutui::Utils::TestUtils.instance.eyesEnabled?
 
       if region.nil?
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " check_window(#{tag.to_s})"
         eyes().check_window(tag.to_s)
       else
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " check_window.fullshot"
         f = eyes().force_fullpage_screenshot
-        eyes().check_region(:xpath, region, tag)
+
+        if region.match(/^css\s*\=\s*/)
+          _css = region.gsub(/^css\s*\=\s*/,"").to_s
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " snapshot(region.css) : #{_css}"
+          eyes().check_region(:css, _css, tag)
+        else
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "check_window(:xpath, #{region}, #{tag})"
+          eyes().check_region(:xpath, region, tag)
+        end
+
         eyes().force_fullpage_screenshot = f
       end
 
@@ -193,6 +206,7 @@ module Scoutui::Eyes
       viewport_size = Scoutui::Base::UserVars.instance.getViewPort()
 
       puts __FILE__ + (__LINE__).to_s + " browserType => #{browserType}"
+      puts __FILE__ + (__LINE__).to_s + " viewport : #{viewport_size}"
 
 
       Testmgr::TestReport.instance.setDescription('ScoutUI Test')
@@ -238,7 +252,7 @@ module Scoutui::Eyes
         end
 
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.info ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
       end
 
     end

data/lib/scoutui/utils/utils.rb

@@ -105,7 +105,13 @@ module Scoutui::Utils
     end
 
     def getPageElement(s)
-      @app_model.getPageElement(s)
+      rc=nil
+
+      if !@app_model.nil?
+        rc=@app_model.getPageElement(s)
+      end
+
+      rc
     end
 
     def getAppModel()

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.8.pre"
+  VERSION = "2.0.3.9.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.8.pre
+  version: 2.0.3.9.pre
 platform: ruby
 authors:
 - Peter Kim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler