scoutui 2.0.3.12.pre → 2.0.3.13.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dbc193e812d3840b4f8674467687c22e5649cca
-  data.tar.gz: 11d70545cb748c686b96c02e1c6e1722fafd03c3
+  metadata.gz: dfaa410be9c5fd6446abf3b4e38f87818add2761
+  data.tar.gz: 634ea5ac53446a9a873a9d3552df6e6ddff0a739
 SHA512:
-  metadata.gz: 07f09f239c0ac58c43eeee0e5a36cf14f768aaf5ef29ff54ab419bd6230efb6828f945b9ab2abf2d501b6dcb8bf5bc8e607306b7c0c6eb064f05d89008562434
-  data.tar.gz: ebde6d08112ffd5d3ea22ff48b4e375a8f7b6276f7662670aaa28d6645121032ea53b29be74c6d876fd77e7ec185b80eeca8330e5275cf6127e421d57a7e82a8
+  metadata.gz: a270587c067edd35289dc756168085df21ffa040d90849236592f438f5505d85df9fac302a4bcb5b16d7efc8f414145e4ec97ea1a017e266c36c262282b8d0b6
+  data.tar.gz: e70f51d5a752bdeb644ad96f0552a4463bf3012cbb32519b92449959ca44a54a3ae53d0ad27ac11b09e818561950721adca8b77b2fd4210359a4f0b858ba184c

data/lib/scoutui/base/q_browser.rb

@@ -50,7 +50,6 @@ module Scoutui::Base
           rc=true
         end
 
-
       rescue Selenium::WebDriver::Error::NoSuchAlertError
         ;
       end
@@ -87,7 +86,7 @@ module Scoutui::Base
         Selenium::WebDriver::Wait.new(timeout: _timeout).until { drv.find_elements(locateBy => locator).size > 0 }
         rc=drv.find_elements(locateBy => locator)[0]
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.debug "getFirstObject.Exception: #{locator.to_s} - #{ex}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getFirstObject.Exception: #{locator.to_s} - #{ex}"
         ;
       end
 
@@ -413,7 +412,6 @@ module Scoutui::Base
         #  locator = locator.match(/\#(.*)/)[1].to_s
         end
 
-
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " By      => #{locateBy.to_s}"
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Locator => #{locator}"
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Visible_When => #{visible_when}"
@@ -422,15 +420,15 @@ module Scoutui::Base
 
 
       rescue Selenium::WebDriver::Error::TimeOutError
-          Scoutui::Logger::LogMgr.instance.debug __FILE__  + (__LINE__).to_s + " #{locator} time out."
+          Scoutui::Logger::LogMgr.instance.debug __FILE__  + (__LINE__).to_s + "TimeoutError: #{locator} time out."
           rc=nil
 
       rescue Selenium::WebDriver::Error::NoSuchElementError
-        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{locator} not found."
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "NoSuchElementError: #{locator} not found."
         rc=nil
 
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{$!}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Error during processing: #{$!}"
         Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
@@ -443,6 +441,62 @@ module Scoutui::Base
       Selenium::WebDriver::Wait.new(timeout: seconds).until { yield }
     end
 
+    def self.click(element)
+      rc=false
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " click(#{element})"
+
+      if element.is_a?(Selenium::WebDriver::Element)
+
+        begin
+          element.click
+          rc=true
+        rescue => ex
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Error during processing: #{$!}"
+          Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+        end
+
+      end
+
+      rc
+    end
+
+    def self.highlight(drv, locator, style={"color" => 255, "border" => 2}, ancestors=0)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highLight(#{locator})"
+
+      rc=false
+
+#     element = find_element(method, locator)
+
+      if locator.is_a?(Selenium::WebDriver::Element)
+        element = locator
+      else
+        element = getObject(drv, locator)
+      end
+
+      if element.nil?
+        return rc
+      end
+
+      color=style.has_key?("color")? style["color"] : 255
+      border=style.has_key?("border")? style["border"] : 1
+
+      ancestors=style.has_key?("ancestors")? style["ancestors"] : 0
+
+      drv.execute_script("hlt = function(c) { c.style.border='solid #{border}px rgb(#{color}, 16, 16)'; }; return hlt(arguments[0]);", element)
+      parents = ""
+
+      ancestors.times do
+        parents << ".parentNode"
+        color -= (12*8 / ancestors)
+        drv.execute_script("hlt = function(c) { c#{parents}.style.border='solid 1px rgb(#{color}, 0, 0)'; }; return hlt(arguments[0]);", element)
+      end
+
+#      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " PAUSE on highlight"; gets
+      element
+    end
+
+
     def driver
       @driver
     end

data/lib/scoutui/base/q_form.rb

@@ -4,7 +4,6 @@ require 'selenium-webdriver'
 
 module Scoutui::Base
 
-
   class QForm
 
     attr_accessor :elements
@@ -37,6 +36,7 @@ module Scoutui::Base
     def actionElement(drv, locator)
 
       _action=nil
+      _rc=false
 
       obj = Scoutui::Base::QBrowser.getObject(drv, locator, Scoutui::Commands::Utils.instance.getTimeout)
       _type = obj.attribute('type').to_s
@@ -51,21 +51,22 @@ module Scoutui::Base
 
         _action="send_keys"
         obj.send_keys(_v)
+        _rc=true
       elsif !_type.match(/(date|number|search|tel|time|url|week)/i).nil?
         _v = Scoutui::Base::UserVars.instance.get(dut[k].to_s)
         _action="send_keys"
         obj.send_keys(_v)
+        _rc=true
       elsif !_type.match(/(button|checkbox|radio|submit)/i).nil?
         _action="click"
-        obj.click()
+        _rc=Scoutui::Base::QBrowser.click(obj)
       else
         _action="click"
-        obj.click()
+        _rc=Scoutui::Base::QBrowser.click(obj)
       end
 
-      Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " action : #{_action}"
-      _action
-
+      Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " action : #{_action} => #{_rc}"
+      _rc
     end
 
     def submitForm(drv=nil)
@@ -82,8 +83,7 @@ module Scoutui::Base
       if !action_obj.nil?
         # Find the submit action element
         Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " -- submit => #{action_obj}"
-        actionElement(drv, action_obj[action_obj.keys[0]])
-        rc=true
+        rc=actionElement(drv, action_obj[action_obj.keys[0]])
       else
         Scoutui::Logger::LogMgr.instance.commands.warn __FILE__ + (__LINE__).to_s + " WARN: missing action object."
       end

data/lib/scoutui/base/visual_test_framework.rb

@@ -357,8 +357,8 @@ module Scoutui::Base
 
           if _v.has_key?('locator')  && _v['locator'].is_a?(String) && _v.has_key?('enabled_when')
 
-            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process pageObject #{_v} for enabled_when - PAUSE"; gets;
-            isVisible=Scoutui::Base::Assertions.instance.isEnabled(my_driver, _v, _req)
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process pageObject #{_v} for enabled_when - TBD";  # TBD gets;
+            isVisible=Scoutui::Base::Assertions.instance.isEnabled(my_driver, _v['locator'], _req)
 
           elsif _v.has_key?('locator')  && _v['locator'].is_a?(String) && !_v.has_key?('visible_when')
             Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process pageObject #{_v}"

data/lib/scoutui/commands/click_object.rb

@@ -107,7 +107,19 @@ module Scoutui::Commands
             isEnabled = wait.until { obj.enabled? }
 
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " obj is enabled : #{isEnabled}"
+
+
+            if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('highlight') && e['page']['highlight']
+              #
+              # page:
+              #  highlight: true
+              #
+              obj=Scoutui::Base::QBrowser.highlight(@drv, obj)
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight then click : #{obj}"
+            end
+
             obj.click
+
             _clicked=true
 
             page_elt = Scoutui::Utils::TestUtils.instance.getPageElement(_locator)
@@ -128,7 +140,7 @@ module Scoutui::Commands
         end
 
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.warn "Error during processing: #{ex}"
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).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/commands.rb

@@ -11,12 +11,12 @@ module Scoutui::Commands
       begin
         rc=processCommand(cmd[:command], cmd[:e], my_driver)
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{$!}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Error during processing: #{$!}"
         Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
       end
     end
 
-    Scoutui::Logger::LogMgr.instance.debug " exit [processCommands]"
+    Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " exit [processCommands]"
   end
 
 
@@ -36,10 +36,15 @@ module Scoutui::Commands
 
       _c=nil
 
-      my_driver.switch_to.default_content
-
-
-
+      ##
+      # Check if an alert exists.
+      ##
+      begin
+        my_driver.switch_to.alert
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Alert currently active."
+      rescue Selenium::WebDriver::Error::NoSuchAlertError
+        my_driver.switch_to.default_content
+      end
 
       if Scoutui::Commands::Utils.instance.isPause?(_action)
         _cmd='pause'
@@ -58,8 +63,8 @@ module Scoutui::Commands
         _c = Scoutui::Commands::ClickObject.new(_action)
         _c.execute(my_driver, e)
 
-        if e["page"].has_key?('then')
-          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " then => #{e['page']['then]']}"
+        if e[STEP_KEY].has_key?('then')
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " then => #{e[STEP_KEY]['then]']}"
         end
 
       elsif Scoutui::Commands::Utils.instance.isExistsAlert?(_action)
@@ -77,6 +82,12 @@ module Scoutui::Commands
         _c = Scoutui::Commands::ExistsAlert.new(_action)
         rc=_c.execute(my_driver)
 
+
+      elsif Scoutui::Commands::Utils.instance.isHighlight?(_action)
+        _cmd="Highlight"
+        _c = Scoutui::Commands::Highlight.new(_action)
+        rc = _c.execute(my_driver, e)
+
       elsif  Scoutui::Commands::Utils.instance.isMouseOver?(_action)
         _cmd='MouseOver'
         _c = Scoutui::Commands::MouseOver.new(_action)

data/lib/scoutui/commands/highlight.rb

@@ -0,0 +1,69 @@
+
+module Scoutui::Commands
+
+  class Highlight < Command
+
+
+    def _highlight(obj, e=nil)
+      _rc=false
+
+      if !obj.nil?
+
+        if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('style')
+          style=e['page']['style']
+          obj=Scoutui::Base::QBrowser.highlight(@drv, obj, style)
+        else
+          obj=Scoutui::Base::QBrowser.highlight(@drv, obj)
+        end
+
+        _rc=true
+      end
+
+      _rc
+    end
+
+    def execute(drv, e=nil)
+      rc=true
+      _req = Scoutui::Utils::TestUtils.instance.getReq()
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Highlight.execute(#{@cmd})"
+
+      @drv=drv if !drv.nil?
+
+      begin
+
+        locators=[]
+
+        if @cmd.match(/highlight\s*\((.*)\)/)
+          _locator = @cmd.match(/highlight\s*\((.*)\)/)[1].to_s.strip
+          locators << _locator
+        elsif e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('locators')
+          locators = e['page']['locators']
+        end
+
+        locators.each do |loc|
+          obj = Scoutui::Base::QBrowser.getObject(@drv, loc, Scoutui::Commands::Utils.instance.getTimeout)
+          _rc = _highlight(obj, e)
+
+          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}")
+
+        end
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Error during processing: #{$!}"
+        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+
+      setResult(rc)
+    end
+
+
+
+  end
+
+
+end

data/lib/scoutui/commands/strategy.rb

@@ -248,6 +248,13 @@ module Scoutui::Commands
       else
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Create WebDriver: #{browserType.to_s}"
         @drv=Selenium::WebDriver.for browserType.to_sym, :profile => @profile
+
+        _viewport = Scoutui::Utils::TestUtils.instance.getViewPort()
+        if !_viewport.nil?
+          target_size = Selenium::WebDriver::Dimension.new(_viewport[:width], _viewport[:height])
+          @drv.manage.window.size = target_size
+        end
+
       end
 
     end

data/lib/scoutui/commands/utils.rb

@@ -19,6 +19,7 @@ module Scoutui::Commands
                      'clickJsAlert',
                      'fillform',
                      'frame',
+                     'highlight',
                      'submitform',
                      'type',
                      'click',
@@ -132,6 +133,10 @@ module Scoutui::Commands
       _action.match(/^\s*(frame|switchframe|switch_frame)\s*\(/i)
     end
 
+    def isHighlight?(_action)
+      _action.match(/^\s*(highlight)/i)
+    end
+
     def isVerifyElt?(_action)
       !_action.match(/(verifyelt|verifyelement)\(/i).nil?
     end
@@ -190,6 +195,8 @@ module Scoutui::Commands
         @totalCommands['frame']+=1
       elsif isGetAlert?(cmd)
         @totalCommands['clickJsAlert']+=1
+      elsif isHighlight?(cmd)
+        @totalCommands['highlight']+=1
       elsif isVerifyElt?(cmd)
         @totalCommands['verifyelt']+=1
       elsif isVerifyForm?(cmd)

data/lib/scoutui/utils/utils.rb

@@ -31,7 +31,8 @@ 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, :debug].each do |o|
+       :userid, :password, :json_config_file, :page_model, :test_config,
+       :sauce_platform, :sauce_resolution, :debug].each do |o|
         @options[o]=nil
       end
 
@@ -118,6 +119,20 @@ module Scoutui::Utils
       @app_model
     end
 
+    def getViewPort()
+      rc=nil
+
+      if !options[:viewport].nil?
+        arr=options[:viewport].match(/(\d+)\s*x\s*(\d+)$/i)
+        if arr.size==3
+          rc = {width: arr[1].to_i, height: arr[2].to_i}
+        end
+      end
+
+      rc
+    end
+
+
     def parseCommandLine()
 
       OptionParser.new do |opt|
@@ -208,6 +223,9 @@ module Scoutui::Utils
         }
         opt.on('--sauce_name NAME') { |o| @options[:sauce_name]  = o }
         opt.on('--sauce:build id')  { |o| @options[:sauce_build] = o }
+        opt.on('--sauce:platform PLATFORM') { |o| @options[:sauce_platform] = o }
+        opt.on('--sauce:resolution RESOLUTION') { |o| @options[:sauce_resolution] = o }
+
         opt.on('--viewport [resolution]') { |o| options[:viewport] = o }
       end.parse!
 
@@ -233,6 +251,14 @@ module Scoutui::Utils
     end
 
     def getCapabilities()
+      if !saucePlatform().nil?
+        @options[:capabilities][:platform]=saucePlatform()
+      end
+
+      if !sauceResolution().nil?
+        @options[:capabilities][:screenResolution]=sauceResolution()
+      end
+
       @options[:capabilities]
     end
 
@@ -256,10 +282,18 @@ module Scoutui::Utils
       @options[:enable_sauce]
     end
 
+    def saucePlatform()
+      @options[:sauce_platform]
+    end
+
     def getLicenseFile()
       @options[:license_file].to_s
     end
 
+    def sauceResolution()
+      @options[:sauce_resolution]
+    end
+
     def getRole()
       @options[:role]
     end
@@ -344,12 +378,13 @@ module Scoutui::Utils
           end
 
           if !@options[k.to_sym].nil?
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " eyes[#{k.to_s}] override with #{@options[k.to_sym]}"
+
             _v=@options[k.to_sym].to_s
           end
 
-          if Scoutui::Utils::TestUtils.instance.isDebug?
-            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{k} => #{_v}"
-          end
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{k} => #{_v}"
 
           Scoutui::Base::UserVars.instance.set('eyes.' + k, _v) if !_v.nil?
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.12.pre"
+  VERSION = "2.0.3.13.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.12.pre
+  version: 2.0.3.13.pre
 platform: ruby
 authors:
 - Peter Kim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,6 +232,7 @@ files:
 - lib/scoutui/commands/commands.rb
 - lib/scoutui/commands/exists_alert.rb
 - lib/scoutui/commands/fill_form.rb
+- lib/scoutui/commands/highlight.rb
 - lib/scoutui/commands/jsalert/action_jsalert.rb
 - lib/scoutui/commands/mouse_over.rb
 - lib/scoutui/commands/pause.rb