scoutui 2.0.3.33.pre → 2.0.3.34.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a7f5d5dc6cde4149df39553481839d53597a5d
-  data.tar.gz: 1c8c4612957678cb4d8692bb8f9e28eaa7916c05
+  metadata.gz: 95773cc48b9ff71ee1e809d4c334cc78e58f793e
+  data.tar.gz: f2253aef2a5f532c1196bdd75bb77f5ed84aea1c
 SHA512:
-  metadata.gz: 3de9394d074a30af45c17cc4298cd555097aede4289b5c834f1bde052a49e1ddc741a569f6698b601b4ad9a8a7ba5fc4de255406c4f3d48d31921673d711f769
-  data.tar.gz: 307130cbb3665bcd5362e1fe2281ca74d13d60e1e5b463396dd903f3597905dcb1bd241e78cd94a172fdec6d2baf2a5fc9b50ed4f32ee9caa5f785b76fcf0e01
+  metadata.gz: e08d1f3d7e100eec17e598c4858d17a171e0419eca1d66a32808c2dfa50625ffac0d579be11de2be288d4600f4d9dfdfcfc099579aabda4731f20b6cd27fd7c6
+  data.tar.gz: a69dee7b822be4f69f6f7b9efcaa37a21f285abda72dbb482357d415b267522855716f8787c24032c2e3621c266715b4866ee8a0cb8a03d2e12fd5d71ecd39e1

data/lib/scoutui/base/test_data.rb

@@ -0,0 +1,42 @@
+
+
+require 'singleton'
+require 'DataMgr'
+
+module Scoutui::Base
+
+  class TestData
+    include Singleton
+
+    attr_accessor :testware
+    attr_accessor :dut
+
+    def initialize
+      @testware={}
+    end
+
+    def add(_id, _f)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add(#{_id}, #{_f})"
+      @testware[_id]=DataMgr::DataModel.new(_f)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{@testware[_id]}"
+    end
+
+    def addx(_id, _reqs)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add(#{_id}, #{_reqs}"
+      @requirements[_id]=_reqs
+    end
+
+    def get(_id, _locator)
+      rc=@testware[_id].getDataElement(_locator)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " get(#{_id}, #{_locator}) : #{rc}"
+      rc
+    end
+
+  end
+
+
+
+
+
+end

data/lib/scoutui/base/test_scout.rb

@@ -101,6 +101,7 @@ module Scoutui::Base
         teardown()
 
       rescue => ex
+        Scoutui::Utils::TestUtils.instance.setState(:abort, __FILE__ + (__LINE__).to_s + " : #{ex.class.to_s}: #{ex}")
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class.to_s} Error during processing: #{ex}"
         Scoutui::Logger::LogMgr.instance.warn ex.backtrace
       ensure

data/lib/scoutui/base/user_vars.rb

@@ -94,6 +94,8 @@ module Scoutui::Base
         k=:lang
       elsif k=='${browser}' || k=='__BROWSER__'
         k=:browser
+      elsif k=='${role}' || k=='__ROLE__'
+        k=:role
       elsif k.is_a?(Symbol)
         foundKey=true
       elsif k=='__random_email__'
@@ -115,7 +117,7 @@ module Scoutui::Base
         foundKey=false
       end
 
-      Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " get(#{k}) => #{@globals.has_key?(k)}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " get(#{k}) => #{@globals.has_key?(k)}"
 
       if @globals.has_key?(k) && foundKey
         v=@globals[k]

data/lib/scoutui/base/visual_test_framework.rb

@@ -830,9 +830,9 @@ module Scoutui::Base
 
         totalWindows = my_driver.window_handles.length
 
-        Scoutui::Logger::LogMgr.instance.info '-' * 72 if Scoutui::Utils::TestUtils.instance.isDebug?
-        Scoutui::Logger::LogMgr.instance.info " [Pre-cmd]: Total Windows : #{totalWindows.to_s}"
-        Scoutui::Logger::LogMgr.instance.info "#{i.to_s}. Processing #{e.inspect}" if Scoutui::Utils::TestUtils.instance.isDebug?
+        Scoutui::Logger::LogMgr.instance.debug '-' * 72
+        Scoutui::Logger::LogMgr.instance.debug " [Pre-cmd]: Total Windows : #{totalWindows.to_s}"
+        Scoutui::Logger::LogMgr.instance.debug "#{i.to_s}. Processing #{e.inspect}"
         i+=1
 
         Scoutui::Utils::TestUtils.instance.setReq('UI')
@@ -1076,6 +1076,30 @@ module Scoutui::Base
 
             Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " ======  assertResults : #{_assertResult}"
 
+
+
+            if e[STEP_KEY].has_key?("highlight") && e[STEP_KEY]["highlight"].has_key?("locators")
+              _cmd="Highlight"
+
+              begin
+                _c = Scoutui::Commands::Highlight.new('highlight')
+
+                if e[STEP_KEY]["highlight"].has_key?("assert") && e[STEP_KEY]["highlight"]["assert"].to_s.match(/\s*true\s*$/)
+                  _c.enableAsserts()
+                else
+                  _c.disableAsserts()
+                end
+
+                _pg={"page" => { "locators" => e[STEP_KEY]["highlight"]["locators"]} }
+                _c.run(driver: my_driver, dut: _pg)
+
+              rescue => ex
+                puts __FILE__ + (__LINE__).to_s + " #{ex.class}"
+                Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+              end
+
+            end
+
             if !_assertResult && Scoutui::Utils::TestUtils.instance.isFailFast?
               Scoutui::Utils::TestUtils.instance.setState(:abort, 'Failed assertion with failfast enabled.')
               return
@@ -1165,7 +1189,13 @@ module Scoutui::Base
         processExpected(my_driver, e)
         processAssertions(my_driver, e)
 
-         if !_region.nil?
+        if e[STEP_KEY].has_key?("highlight") && e[STEP_KEY]["highlight"].has_key?("locators")
+          _cmd="Highlight"
+          _c = Scoutui::Commands::Highlight.new('highlight')
+          _c.run(driver: my_driver, dut: e[STEP_KEY])
+        end
+
+        if !_region.nil?
           eyeScout.check_window(_name, Scoutui::Base::UserVars.instance.normalize(_region))
         else
           eyeScout.check_window(_name)

data/lib/scoutui/commands/command.rb

@@ -12,10 +12,12 @@ module Scoutui::Commands
     attr_accessor :executed_result
     attr_accessor :stanza
     attr_accessor :bm
+    attr_accessor :enableAssert
 
     def initialize(_cmd, _drv=nil)
       Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "  Command.init: #{_cmd.to_s}"
 
+      @enableAssert=true
       @bm=nil
       @cmd=_cmd
 
@@ -31,6 +33,24 @@ module Scoutui::Commands
       @executed_result=nil
     end
 
+    def assert?
+      @enableAssert
+    end
+
+    def enableAssert()
+      enableAsserts()
+    end
+    def enableAsserts()
+      @enableAssert=true
+    end
+    def disableAssert()
+      disableAsserts
+    end
+
+    def disableAsserts()
+      @enableAssert=false
+    end
+
     def setResult(r)
       Scoutui::Logger::LogMgr.instance.commands.debug " #{@cmd.to_s} : setResult(#{r.to_s})"
       @executed=true

data/lib/scoutui/commands/commands.rb

@@ -51,6 +51,11 @@ module Scoutui::Commands
         _c = Scoutui::Commands::Pause.new(nil)
         _c.execute(e);
 
+      elsif Scoutui::Commands::Utils.instance.isLoadData?(_action)
+        _cmd='loaddata'
+        _c = Scoutui::Commands::LoadData.new(e)
+        _c.run(driver: my_driver, dut: e)
+
       elsif Scoutui::Commands::Utils.instance.isLoadRequirements?(_action)
         _cmd='loadrequirements'
         _c = Scoutui::Commands::LoadRequirements.new(e)

data/lib/scoutui/commands/highlight.rb

@@ -50,14 +50,11 @@ module Scoutui::Commands
           if q.has_key?('frame')
             Scoutui::Commands::Utils.instance.setEnableFrameSearch(q['frame'])
             elt = q['locator']
-
-       #     puts __FILE__ + (__LINE__).to_s + "  highlight with frame #{q['frame']} with locator #{q['locator']} - PAUSE"
           end
 
 
           _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(),
@@ -76,8 +73,12 @@ module Scoutui::Commands
 
           rc &&= _rc
 
-          Testmgr::TestReport.instance.getReq(_req).testcase('highlight').add(!obj.nil?, "Verify object #{_locator} to highlight exists : #{obj.class.to_s}")
-          Testmgr::TestReport.instance.getReq(_req).testcase('highlight').add(_rc, "Verify highlight #{_rc} performed for #{_locator}")
+          if assert?
+            Testmgr::TestReport.instance.getReq(_req).testcase('highlight').add(!obj.nil?, "Verify object #{elt} to highlight exists : #{obj.class.to_s}")
+            Testmgr::TestReport.instance.getReq(_req).testcase('highlight').add(_rc, "Verify highlight #{_rc} performed for #{elt}")
+          else
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight(#{elt} : #{obj.class.to_s}"
+          end
 
         end
 

data/lib/scoutui/commands/strategy.rb

@@ -31,7 +31,7 @@ module Scoutui::Commands
         rc=true
       rescue => ex
         Scoutui::Logger::LogMgr.instance.warn "Error during processing: #{$!}"
-        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
       rc

data/lib/scoutui/commands/type.rb

@@ -113,19 +113,34 @@ module Scoutui::Commands
                 obj.send_keys("")
                 @drv.action.send_keys(:enter).perform
               else
-                _uservars = _val.scan(/\$\{(.*?)\}/)
 
-                _v2 = _val
-                for i in 0 .. (_uservars.size - 1)
+                if _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
 
-                  _t = Scoutui::Base::UserVars.instance.get(_uservars[i][0])
-                  puts __FILE__ + (__LINE__).to_s + " translate(#{_uservars[i][0]}) => #{_t}"
+                  _dataID=_val.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
+                  _getter=_val.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
 
-                  if !_t.nil? && _uservars[i][0]!=_t
-                    _v2.gsub!("\$\{#{_uservars[i][0]}\}", _t)
-                  end
+               #   _v2=_val
+
+                  _v2=Scoutui::Base::TestData.instance.get(_dataID, _getter)
+
+                  puts __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
+                else
+
+                  _uservars = _val.scan(/\$\{(.*?)\}/)
+
+                  _v2 = _val
+                  for i in 0 .. (_uservars.size - 1)
 
-                  puts __FILE__ + (__LINE__).to_s + " value => #{_v2}"
+                    _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
 
                 end
 

data/lib/scoutui/commands/utils.rb

@@ -24,6 +24,7 @@ module Scoutui::Commands
                      'submitform',
                      'type',
                      'click',
+                     'loaddata',
                      'loadrequirements',
                      'mouseover',
                      'navigate',
@@ -256,6 +257,11 @@ module Scoutui::Commands
       !_action.match(/fillform\(/i).nil?
     end
 
+    def isLoadData?(_action)
+      !_action.match(/^\s*loaddata\s*$/i).nil?
+    end
+
+
     def isLoadRequirements?(_action)
       !_action.match(/^\s*loadrequirements\s*$/i).nil?
     end
@@ -324,6 +330,8 @@ module Scoutui::Commands
         @totalCommands['click']+=1
       elsif isMouseOver?(cmd)
         @totalCommands['mouseover']+=1
+      elsif isLoadData?(cmd)
+        @totalCommands['loaddata']+=1
       elsif isLoadRequirements?(cmd)
         @totalCommands['loadrequirements']+=1
       elsif isSelect?(cmd)

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, :json_config_file, :page_model, :test_config,
+       :userid, :password, :role, :json_config_file, :page_model, :test_config,
        :debug].each do |o|
         @options[o]=nil
       end
@@ -251,7 +251,9 @@ module Scoutui::Utils
         opt.on('--eyes:viewport [resolution]') { |o| @options[:viewport] = o }
 
 
-        opt.on('--role ROLE') { |o| @options[:role]=o }
+        opt.on('--role ROLE') { |o|
+          @options[:role]=o
+        }
 
         opt.on('-s', '--sauce', "Toggle SauceLabs") {
           @options[:enable_sauce]=true
@@ -284,6 +286,7 @@ module Scoutui::Utils
         Scoutui::Logger::LogMgr.instance.info "Browser   => #{@options[:browser]}"
         Scoutui::Logger::LogMgr.instance.info "UserID    => #{@options[:userid]}"
         Scoutui::Logger::LogMgr.instance.info "Password  => #{@options[:password]}"
+        Scoutui::Logger::LogMgr.instance.info "Role      => #{@options[:role]}"
         Scoutui::Logger::LogMgr.instance.info "Eyes      => #{@options[:enable_eyes]}"
         Scoutui::Logger::LogMgr.instance.info "Test Cfg  => #{@options[:json_config_file]}"
         Scoutui::Logger::LogMgr.instance.info "Match Level => #{@options[:match_level]}"
@@ -410,7 +413,7 @@ module Scoutui::Utils
 
       Scoutui::Logger::LogMgr.instance.setLevel(@options[:log_level])
 
-      [:accounts, :browser, :dut, :host, :userid, :password].each do |k|
+      [:accounts, :browser, :dut, :host, :role, :userid, :password].each do |k|
 
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " opt[test_config].has_key(#{k.to_s}) => #{@options[:test_config].has_key?(k.to_s)}" if Scoutui::Utils::TestUtils.instance.isDebug?
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.33.pre"
+  VERSION = "2.0.3.34.pre"
 end

data/scoutui.gemspec

@@ -33,4 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "logging"
   spec.add_development_dependency "sauce_whisk"
   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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.33.pre
+  version: 2.0.3.34.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.2.pre
+- !ruby/object:Gem::Dependency
+  name: tiny_tds
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: DataMgr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1.1.pre
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1.1.pre
 description: Leverage a fully functional e2e framework that's integrated with Applitool's
   Eyes and Sauce Labs!
 email:
@@ -239,6 +267,7 @@ files:
 - lib/scoutui/base/q_browser.rb
 - lib/scoutui/base/q_form.rb
 - lib/scoutui/base/requirements.rb
+- lib/scoutui/base/test_data.rb
 - lib/scoutui/base/test_scout.rb
 - lib/scoutui/base/test_settings.rb
 - lib/scoutui/base/user_vars.rb