scoutui 2.0.3.38.pre → 2.0.3.39.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec9b0736bf565a2215a60c142d20e588c9b1c4d
-  data.tar.gz: 5fd8c71c92ee75d5bd6f61415112a00a5386542f
+  metadata.gz: 70659ad4a781a8562a58c296d27846c8de09f62f
+  data.tar.gz: c868a849e7d2051695c51995bd3e7039db7a897c
 SHA512:
-  metadata.gz: 9509ba1faeef032c320e428abc4bfdfa5c535743e844a40446256f9b71f6dca9f89fc48dbd2438946f1f5ad38ef8ae62bf40c72cc52e01940fc8c6c0ef79ae8d
-  data.tar.gz: e6a559b672d667d54aba848e86426049d3ccc43d872a3c189477c3152f840b98d5f8a61662cc0ddcad5fcac8dc16fe33021a099e6798e8b8108786a07f91055f
+  metadata.gz: acaf7c63f6c423d3425f014c31190ceedc60f0238a3733c1f7c45bb8f2f9d3a856b3ca3e818333d68167c9958685037aacef15f15c04ce5e0559d6c51ecad1e7
+  data.tar.gz: 68e3b810a1249bdaccc62c3f87232a9949db9b35076db61cc92640400454ded772f5fe447ccd57d71086359409806558cdcbe4a8172fb6c5aa75317e8f3f031f

data/lib/scoutui/base/assertions.rb

@@ -433,10 +433,13 @@ module Scoutui::Base
         _t = isVisibleFrameCmd?(_execute_when)
 
         if !_t.nil?
-      # 5150    _locator = _t['locator']
+          _locator = _t['locator']
           _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
 
-          Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
+          if _t.has_key?('frame') && !_t['frame'].nil?
+            Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
+          end
+
         elsif isVisibleCmd?(_execute_when)
            _locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
         else

data/lib/scoutui/base/user_vars.rb

@@ -72,26 +72,33 @@ module Scoutui::Base
 
     def normalize(s)
 
-      if isTestData?(s)
+      begin
+        if Scoutui::Base::UserVars.instance.isTestData?(s)
 
-        _dataID=s.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
-        _getter=s.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
+          _dataID=s.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
+          _getter=s.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
 
-        return Scoutui::Base::TestData.instance.get(_dataID, _getter)
-      end
+          return Scoutui::Base::TestData.instance.get(_dataID, _getter)
+        end
 
-      _vars = s.scan(/(\$\{.*?\})/)
-      _vars.each do | _v|
-        if _v.length==1
+        _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}"
+            _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
 
-          s.gsub!(_v[0].to_s, _u)
         end
 
+      rescue => ex
+        puts __FILE__ + (__LINE__).to_s + " #{ex.class}"
+        puts ex.backtrace
       end
 
+
       s
     end
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.38.pre"
+  VERSION = "2.0.3.39.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.38.pre
+  version: 2.0.3.39.pre
 platform: ruby
 authors:
 - Peter Kim