scoutui 2.0.3.52.pre → 2.0.3.53.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5ebb44b58d0fd1eb73d96c9a2b522833c4accc
-  data.tar.gz: fa634ef22871fd4bc3968945ea234d32d8798462
+  metadata.gz: 4a35cafbcb1c807f7c74106dfbb18ce92d02cfaf
+  data.tar.gz: 774436f7c2c9a79de802682092d2620b02fa5409
 SHA512:
-  metadata.gz: bf786bed73a483ef5d89eb9718772571cbd742d89a17c711274510092412d6763174a53d85ab91392b553bbba61e9ad89da6b992e546494e10887d00476e2ecd
-  data.tar.gz: 9ee8d83cc685f41229d71256a6b0fc0bad3a1634d749fe80db12bbc4271f2ad046bebd97ec7974065c8ca6d9a4d7459cbaedf62502b098a057f5ea88e8d28570
+  metadata.gz: 3f133eba7e0505ff2fb452bb02588a02124cc5f8f25332b068fccb8682b8483611671ced48199f68ee5a81ca49f9b219a36371d63c98408438179f4489b17e8f
+  data.tar.gz: eba9ad266f74277f6d584386af782751a2dcf485dec0c96b1aa145620abaddb9345791907b5fd39b6175a910279429972cf72672d6d776b6e06c79e3ea6ac0a2

data/lib/scoutui/base/test_data.rb

@@ -11,12 +11,26 @@ module Scoutui::Base
     attr_accessor :testware
     attr_accessor :dblist
     attr_accessor :dut
+    attr_accessor :jsList
 
     def initialize
       @testware={}
       @dblist={}
+      @jsList={}
     end
 
+    def addJS(_id, _content)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " addJS(#{_id}, #{_content})"
+      @jsList[_id]=_content
+      @jsList[_id]
+    end
+
+    def getJS(_id)
+      @jsList[_id]
+    end
+
+
+
     def add(_id, _f)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add(#{_id}, #{_f})"
       @testware[_id]=DataMgr::DataModel.new(_f)

data/lib/scoutui/base/visual_test_framework.rb

@@ -1168,21 +1168,75 @@ module Scoutui::Base
         # 5150
         if e[STEP_KEY].has_key?('executejs')
 
-          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  ExecuteJS"
+          fcnId = e[STEP_KEY]['id'].to_s
 
-          e[STEP_KEY]['executejs'].each_key do |k|
-            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{k}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  ExecuteJS(#{fcnId})"
 
+          _jsContent = Scoutui::Base::TestData.instance.getJS(fcnId)
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  RUN #{fcnId} => #{_jsContent}"
+
+          if _jsContent
+            my_driver.execute_script(_jsContent)
+          end
+
+          e[STEP_KEY]['executejs'].each_key do |fcnToCall|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{fcnToCall}"
+
+
+            _args=[]
+
+            e[STEP_KEY]['executejs'][fcnToCall].each do |arg|
+              puts __FILE__ + (__LINE__).to_s + " ||| arg:  #{arg}"
+
+              if arg.match(/^\s*\//)
+                _args << Scoutui::Base::QBrowser.getObject(my_driver, arg, Scoutui::Commands::Utils.instance.getTimeout)
+              else
+                _args << arg
+              end
+
+            end
+
+            argString=""
+
+            if e[STEP_KEY]['executejs'][fcnToCall].length > 1
+              e[STEP_KEY]['executejs'][fcnToCall].length.times { |_t|
+
+                argString+="arguments[#{_t}], "
+              }
+            else
+               argString="arguments[0]"
+            end
+
+
+            puts __FILE__ + (__LINE__).to_s + " Execute => #{fcnToCall}(#{argString})"
+
+         #   _obj = Scoutui::Base::QBrowser.getObject(my_driver, '//body', Scoutui::Commands::Utils.instance.getTimeout)
+
+          #  my_driver.execute_script("return #{fcnToCall}(arguments[0]);", _args[0])
+            if _args.length==0
+              my_driver.execute_script("#{_jsContent}; return #{fcnToCall}(arguments[0]);")
+            elsif _args.length == 1
+              my_driver.execute_script("#{_jsContent}; return #{fcnToCall}(arguments[0]);", _args[0])
+            elsif _args.length==2
+              my_driver.execute_script("#{_jsContent}; return #{fcnToCall}(arguments[0], arguments[1]);", _args[0], _args[1])
+            elsif _args.length==3
+              my_driver.execute_script("#{_jsContent}; return #{fcnToCall}(arguments[0], arguments[1], arguments[2]);", _args[0], _args[1], _args[2])
+            elsif _args.length==4
+              my_driver.execute_script("#{_jsContent}; return #{fcnToCall}(arguments[0], arguments[1], arguments[2], arguments[3]);", _args[0], _args[1], _args[2], _args[3])
+            end
+
+          # my_driver.execute_script("hlt = function(c) { c.style.border='solid 5px rgb(233, 16, 16)'; }; return hlt(arguments[0]);", _obj)
 
             # page:
             #     name: LoadJS
             # action: loadjs
             # files:
-            #     - "../commands/general.js"
-            _cmd='loadjs'
-            _pg={"page" => { "action" => "loadjs", "files" => ["../commands/general.js"] } }
-            _c = Scoutui::Commands::LoadJs.new(_pg)
-            _c.run(driver: my_driver, dut: _pg)
+            ##     - "../commands/general.js"
+            #_cmd='loadjs'
+            #_pg={"page" => { "action" => "loadjs", "files" => ["../commands/general.js"] } }
+            #_c = Scoutui::Commands::LoadJs.new(_pg)
+            #_c.run(driver: my_driver, dut: _pg)
 
 
             # page:

data/lib/scoutui/commands/load_js.rb

@@ -31,6 +31,10 @@ module Scoutui::Commands
 
         end
 
+        if e['page'].has_key?('id')
+          Scoutui::Base::TestData.instance.addJS(e['page']['id'].to_s, js)
+        end
+
         rc=true
 
       rescue => ex
@@ -43,10 +47,6 @@ module Scoutui::Commands
         Testmgr::TestReport.instance.getReq(_req).testcase('click').add(rc, "Verify requirements command passed")
       end
 
-      if rc
-        puts __FILE__ + (__LINE__).to_s + "   JS => #{js}"
-      end
-
       setResult(rc)
     end
 

data/lib/scoutui/commands/strategy.rb

@@ -125,7 +125,7 @@ module Scoutui::Commands
           caps = {
               :platform => "Mac OS X 10.9",
               :browserName => "chrome",
-              :version => "31",
+              :version => "beta",
               :full_description => 'Rover Test'
           }
 

data/lib/scoutui/commands/type.rb

@@ -7,6 +7,8 @@ module Scoutui::Commands
 
     KEYBOARD_LIST={
         '__DOWN__' => lambda { |obj| obj.send_keys(:arrow_down) },
+        '__ESC__' => lambda { |obj| obj.send_keys(:escape) },
+        '__ESCAPE__' => lambda { |obj| obj.send_keys(:escape) },
         '__TAB__'  => lambda { |obj| obj.send_keys(:tab) },
         '__CLEAR__'  => lambda { |obj| obj.clear }
     }
@@ -73,6 +75,10 @@ module Scoutui::Commands
           @drv.action.send_keys(:enter).perform
           _rc=true
           _isKb=true
+        elsif @cmd.strip.match(/^\s*type\s*\(\s*(__ESC__|__ESCAPE__)\s*\)\s*$/)
+          @drv.action.send_keys(:escape).perform
+          _rc=true
+          _isKb=true
         else
 
           if @cmd.match(/^\s*type[\!]*\((.*),\s*'(.*)\s*'\)\s*$/)

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.52.pre"
+  VERSION = "2.0.3.53.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.52.pre
+  version: 2.0.3.53.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler