scoutui 2.0.3.14.pre → 2.0.3.15.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ad761505f75ae60fe1f9e0af0c13f48d139b98
-  data.tar.gz: 9893c66040a64e21cdb608fb75c2461a818b31c1
+  metadata.gz: 3f5ec30b2035139e274aa3fbab055ff814788e76
+  data.tar.gz: 68497e9af33ddcd16df11f26904c62043717837c
 SHA512:
-  metadata.gz: 4ec7fa1cfc570898012d67f1592cb1ca65e8e6543fdeab29ccfb35d551904f128933025168e85d8cadc50ea8cb749ede7b448ff3fd4930dc84afa40834feaf5a
-  data.tar.gz: 0a4002f547265322fbc82654f8c664337a10c4dc0e1fa7f80fd691bef4ab390a2058123590b21243a2e1887b76fe39244501f1e096ca35c773063e8bab48c240
+  metadata.gz: f4cef4d179bb04396a53d886b9bb5d221988619aa6aa5daf9b3a8c0ff83798803e9f481c24493f25ffa9dd871a4533b81d9d382db10cdda15128c625cffa452a
+  data.tar.gz: 51f7f1089fd17eebccfa4cebc4b9747ed9b3e4eadb6aadde11a13a605c0cd6ce9397ec73c0f1efee228538c2a8e5a46ef36dd98b1fd0f974d99f718bbafe2b15

data/lib/scoutui/base/assertions.rb

@@ -263,11 +263,15 @@ module Scoutui::Base
         end
       end
 
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " execute_when:visible => #{page_elt}"
+
       if cmd=='visible' && page_elt.is_a?(String) && page_elt.match(/^\s*page\s*\(/)
 
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process PageElement #{page_elt}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process PageElement #{page_elt}"
         pageObject = Scoutui::Utils::TestUtils.instance.getPageElement(page_elt)
 
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "     pageObject => #{pageObject}"
+
       elsif !Scoutui::Commands::Utils.instance.isCSS(page_elt).nil?
         pageObject={ 'locator' => Scoutui::Commands::Utils.instance.isCSS(page_elt) }
       elsif cmd=='visible' && page_elt.is_a?(String) && page_elt.match(/^\s*\//)

data/lib/scoutui/base/user_vars.rb

@@ -113,7 +113,7 @@ module Scoutui::Base
         v=@globals[k]
       end
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " get(#{k} => #{@globals.has_key?(k)} ==> #{v.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " get(#{k}) => #{@globals.has_key?(k)} ==> #{v.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
 
       v
     end
@@ -150,7 +150,11 @@ module Scoutui::Base
     end
 
     def getVar(k)
-      @globals[k].to_s
+      rc=nil
+      if @globals.has_key?(k)
+        rc=@globals[k].to_s
+      end
+      rc
     end
 
 

data/lib/scoutui/base/visual_test_framework.rb

@@ -750,6 +750,27 @@ module Scoutui::Base
               next;
             end
 
+          elsif _execute_when.is_a?(String) && _execute_when.match(/^\s*(\$\{.*\})\s*(==)(.*)$/)
+
+            _match = _execute_when.match(/^\s*(\$\{.*\})\s*(==)(.*)$/)
+            _var  = _match[1]
+            _cond = _match[2]
+            _val  = _match[3]
+
+            _uservar_val = Scoutui::Base::UserVars.instance.getVar(_var)
+            _uservar_val = Scoutui::Base::UserVars.instance.get(_var)  if _uservar_val.nil?
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " execute_when.condition => #{_uservar_val} equals #{_val}"
+
+            _rc=(_uservar_val.match(/#{_val}/) || _uservar_val==_val)
+
+            puts __FILE__ + (__LINE__).to_s + " _rc => #{_rc} is nil (#{_rc.nil?})"
+
+            if !_rc
+              Scoutui::Logger::LogMgr.instance.info " Execute_When: #{_uservar_val} == #{_val} : false - skip #{e[STEP_KEY]}"
+               next
+            end
+
 
           elsif _execute_when.is_a?(String)
             _rc=Scoutui::Base::Assertions.instance.isVisible(my_driver, _execute_when, _reqid, true)

data/lib/scoutui/commands/type.rb

@@ -55,10 +55,7 @@ module Scoutui::Commands
           _rc=true
           _isKb=true
         else
-         # _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}"
@@ -78,13 +75,10 @@ module Scoutui::Commands
             }
 
             if @cmd.match(/type\!/i)
-
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " clear()"
               obj.clear if isDisplayed
             end
 
-
-
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " send_keys(#{_val})"
 
             if isDisplayed
@@ -112,7 +106,39 @@ module Scoutui::Commands
 
                 end
 
-                obj.send_keys(Scoutui::Base::UserVars.instance.get(_v2))
+                ## Global replaces
+                _text_to_type = Scoutui::Base::UserVars.instance.get(_v2)
+
+
+                transList={
+                    '__DATE__' => lambda { Time.now().to_s },
+                    '__CITY__' => lambda { Faker::Address.city.to_s },
+                    '__ZIP__' => lambda { Faker::Address.zip_code.to_s },
+                    '__STREET__' => lambda { Faker::Address.street_address.to_s},
+                    '__STATE__' => lambda { Faker::Address.state.to_s },
+                    '__COUNTRY__' => lambda { Faker::Address.country.to_s },
+                    '__SENTENCE__' => lambda { Faker::Lorem.sentence.to_s },
+                    '__PARAGRAPH__' => lambda { Faker::Lorem.paragraph.to_s },
+                    '__NUMBER__' => lambda { Faker::Number.number(10).to_s},
+                    '__NUMBER(5)__' => lambda { Faker::Number.number(5).to_s},
+                    '__NUMBER(8)__' => lambda { Faker::Number.number(8).to_s},
+                    '__NUMBER(10)__' => lambda { Faker::Number.number(10).to_s},
+                    '__NUMBER(1, 28)__' => lambda { Faker::Number.between(1, 28).to_s },
+                    '__NUMBER(1, 29)__' => lambda { Faker::Number.between(1, 29).to_s },
+                    '__NUMBER(1, 30)__' => lambda { Faker::Number.between(1, 30).to_s },
+                    '__NUMBER(1, 31)__' => lambda { Faker::Number.between(1, 31).to_s }
+                }
+
+                transList.each_pair do |_k, _v|
+
+                  if _text_to_type.include?(_k.to_s)
+                    _text_to_type.gsub!(_k, _v.call)
+                  end
+                end
+
+              #  _text_to_type.gsub!(/__DATE__/, Time.now().to_s)
+
+                obj.send_keys(_text_to_type)
               end
 
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.14.pre"
+  VERSION = "2.0.3.15.pre"
 end

metadata

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