scoutui 2.0.1 → 2.0.2

data/lib/scoutui/commands/type.rb

@@ -5,33 +5,121 @@ module Scoutui::Commands
   class Type < Command
 
 
+    def _whenTyped(page_elt)
+
+      if page_elt.is_a?(Hash) && page_elt.has_key?('when_typed')
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Verify #{page_elt['when_clicked']}"
+
+        page_elt['when_clicked'].each do |_elt|
+
+          _r = _elt.keys[0].to_s
+
+          _pg = _elt[_r]
+
+          #    _c = Scoutui::Commands::VerifyElement.new("verifyelement(" + _elt + ")")
+          #    _c.execute(@drv)
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _whenClicked -> assertions (#{_pg}, #{_r.to_s})"
+
+
+          if _pg.is_a?(Array)
+            _pg.each do |_pg2|
+              isVisible=Scoutui::Base::Assertions.instance.isVisible(@drv, _pg2, _r)
+            end
+          elsif _pg.is_a?(String)
+            isVisible=Scoutui::Base::Assertions.instance.isVisible(@drv, _pg, _r)
+          else
+            puts __FILE__ + (__LINE__).to_s + " => #{_pg}"
+          end
+
+#         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " IsVisible #{isVisible} - PAUSE"; gets
+
+        end
+
+      end
+
+    end
+
     def execute(drv=nil)
       @drv=drv if !drv.nil?
 
+      _isKb=false
       _rc=false
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
       begin
-        _xpath = @cmd.match(/type\((.*),\s*/)[1].to_s
-        _val   = @cmd.match(/type\(.*,\s*(.*)\)/)[1].to_s
+#        _xpath = @cmd.match(/type[\!]*\((.*),\s*/)[1].to_s
+#        _val   = @cmd.match(/type[\!]*\(.*,\s*(.*)\)/)[1].to_s
+
 
-        Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
-        obj = Scoutui::Base::QBrowser.getObject(@drv, _xpath)
 
-        if !obj.nil? && !obj.attribute('type').downcase.match(/(text|password|email)/).nil?
-          obj.send_keys(Scoutui::Base::UserVars.instance.get(_val))
+        if @cmd.strip.match(/^\s*type\s*\(\s*__TAB__\s*\)\s*$/)
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " HIT TAB key"
+          @drv.action.send_keys(:tab).perform
           _rc=true
+          _isKb=true
         else
-          Scoutui::Logger::LogMgr.instance.commands.debug  __FILE__ + (__LINE__).to_s + " Unable to process command TYPE => #{obj.to_s}"
+          _xpath = @cmd.match(/^\s*type[\!]*\((.*),\s*/)[1].to_s
+          _val   = @cmd.match(/^\s*type[\!]*\(.*,\s*(.*)\)/)[1].to_s
+
+
+          Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"
+
+          obj = Scoutui::Base::QBrowser.getObject(@drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
+
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " type(#{_val})"
+
+          if !obj.nil? && !obj.attribute('type').downcase.match(/(text|password|email)/).nil?
+
+            # Refactor in qbrowser
+
+            wait = Selenium::WebDriver::Wait.new(:timeout =>  Scoutui::Commands::Utils.instance.getTimeout)
+            isDisplayed=false
+            isDisplayed = wait.until {
+              true if obj.displayed?
+            }
+
+            if @cmd.match(/type\!/i)
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " clear()"
+              obj.clear if isDisplayed
+            end
+
+
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " send_keys(#{_val})"
+
+            if isDisplayed
+              if _val.match(/__DOWN__/)
+                obj.send_keys(:arrow_down)
+              elsif _val.match(/__TAB__/)
+                obj.send_keys(:tab)
+              else
+
+                obj.send_keys(Scoutui::Base::UserVars.instance.get(_val))
+              end
+
+
+              _rc=true
+            end
+
+          else
+            Scoutui::Logger::LogMgr.instance.commands.debug  __FILE__ + (__LINE__).to_s + " Unable to process command TYPE => #{obj.to_s}"
+          end
         end
 
-      rescue
-        ;
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{ex}"
+        puts __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+      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}")
       end
 
-      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}")
       setResult(_rc)
 
     end

data/lib/scoutui/commands/update_url.rb

@@ -10,7 +10,7 @@ module Scoutui::Commands
 
       baseUrl = Scoutui::Base::UserVars.instance.getHost()
 
-      url = @cmd.match(/navigate\s*\((.*)\)/)[1].to_s.strip
+      url = @cmd.match(/navigate\s*\((.*)\)/i)[1].to_s.strip
       Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " url => #{url}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
       _relativeUrl = url.strip.start_with?('/')

data/lib/scoutui/commands/utils.rb

@@ -9,10 +9,12 @@ module Scoutui::Commands
 
     attr_accessor :totalCommands
     attr_accessor :timeout
+    attr_accessor :hwnds
 
     def initialize
       @command_list=['pause',
                      'existsAlert',
+                     'clickJsAlert',
                      'fillform',
                      'submitform',
                      'type',
@@ -20,6 +22,7 @@ module Scoutui::Commands
                      'mouseover',
                      'navigate',
                      'select',
+                     'select_window',
                      'verifyelt',
                      'verifyelement',
                      'verifyform']
@@ -28,17 +31,48 @@ module Scoutui::Commands
       @command_list.each do |c|
         @totalCommands[c]=0
       end
+
+      @hwnds = { :current => nil, :previous => nil, :handles => [] }
+    end
+
+
+    def isCSS(_locator)
+      rc=nil
+
+      if _locator.match(/^css\=/i)
+        rc = _locator.match(/\s*(css\=.*)/i)[1].to_s.strip
+      elsif _locator.match(/^#/i)
+        rc=_locator.strip
+      end
+
+      rc
     end
 
-    def resetTimeout()
-      setTimeout(30)
+
+    def setCurrentWindow(_w)
+      if @hwnds[:previous].nil?
+        @hwnds[:previous]=_w
+      else
+        @hwnds[:previous]=@hwnds[:current]
+      end
+
+      @hwnds[:current]=_w
+    end
+
+    def resetTimeout(t=30)
+      setTimeout(t)
     end
 
     def setTimeout(_t)
-      @timeout=_t
+      @timeout=_t.to_i
     end
     def getTimeout()
-      @timeout
+      @timeout.to_i
+    end
+
+    def isSelectWindow?(_action)
+      Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " isSelectWindow?(#{_action})"
+      !_action.match(/select_window/i).nil?
     end
 
     def isExistsAlert?(_action)
@@ -66,7 +100,7 @@ module Scoutui::Commands
     end
 
     def isType?(_action)
-      !_action.match(/type\(/).nil?
+      !_action.match(/type[\!]*\(/).nil?
     end
 
     def isSubmitForm?(_action)
@@ -97,6 +131,8 @@ module Scoutui::Commands
         @totalCommands['pause']+=1
       elsif isExistsAlert?(cmd)
         @totalCommands['existsAlert']+=1
+      elsif isGetAlert?(cmd)
+        @totalCommands['clickJsAlert']+=1
       elsif isVerifyElt?(cmd)
         @totalCommands['verifyelt']+=1
       elsif isVerifyForm?(cmd)
@@ -115,6 +151,8 @@ module Scoutui::Commands
         @totalCommands['select']+=1
       elsif isNavigate?(cmd)
         @totalCommands['navigate']+=1
+      elsif isSelectWindow?(cmd)
+        @totalCommands['select_window']+=1
       else
         rc=false
       end

data/lib/scoutui/commands/verify_element.rb

@@ -20,7 +20,13 @@ module Scoutui::Commands
         if a.is_a?(Hash)
           _v=a
 
-          _req = Scoutui::Utils::TestUtils.instance.getReq()
+
+          if _v.has_key?('reqid')
+            _req=_v['reqid'].to_s
+          else
+            _req = Scoutui::Utils::TestUtils.instance.getReq()
+          end
+
 
           if _v.has_key?('locator')
             _locator = _v['locator'].to_s
@@ -35,7 +41,35 @@ module Scoutui::Commands
 
           if _v.has_key?('visible_when')
 
-            if _v['visible_when'].match(/always/i)
+
+            if _v['visible_when'].match(/^\s*(text|value)\s*\(/)
+
+              _elt = _v['visible_when']
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " verify text";
+              condition = _elt.match(/(value|text)\((.*)\)/)[1].to_s
+              tmpObj = _elt.match(/(value|text)\((.*)\)/)[2].to_s
+              expectedVal = _elt.match(/(value|text)\s*\(.*\)\s*\=\s*(.*)/)[2].to_s
+
+              _xpath = Scoutui::Base::UserVars.instance.get(tmpObj)
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " locator : #{_xpath}"; #gets
+
+              obj = Scoutui::Base::QBrowser.getObject(@drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " text : #{obj.text} vs #{expectedVal}"
+
+              expected_regex = Regexp.new(expectedVal)
+              rc =  !obj.text.to_s.match(expected_regex).nil?
+
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " req: #{_req}  obj : #{obj}, rc:#{rc}"; #gets
+              if rc
+                Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!obj.nil?, "Verify element exists when #{condition} match #{expectedVal}")
+              end
+
+
+            elsif _v['visible_when'].match(/always/i)
               Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + " Verify assertion #{_k} - #{_locator} visible - #{!_obj.nil?.to_s}"
               Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(!_obj.nil?, "Verify assertion #{_k} - #{_locator} visible")
             elsif _v['visible_when'].match(/never/i)
@@ -119,7 +153,7 @@ module Scoutui::Commands
 
           xpath = Scoutui::Base::UserVars.instance.get(tmpObj)
 
-          obj = Scoutui::Base::QBrowser.getObject(@drv, xpath)
+          obj = Scoutui::Base::QBrowser.getObject(@drv, xpath, Scoutui::Commands::Utils.instance.getTimeout)
 
           if !obj.nil?
           #  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " value : #{obj.value.to_s}"
@@ -145,7 +179,7 @@ module Scoutui::Commands
                 end
 
                 if !desc.nil?
-                  locatorObj = Scoutui::Base::QBrowser.getObject(@drv, locator)
+                  locatorObj = Scoutui::Base::QBrowser.getObject(@drv, locator, Scoutui::Commands::Utils.instance.getTimeout)
 
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " LocatorObj : #{locatorObj} : #{!locatorObj.nil? && locatorObj.displayed?}"
 
@@ -162,9 +196,6 @@ module Scoutui::Commands
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " value : #{obj.attribute('value').to_s}"
           end
 
-
-
-
         end
 
       elsif page_elt.is_a?(Hash)

data/lib/scoutui/eyes/eye_factory.rb

@@ -1,6 +1,6 @@
 
 require 'singleton'
-
+require 'eyes_selenium'
 
 module Scoutui::Eyes
 
@@ -16,6 +16,8 @@ module Scoutui::Eyes
 
     def createScout()
       browserType = Scoutui::Base::UserVars.instance.getBrowserType()
+
+      puts __FILE__ + (__LINE__).to_s + "BrowserType : #{browserType}"
       eyeScout = EyeScout.new(browserType)
     end
 
@@ -45,18 +47,22 @@ module Scoutui::Eyes
           end
 
         elsif ENV.has_key?('APPLITOOLS_API_KEY')
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " APPLITOOLS_API_KEY from ENV"
           license_key=ENV['APPLITOOLS_API_KEY'].to_s
         end
 
 
         if !license_key.nil?
           eyes=Applitools::Eyes.new()
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Eyes Object created #{eyes}"
           eyes.api_key = license_key
           eyes.force_fullpage_screenshot = true
 
           match_level = Scoutui::Base::UserVars.instance.getVar('eyes.match_level')
 
           eyes.match_level = Applitools::Eyes::MATCH_LEVEL[match_level.to_sym]
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " eyes => #{eyes}"
         end
 
         ## TBD - eyes.open()

data/lib/scoutui/eyes/eye_scout.rb

@@ -1,5 +1,6 @@
-require 'eyes_selenium'
-require 'testmgr'
+#require 'eyes_selenium'
+#require 'testmgr'
+require 'httparty'
 
 module Scoutui::Eyes
 
@@ -168,8 +169,15 @@ module Scoutui::Eyes
       end
 
       Scoutui::Logger::LogMgr.instance.info " TestReport => #{@testResults}"
-   #  Testmgr::TestReport.instance.generateReport()
+
       Testmgr::TestReport.instance.report()
+
+#     Testmgr::TestReport.instance.generateReport()
+
+      metrics=Testmgr::TestReport.instance.getMetrics()
+      Scoutui::Logger::LogMgr.instance.info "Metrics => #{metrics}"
+
+      Scoutui::Utils::TestUtils.instance.setMetrics(metrics)
     end
 
     def getResults()
@@ -184,8 +192,13 @@ module Scoutui::Eyes
       browserType = Scoutui::Base::UserVars.instance.getBrowserType()
       viewport_size = Scoutui::Base::UserVars.instance.getViewPort()
 
+      puts __FILE__ + (__LINE__).to_s + " browserType => #{browserType}"
+
+
       Testmgr::TestReport.instance.setDescription('ScoutUI Test')
       Testmgr::TestReport.instance.setEnvironment(:qa, Scoutui::Utils::TestUtils.instance.getHost())
+      Testmgr::TestReport.instance.setHost(Scoutui::Base::UserVars.instance.get(:host))
+      Testmgr::TestReport.instance.setBrowserUnderTest(browserType)
       Testmgr::TestReport.instance.addRequirement('UI')
       Testmgr::TestReport.instance.getReq('UI').add(Testmgr::TestCase.new('visible_when', "visible_when"))
       Testmgr::TestReport.instance.addRequirement('Command')
@@ -195,12 +208,12 @@ module Scoutui::Eyes
 
       if Scoutui::Utils::TestUtils.instance.isDebug?
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " setup() : #{browserType}"
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " sauce    => " + Scoutui::Utils::TestUtils.instance.eyesEnabled?.to_s
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes     => " + Scoutui::Utils::TestUtils.instance.eyesEnabled?.to_s
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " viewport => #{viewport_size}"
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes cfg => #{@eyesRecord}"
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " title => " + Scoutui::Base::UserVars.instance.getVar('eyes.title')
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " app => " + Scoutui::Base::UserVars.instance.getVar('eyes.app')
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " match_level => " + Scoutui::Base::UserVars.instance.getVar('eyes.match_level')
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes.title => " + Scoutui::Base::UserVars.instance.getVar('eyes.title')
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes.app => " + Scoutui::Base::UserVars.instance.getVar('eyes.app')
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes.match_level => " + Scoutui::Base::UserVars.instance.getVar('eyes.match_level')
       end
 
       begin

data/lib/scoutui/utils/utils.rb

@@ -15,8 +15,17 @@ module Scoutui::Utils
     attr_accessor :app_model
     attr_accessor :currentTest
 
+    attr_accessor :metrics
+    attr_accessor :final_rc
+
+    attr_accessor :coverage
+
     def initialize
 
+      @coverage={:pages => []}
+      @final_rc=false
+      @metrics=nil
+
       @env_list={:accounts => 'SCOUTUI_ACCOUNTS', :browser => 'SCOUTUI_BROWSER', :applitools_api_key => 'APPLITOOLS_API_KEY'}
       @options={}
       @currentTest={:reqid => 'UI', :testcase => '00' }
@@ -26,12 +35,14 @@ module Scoutui::Utils
         @options[o]=nil
       end
 
+      @options[:include_expected_as_asserts]=false
       @options[:role]=nil
       @options[:sauce_name]='unnamed'
       @options[:enable_eyes]=false
       @options[:enable_sauce]=false
       @options[:log_level]=:info     # :debug, :info, :warn, :error, :fatal
       @options[:match_level]='layout'
+      @options[:default_wait]=30     # seconds
       @options[:debug]=false
 
       @app_model=nil
@@ -40,6 +51,30 @@ module Scoutui::Utils
 
     end
 
+    def getPageCoverage()
+      @coverage[:pages]
+    end
+
+    def addPageCoverage(p)
+      @coverage[:pages] << p
+    end
+
+    def getFinalRc()
+      @final_rc
+    end
+
+    def setFinalRc(b)
+      @final_rc=b
+    end
+
+    def getMetrics()
+      @metrics
+    end
+
+    def setMetrics(_m)
+      @metrics=_m
+    end
+
     def getReq()
       @currentTest[:reqid]
     end
@@ -73,6 +108,10 @@ module Scoutui::Utils
       @app_model.getPageElement(s)
     end
 
+    def getAppModel()
+      @app_model
+    end
+
     def parseCommandLine()
 
       OptionParser.new do |opt|
@@ -119,7 +158,11 @@ module Scoutui::Utils
         }
         opt.on('--dut DUT') { |o| @options[:dut]=o }
         opt.on('-h', '--host HOST')     { |o| @options[:host] = o }
-        opt.on('-l', '--lang LOCAL')    { |o| @options[:loc] = o }
+        opt.on('-i', '--include_expectations') { |o| @options[:include_expected_as_asserts] = true}
+        opt.on('-l', '--lang LOCAL')    { |o|
+          @options[:loc] = o
+          Scoutui::Base::UserVars.instance.setVar(:lang, @options[:loc].to_s)
+        }
         opt.on('-k', '--key EyesLicense') { |o| options[:license_file] = o }
         opt.on('-a', '--app AppName')   { |o| @options[:app] = o }
         opt.on('--match [LEVEL]', [:layout2, :layout, :strict, :exact, :content], "Select match level (layout, strict, exact, content)") { |o| @options[:match_level] = o }
@@ -135,6 +178,12 @@ module Scoutui::Utils
           @options[:page_model] = o
           loadModel(@options[:page_model].to_s)
         }
+
+        opt.on('-w', '--wait WaitOnElement') { |o|
+          if o.match(/\d+/)
+            @options[:default_wait] = o.to_i
+          end
+        }
         opt.on('-t', '--title TITLE')   { |o| @options[:title] = o }
 
         opt.on('-u', '--user USER_ID')  { |o|
@@ -219,6 +268,15 @@ module Scoutui::Utils
       @options[:browser]
     end
 
+    def getDefaultWait()
+      @options[:default_wait]
+    end
+
+
+    def assertExpected?
+      @options[:include_expected_as_asserts]
+    end
+
     def hasTestConfig?
       !@options[:json_config_file].nil?
     end