scoutui 2.0.3.21.pre → 2.0.3.22.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6cbe80ef6254af1766a9720894597289d4d064f
-  data.tar.gz: 10ff1944d742307f6ca2f00d0bd88010ad5967a2
+  metadata.gz: 9b6949c1561c7804842c874fab22bd65cba0d8a0
+  data.tar.gz: f5f046b973cd9591b57c2479d06f84c5197aa665
 SHA512:
-  metadata.gz: d00da1fa824b2d4d92ba0bc6639852cf877126d4f563abcb049bb8b2cf507479c37e5ccdb71635fe04f24fd3a8584113b203346087d023c01728c3263afcca8f
-  data.tar.gz: f354494c43092620421531e0c39cfff40e897352c27e02da900dc62df405101c3ee0d5a03fae7e95e73530dfbe1f401b0aff3af65fad6a0340b81f3ba45667e3
+  metadata.gz: 2f1f3c9aaaf2e12619fe95b4f46097d2af812391b1ac25393b05dc779ab348abd0b6b830356e8caa4054fcfafa1436dfcac984fbc9f431bb1c573cd37f8fe02d
+  data.tar.gz: 3c71c4a7e4af5cd62f3f98783f0b27786076f91655e09de03674b9b6fb4342269ee300f722886a57043e09755a48eb7d2f99cc65684aeba2f7feaca3382c47ba

data/examples/benchmark/ex.rb

@@ -0,0 +1,16 @@
+
+
+
+def foo(opts)
+
+  puts opts
+
+
+end
+
+
+
+
+foo(rover: 'Rover')
+
+

data/examples/benchmark/ex_benchmark.rb

@@ -0,0 +1,16 @@
+
+
+require 'benchmark'
+
+
+
+x=Benchmark.measure { "a"*1_000_000_000 }
+
+
+x=Benchmark.measure { sleep 1 }
+
+puts x.class.to_s
+
+puts x
+
+puts x.real

data/examples/ex6/appmodel/model.json

@@ -0,0 +1,10 @@
+{
+   "obstacle": {
+
+    "tinymce": {
+      "locator" : "//*[@id='tinymce']",
+      "vislble_when": "always"
+    }
+
+  }
+}

data/examples/ex6/tests/test.sh

@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+
+
+##
+# Pre-req - Sauce Connect is running
+##
+
+setup()
+{
+  HOST="http://the-internet.herokuapp.com/tinymce"
+
+  CAPS="--capabilities ../../common/capabilities/win10.chrome50.json"
+  CAPS="--capabilities ../capabilities/win10.ff46.json"
+#  CAPS=
+#  CAPS="--sauce:browser chrome  --sauce:platform \"Windows 10\"  --sauce:version 46.0  --sauce:resolution 1024x768"
+
+  USER_ID="terrybrown@commasavvy.com"
+  PASSWORD="password1"
+  TESTCFG=../testconfig/test.config.json
+
+
+  TITLE="CARMAX"
+  VIEWPORT="1024x768"
+
+  MODEL="../appmodel/main.nav.json,../appmodel/search_results.json"
+
+  EYES="--eyes --app ${TITLE} --title ${TITLE}  --match layout2"
+  EYES=
+
+  SAUCE="--sauce --sauce_name ${TITLE}"
+#  SAUCE="--browser chrome"
+
+  CMD="../commands/commands.yml"
+  CMD="../commands/basic_search.yml"
+
+  CMD="../commands/home.commands.yml"
+
+}
+
+
+
+run1()
+{
+
+  EYES=
+  EYES="--eyes --app ${TITLE}.1280 --title ${TITLE}  --match layout2"
+  VIEWPORT="--viewport 1024x670"
+#  VIEWPORT="--viewport 1024x722"
+  VIEWPORT=
+# --sauce:platform "Windows 10" --sauce:build SmokeEx --sauce:name Smokes  --sauce:browsername "MicrosoftEdge" --sauce:browser "MS Edge 13.10586" --sauce:version "13.10586" --sauce:resolution "1280x1024" \
+
+ruby $SCOUTUI_BIN  \
+       --config ${TESTCFG} \
+       --user "expense.admin@scoutui.com" --password password1 \
+       --diff /tmp/vt \
+       --pages ../appmodel/model.json \
+       --eyes:run false \
+            --eyes:viewport 1024x670 \
+            --eyes:app "CarMaxTestApp" \
+            --eyes:title "CarMaxTitle" \
+       --sauce:run false \
+            --sauce:platform "Windows 10" \
+            --sauce:build SmokeEx \
+            --sauce:name Smokes \
+            --sauce:browser "chrome" \
+            --sauce:version "beta" \
+            --sauce:resolution "1280x1024" \
+       --host ${HOST} \
+       --debug \
+       --dut "${CMD}"
+
+}
+
+run2()
+{
+
+CAPS="--capabilities ../capabilities/win10.ff46.json"
+
+ruby $SCOUTUI_BIN  \
+       --config ${TESTCFG} \
+       --user "expense.admin@scoutui.com" --password password1 \
+       ${EYES} \
+       --diff /tmp/vt \
+       --viewport ${VIEWPORT} \
+       ${SAUCE} \
+       ${CAPS} \
+       --sauce:platform PETER.0 \
+       --host ${HOST} \
+       --pages  ${MODEL} \
+       --debug \
+       --dut "${CMD}"
+
+}
+
+setup
+run1
+
+
+
+

data/lib/scoutui/base/q_browser.rb

@@ -361,6 +361,12 @@ module Scoutui::Base
     # http://stackoverflow.com/questions/15164742/combining-implicit-wait-and-explicit-wait-together-results-in-unexpected-wait-ti#answer-15174978
     def self.getObject(drv, obj, _timeout=nil)
 
+
+      if obj.nil?
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getObject() - null obj passed."
+        return nil
+      end
+
       if _timeout.nil?
         _timeout = Scoutui::Utils::TestUtils.instance.getDefaultWait
       end

data/lib/scoutui/base/user_vars.rb

@@ -84,15 +84,15 @@ module Scoutui::Base
       _rc = k.match(/\$\{(.*)\}$/)
 
       # Needs refactoring!
-      if k=='${userid}'
+      if k=='${userid}' || k=='__USERID__'
         k=:userid
-      elsif k=='${password}'
+      elsif k=='${password}' || k=='__PASSWORD__'
         k=:password
-      elsif k=='${host}'
+      elsif k=='${host}' || k=='__HOST__'
         k=:host
       elsif k=='${lang}' || k=='${__LOC__}' || k=='${LOC}' || k=='__LOC__'
         k=:lang
-      elsif k=='${browser}'
+      elsif k=='${browser}' || k=='__BROWSER__'
         k=:browser
       elsif k.is_a?(Symbol)
         foundKey=true

data/lib/scoutui/commands/assign_var.rb

@@ -8,6 +8,7 @@ module Scoutui::Commands
     def execute(drv, e=nil)
       @drv=drv if !drv.nil?
       rc=nil
+      obj=nil
 
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
@@ -16,21 +17,22 @@ module Scoutui::Commands
 
       Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " assignVar => #{_uservar} : #{_condition}"
 
+      expectObj=!_condition.match(/^\s*(text|value)\s*\(/i).nil?
 
-      if _condition.match(/^\s*(text|value)\s*\(/i)
+      if expectObj
         _locator=_condition.match(/^\s*(text|value)\s*\((.*)\)\s*$/i)[2].to_s.strip
+        _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
+        Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " | translate : #{_locator}" if Scoutui::Utils::TestUtils.instance.isDebug?
+        obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
+      else
+        Scoutui::Base::UserVars.instance.setVar(_uservar, _condition)
+        rc=_condition
       end
 
-      _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
-
-      Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " | translate : #{_locator}" if Scoutui::Utils::TestUtils.instance.isDebug?
 
       begin
 
-        obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
-
-
-        if obj
+        if !obj.nil?
 
           # Refactor in qbrowser
 
@@ -49,23 +51,8 @@ module Scoutui::Commands
 
           puts __FILE__ + (__LINE__).to_s + " rc :: #{Scoutui::Base::UserVars.instance.getVar(_uservar)}"
 
-
-
-#          puts __FILE__ + (__LINE__).to_s + " Pause"; gets
-
-
-
-
           if isDisplayed
-
-#            isEnabled = wait.until { obj.enabled? }
-#            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " obj is enabled : #{isEnabled}"
-#            obj.click
-#            _clicked=true
-
-#            page_elt = Scoutui::Utils::TestUtils.instance.getPageElement(_locator)
-#            Scoutui::Logger::LogMgr.instance.debug "PageElement(#{_locator}) => #{page_elt}"
-#            _whenClicked(page_elt)
+            ;
           else
             Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Element, #{_locator} is not displayed."
           end
@@ -77,11 +64,10 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
-      Scoutui::Logger::LogMgr.instance.asserts.info "Verify object to assign exists #{_locator} : #{obj.class.to_s} - #{!obj.nil?.to_s}"
- #     Scoutui::Logger::LogMgr.instance.asserts.info "Verify clicked #{_locator} - #{_clicked.to_s}"
-
-      Testmgr::TestReport.instance.getReq(_req).testcase('click').add(!obj.nil?, "Verify object to assign exists #{_locator} : #{obj.class.to_s}")
- #     Testmgr::TestReport.instance.getReq(_req).testcase('click').add(_clicked, "Verify clicked #{_locator}")
+      if expectObj
+        Scoutui::Logger::LogMgr.instance.asserts.info "Verify object to assign exists #{_locator} : #{obj.class.to_s} - #{!obj.nil?.to_s}"
+        Testmgr::TestReport.instance.getReq(_req).testcase('click').add(!obj.nil?, "Verify object to assign exists #{_locator} : #{obj.class.to_s}")
+      end
 
       setResult(!rc.nil?)
     end

data/lib/scoutui/commands/click_object.rb

@@ -118,6 +118,7 @@ module Scoutui::Commands
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight then click : #{obj}"
             end
 
+            @drv.action.move_to(obj).perform
             obj.click
 
             _clicked=true
@@ -140,7 +141,7 @@ module Scoutui::Commands
         end
 
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Error during processing: #{ex.message}"
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class.to_s} : Error during processing: #{ex.message}"
         Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 

data/lib/scoutui/commands/command.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 
 module Scoutui::Commands
 
@@ -10,11 +11,12 @@ module Scoutui::Commands
     attr_accessor :executed
     attr_accessor :executed_result
     attr_accessor :stanza
+    attr_accessor :bm
 
     def initialize(_cmd, _drv=nil)
       Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "  Command.init: #{_cmd.to_s}"
 
-
+      @bm=nil
       @cmd=_cmd
 
       if _cmd.is_a?(Hash) && _cmd.has_key?('page') && _cmd['page'].has_key?('action')
@@ -55,6 +57,17 @@ module Scoutui::Commands
       @rc
     end
 
+    def run(opts) # (_drv=nil, _dut=nil)
+      _drv=opts[:driver]
+      _dut=opts.has_key?(:dut) ? opts[:dut] : nil
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " = start run(#{@cmd}) ="
+      @bm=Benchmark.measure { execute(_drv, _dut) }
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " = end run(#{@cmd}) : #{@bm.real}"
+
+      Scoutui::Logger::LogMgr.instance.benchmarks.info "#{@cmd} => #{@bm.real}"
+    end
+
     def execute(_drv=nil, _dut=nil)
       raise NotImplementedError
     end

data/lib/scoutui/commands/commands.rb

@@ -53,7 +53,8 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isAssignVar?(_action)
         _cmd='assignvar'
         _c = Scoutui::Commands::AssignVar.new(_action)
-        _c.execute(my_driver, e)
+        _c.run(driver: my_driver, dut: e)
+
       elsif Scoutui::Commands::Utils.instance.isSelectWindow?(_action)
         _cmd='SelectWindow'
         _c = Scoutui::Commands::SelectWindow.new(_action)
@@ -61,7 +62,9 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isClick?(_action)
         _cmd='Click'
         _c = Scoutui::Commands::ClickObject.new(_action)
-        _c.execute(my_driver, e)
+
+        _c.run(driver: my_driver, dut: e)
+
 
         if e[STEP_KEY].has_key?('then')
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " then => #{e[STEP_KEY]['then]']}"
@@ -86,7 +89,7 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isHighlight?(_action)
         _cmd="Highlight"
         _c = Scoutui::Commands::Highlight.new(_action)
-        rc = _c.execute(my_driver, e)
+        _c.run(driver: my_driver, dut: e)
 
       elsif  Scoutui::Commands::Utils.instance.isMouseOver?(_action)
         _cmd='MouseOver'
@@ -96,7 +99,7 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isSelect?(_action)
         _cmd='Select'
         _c = Scoutui::Commands::SelectObject.new(_action)
-        _c.execute(my_driver, e)
+        _c.run(driver: my_driver, dut: e)
 
       elsif Scoutui::Commands::Utils.instance.isFillForm?(_action)
 
@@ -131,25 +134,24 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isNavigate?(_action)
         _cmd='Navigate'
         _c = Scoutui::Commands::UpdateUrl.new(_action)
-        _c.execute(my_driver)
+        _c.run(driver: my_driver)
 
       elsif Scoutui::Commands::Utils.instance.isVerifyElt?(_action)
         _cmd='VerifyElement'
-
         _c = Scoutui::Commands::VerifyElement.new(_action)
-        _c.execute(my_driver)
+        _c.run(driver: my_driver)
 
       elsif Scoutui::Commands::Utils.instance.isType?(_action)
         _cmd='Type'
         _c = Scoutui::Commands::Type.new(_action)
-        _c.execute(my_driver)
+        _c.run(driver: my_driver)
       else
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Unknown command : #{_action}"
         rc=false
       end
 
     rescue => e
-      Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{$!}"
+      Scoutui::Logger::LogMgr.instance.debug "#{e.class.to_s} Error during processing: #{$!}"
       Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
       puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
       _aborted=true

data/lib/scoutui/commands/highlight.rb

@@ -7,6 +7,7 @@ module Scoutui::Commands
     def _highlight(obj, e=nil)
       _rc=false
 
+      Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " highlight => #{obj}"
       if !obj.nil?
 
         if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('style')
@@ -41,8 +42,16 @@ module Scoutui::Commands
           locators = e['page']['locators']
         end
 
-        locators.each do |loc|
-          obj = Scoutui::Base::QBrowser.getObject(@drv, loc, Scoutui::Commands::Utils.instance.getTimeout)
+        locators.each do |elt|
+
+          _loc = Scoutui::Base::UserVars.instance.normalize(elt)
+
+         # obj = Scoutui::Base::QBrowser.getObject(@drv, loc, Scoutui::Commands::Utils.instance.getTimeout)
+          obj = Scoutui::Base::QBrowser.findElement(@drv,
+                                                    _loc,
+                                                    Scoutui::Commands::Utils.instance.getFrameSearch(),
+                                                    Scoutui::Commands::Utils.instance.getTimeout)
+
           _rc = _highlight(obj, e)
 
           rc &&= _rc
@@ -57,13 +66,9 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
-
       setResult(rc)
     end
 
-
-
   end
 
-
 end

data/lib/scoutui/commands/type.rb

@@ -40,7 +40,7 @@ module Scoutui::Commands
 
     end
 
-    def execute(drv=nil)
+    def execute(drv=nil, _notUsed=nil)
       @drv=drv if !drv.nil?
 
       _isKb=false
@@ -68,8 +68,11 @@ module Scoutui::Commands
           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})"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " tag : #{obj.tag_name}"
 
-          if !obj.nil? && !obj.attribute('type').downcase.match(/(text|textarea|password|email)/).nil?
+          if !obj.nil? &&
+                (obj.tag_name.downcase=='body' ||
+                !obj.attribute('type').downcase.match(/(text|textarea|password|email)/).nil? )
 
             # Refactor in qbrowser
 
@@ -87,19 +90,21 @@ module Scoutui::Commands
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " send_keys(#{_val})"
 
             if isDisplayed
-              if _val.match(/__DOWN__/)
+              if _val.match(/^\s*__DOWN__\s*$/)
                 obj.send_keys(:arrow_down)
-              elsif _val.match(/__TAB__/)
+              elsif _val.match(/^\s*__TAB__\s*$/)
                 obj.send_keys(:tab)
+              elsif _val.match(/^\s*__CLEAR__\s*$/)
+                obj.clear
+              elsif _val.match(/^\s*__ENTER__\s*$/)
+                obj.send_keys("")
+                @drv.action.send_keys(:enter).perform
               else
-
                 _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}"
 
@@ -142,9 +147,28 @@ module Scoutui::Commands
                   end
                 end
 
-              #  _text_to_type.gsub!(/__DATE__/, Time.now().to_s)
 
+                puts __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
                 obj.send_keys(_text_to_type)
+
+                if !obj.nil? && false
+                  arr=_text_to_type.split(/__ENTER__/)
+
+                  i=0
+                  arr.each do |_t|
+                  #  puts __FILE__ + (__LINE__).to_s + " => #{_t}"; STDIN.gets;
+                    if i > 0
+                      obj.send_keys("")
+                      @drv.action.send_keys(:enter).perform
+                      puts __FILE__ + (__LINE__).to_s + " ENTER"; STDIN.gets()
+                      obj.send_keys("<ENTER>")
+                    end
+
+                    obj.send_keys(_t)
+                    i+1
+                  end
+                end
+
               end
 
 

data/lib/scoutui/commands/update_url.rb

@@ -3,7 +3,7 @@ module Scoutui::Commands
   class UpdateUrl < Command
 
 
-    def execute(drv)
+    def execute(drv, _e=nil)
       @drv=drv if !drv.nil?
 
       _req = Scoutui::Utils::TestUtils.instance.getReq()

data/lib/scoutui/commands/verify_element.rb

@@ -101,8 +101,11 @@ module Scoutui::Commands
 
     end
 
+    def execute(_drv, e=nil)
+      _execute(drv)
+    end
 
-    def execute(drv)
+    def _execute(drv)
       @drv=drv if !drv.nil?
       _e=getLocator()
 

data/lib/scoutui/logger/log_mgr.rb

@@ -12,6 +12,7 @@ module Scoutui::Logger
 
     attr_accessor :root
     attr_accessor :commands
+    attr_accessor :benchmarks
 
     def initialize
 
@@ -40,6 +41,14 @@ module Scoutui::Logger
       )
       @commands.level = :debug
 
+
+      @benchmarks = Logging.logger['Benchmarks']
+      @benchmarks.add_appenders(
+          Logging.appenders.stdout,
+          Logging.appenders.file('benchmarks.log')
+      )
+      @benchmarks.level = :info
+
       #Logging.logger.root.level = :warn
     end
 
@@ -83,6 +92,14 @@ module Scoutui::Logger
     end
 
 
+    def benchmark
+      @benchmarks
+    end
+    def benchmarks
+      @benchmarks
+    end
+
+
     def log(level, txt)
 
       if level.match(/info/i)

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.21.pre"
+  VERSION = "2.0.3.22.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.21.pre
+  version: 2.0.3.22.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,6 +183,8 @@ files:
 - bin/console
 - bin/scoutui_driver.rb
 - bin/setup
+- examples/benchmark/ex.rb
+- examples/benchmark/ex_benchmark.rb
 - examples/capabilities/win10.chrome46.json
 - examples/carmax/appmodel/main.nav.json
 - examples/carmax/appmodel/search_results.json
@@ -219,6 +221,8 @@ files:
 - examples/ex2/tests/test-example2.sh
 - examples/ex2/tests/test-example3.sauce.sh
 - examples/ex2/tests/test-example3.sh
+- examples/ex6/appmodel/model.json
+- examples/ex6/tests/test.sh
 - examples/eyes/diff.rb
 - examples/eyes/ex2.rb
 - examples/eyes_results/response.json