scoutui 2.0.3.2.pre → 2.0.3.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581f39c253c65fff0b56a14aeba3aadfc08e787a
-  data.tar.gz: 491f1a5fa80b9d7fd09a91ff4f4f226ce4ad99df
+  metadata.gz: 527f1f2733f22189ec8c9c60df25ef1bdd5dcc07
+  data.tar.gz: 7b4038b15f762a0fa0514ba1a2fa73feccd9f7c4
 SHA512:
-  metadata.gz: e7b691217037929862031144decdc1cc042392a6fbb0b84c80bc5659b02c74a381050f35cd9a8eef8885658150cb471012bc68a3f200bde0ab6349a45741652e
-  data.tar.gz: e8b76ed7ddd9fc00004211cd9961e5af3b8406ba1c14d3919b12db93b2f4bd4b35ce8ba72137fad57f4319b2be195dcea12af8482cad394fda978677923c4941
+  metadata.gz: b616c6f713ee98f9707f86aece0f819ca94dff25b0b9ea056746ec771d172932ee82fb5a84df5b224192fc739526e507ed412d92ad99f7f978d6592053e37220
+  data.tar.gz: e0ffad4cdbfcd7dfa7f8a37e9eaadbe2b5d15dc9cc2febe92d768f414d0e076075909f9f22a9c090e0ecac0bc958f1d9ceb9ca36caab9d44de1a5ea1069ff081

data/lib/scoutui/base/q_browser.rb

@@ -187,7 +187,13 @@ module Scoutui::Base
 
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process frame[#{i}] : #{_tag}"
 
-            drv.switch_to.frame _tag
+            # https://bugs.chromium.org/p/chromedriver/issues/detail?id=107
+            if drv.browser.to_s.match(/chrome/)
+              drv.switch_to.frame frames[i]
+            else
+              drv.switch_to.frame _tag
+            end
+
 
             _hits = frame_getObject(drv, _locator, 3)
           rescue => ex

data/lib/scoutui/base/user_vars.rb

@@ -100,6 +100,8 @@ module Scoutui::Base
 
         end
 
+      elsif @globals.has_key?(k)
+        foundKey=true
       else
         foundKey=false
       end

data/lib/scoutui/commands/type.rb

@@ -60,9 +60,11 @@ module Scoutui::Commands
           _rc=true
           _isKb=true
         else
-          _xpath = @cmd.match(/^\s*type[\!]*\((.*),\s*/)[1].to_s
-          _val   = @cmd.match(/^\s*type[\!]*\(.*,\s*(.*)\)/)[1].to_s
+         # _xpath = @cmd.match(/^\s*type[\!]*\((.*),\s*/)[1].to_s
+          _xpath = @cmd.match(/^\s*type[\!]*\(([^,]*),\s*/)[1].to_s
 
+         # _val   = @cmd.match(/^\s*type[\!]*\(.*,\s*(.*)\)/)[1].to_s
+          _val   = @cmd.match(/^\s*type[\!]*\([^,]*,\s*(.*)\)/)[1].to_s
 
           Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"
 
@@ -98,7 +100,25 @@ module Scoutui::Commands
                 obj.send_keys(:tab)
               else
 
-                obj.send_keys(Scoutui::Base::UserVars.instance.get(_val))
+                _uservars = _val.scan(/\$\{(.*?)\}/)
+
+
+                _v2 = _val
+                for i in 0 .. (_uservars.size - 1)
+
+
+                  _t = Scoutui::Base::UserVars.instance.get(_uservars[i][0])
+                  puts __FILE__ + (__LINE__).to_s + " translate(#{_uservars[i][0]}) => #{_t}"
+
+                  if !_t.nil? && _uservars[i][0]!=_t
+                    _v2.gsub!("\$\{#{_uservars[i][0]}\}", _t)
+                  end
+
+                  puts __FILE__ + (__LINE__).to_s + " value => #{_v2}"
+
+                end
+
+                obj.send_keys(Scoutui::Base::UserVars.instance.get(_v2))
               end
 
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.2.pre"
+  VERSION = "2.0.3.4.pre"
 end

metadata

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