scoutui 2.0.3.47.pre → 2.0.3.48.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2e05e8583a2bb3f7ab2f96933910804573ff57
-  data.tar.gz: 2d4ffd9211c59b61ceb550f468365d8c4483b8f7
+  metadata.gz: 5f9db5fd1abf3789bd4478d67c278041fccc6a6a
+  data.tar.gz: b16acc15a0806e9fd3726a457542bf9982da05d3
 SHA512:
-  metadata.gz: 775220693e34d5c5c1b7ccd2e0ad9fec7fe77065e5cd6f721bdd39d2462cd8cc649d18e18515f58797d621b4d2e316d4bcb6763758ad3d2b2ca9e6d8c18ebeab
-  data.tar.gz: 95b89eb656deb793fbfe5bddba0687b8121cffa35c2fd594d8a14bc72cdab51d7d09a35bc72b8bec700685d6a7d6600114690e29da780f2b27cb8b5862fc06c0
+  metadata.gz: d915b727bb94c32a8222456bf679fe602f471e2dd4a1c647a311b11d7180d89e834852a388ff0096c7a65d2307437531a6da99b340ea4df271d4b10b205fc4bb
+  data.tar.gz: 80c60d07fe1ddc11325486dc06da66e994e42ef67f00d27e3a3d73cdddd51a81ad0a68edea3a5a24a29c9b8cebe283e02ae4f7093f03d206c8114fe67522b5ee

data/examples/ci_reporter/ci_example.rb

@@ -6,8 +6,14 @@ def addSkipped(node, doc)
   node.add_child skipped
 end
 
+xml=Nokogiri::XML::Builder.new
+
+
+
 doc = Nokogiri::XML("<testsuites></testsuites>")
 
+xml.testsuites=doc
+
 ## Add a node
 ts = Nokogiri::XML::Node.new('testcase', doc)
 
@@ -33,6 +39,8 @@ sys_err = Nokogiri::XML::Node.new('system-err', doc)
 sys_err.content='my STDERR dump'
 doc.root.add_child(sys_err)
 
-
 puts doc.to_s
 
+puts '-' * 72
+puts xml.to_xml
+

data/examples/ex6/tests/test.sh

@@ -68,6 +68,7 @@ ruby $SCOUTUI_BIN  \
        --host ${HOST} \
        --failfast true \
        --loglevel warn \
+       --report:junit "/tmp/xyz.junit.xml" \
        --dut "${CMD}"
 
 }
@@ -89,6 +90,7 @@ ruby $SCOUTUI_BIN  \
        --host ${HOST} \
        --pages  ${MODEL} \
        --debug \
+       --report:junit "/tmp/xyz.xml" \
        --dut "${CMD}"
 
 }

data/lib/scoutui/base/user_vars.rb

@@ -66,6 +66,8 @@ module Scoutui::Base
     end
 
     def isTestData?(_val)
+      return false if _val.nil?
+
       _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
     end
 

data/lib/scoutui/base/visual_test_framework.rb

@@ -340,7 +340,7 @@ module Scoutui::Base
           if !_assertType.nil?
 
 
-            if _assertType[:cmd]=='isEnabled'   # Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
+            if _assertType[:cmd].match(/^\s*isEnabled\s*$/i)  # Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
               _rc=Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a, _enableAsserts)
             elsif _assertType[:cmd]=='visible'
               _rc=Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a, _enableAsserts)

data/lib/scoutui/commands/click_object.rb

@@ -58,6 +58,12 @@ module Scoutui::Commands
 
       _clicked=false
 
+      _startTime=Time.now
+      _endTime=nil
+      _clickTime=0
+
+
+
       begin
 
         obj = Scoutui::Base::QBrowser.getElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
@@ -99,15 +105,22 @@ module Scoutui::Commands
               puts __FILE__ + (__LINE__).to_s + " #{_i} => click(#{obj})"
               begin
 
+                _startTime=Time.now
+
                 obj = Scoutui::Base::QBrowser.getElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
                 @drv.action.move_to(obj).perform
                 bm=Benchmark.measure {
                   obj.click
                 }
+
+                _endTime=Time.now
+                _clickTime = (_endTime - _startTime)
+
                 setBenchmark(bm)
                 _retry = false
                 _clicked=true
 
+
               rescue Selenium::WebDriver::Error::UnknownError
                 Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Retry #{_i} - Selenium::WebDriver::Error::UnknownError"
                 _retry=true
@@ -150,11 +163,12 @@ 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 click exists #{_locator} : #{obj.class.to_s} - #{!obj.nil?.to_s}"
       Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify clicked #{_locator} - #{_clicked.to_s}"
 
       Testmgr::TestReport.instance.getReq(_req).testcase('click').add(!obj.nil?, "Verify object to click exists #{_locator} : #{obj.class.to_s}")
-      Testmgr::TestReport.instance.getReq(_req).testcase('click').add(_clicked, "Verify clicked #{_locator}")
+      Testmgr::TestReport.instance.getReq(_req).testcase('click').add(_clicked, "Verify clicked #{_locator}", _clickTime)
 
 
       setResult(_clicked)

data/lib/scoutui/commands/type.rb

@@ -56,6 +56,9 @@ module Scoutui::Commands
       _rc=false
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
+      _startTime=Time.now
+      _endTime=nil
+
       begin
 
         if @cmd.strip.match(/^\s*type\s*\(\s*__TAB__\s*\)\s*$/)
@@ -235,9 +238,12 @@ module Scoutui::Commands
         puts __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
+      _endTime=Time.now
+
+
       if !_isKb
         Testmgr::TestReport.instance.getReq(_req).testcase('type').add(!obj.nil?, "Verify object #{_xpath} to type #{_val} exists : #{obj.class.to_s}")
-        Testmgr::TestReport.instance.getReq(_req).testcase('type').add(_rc, "Verify typed data #{_rc}")
+        Testmgr::TestReport.instance.getReq(_req).testcase('type').add(_rc, "Verify typed data #{_rc}", (_endTime - _startTime))
       end
 
       setResult(_rc)

data/lib/scoutui/eyes/eye_scout.rb

@@ -231,6 +231,8 @@ module Scoutui::Eyes
 
       Testmgr::TestReport.instance.report()
 
+      Testmgr::TestReport.instance.junitReport(Scoutui::Utils::TestUtils.instance.getReporter())
+
 #     Testmgr::TestReport.instance.generateReport()
 
       metrics=Testmgr::TestReport.instance.getMetrics()

data/lib/scoutui/utils/utils.rb

@@ -34,7 +34,7 @@ module Scoutui::Utils
       @currentTest={:reqid => 'UI', :testcase => '00' }
 
       [:accounts, :browser, :capabilities, :diffs_dir, :test_file, :host, :loc, :title, :viewport,
-       :userid, :password, :role, :json_config_file, :page_model, :test_config,
+       :userid, :password, :role, :json_config_file, :page_model, :report, :test_config,
        :debug].each do |o|
         @options[o]=nil
       end
@@ -51,6 +51,7 @@ module Scoutui::Utils
       @options[:debug]=false
       @options[:fail_fast]=false
 
+
       @app_model=nil
 
       Scoutui::Base::UserVars.instance.set('eyes.viewport', '1024x768')
@@ -252,6 +253,9 @@ module Scoutui::Utils
         opt.on('--eyes:title Title') { |o| @options[:title] = o }
         opt.on('--eyes:viewport [resolution]') { |o| @options[:viewport] = o }
 
+        opt.on('--report:junit File') { |o| @options[:report] = o }
+
+
 
         opt.on('--role ROLE') { |o|
           @options[:role]=o
@@ -347,6 +351,10 @@ module Scoutui::Utils
       @options[:host].to_s
     end
 
+    def getReporter()
+      @options[:report]
+    end
+
     def setDebug(b)
       @options[:debug]=b
     end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.47.pre"
+  VERSION = "2.0.3.48.pre"
 end

data/scoutui.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "faker"
   spec.add_development_dependency "logging"
   spec.add_development_dependency "sauce_whisk"
-  spec.add_development_dependency "testmgr", "0.3.2.pre"
+  spec.add_development_dependency "testmgr", ">= 0.3.2.pre"
   spec.add_development_dependency "tiny_tds"
   spec.add_development_dependency "DataMgr", ">= 0.1.1.1.pre"
   spec.add_development_dependency "CmdShellMgr", ">= 0.1.1.0.pre"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.47.pre
+  version: 2.0.3.48.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,14 +154,14 @@ dependencies:
   name: testmgr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2.pre
 - !ruby/object:Gem::Dependency