scoutui 2.0.5.4 → 2.0.5.5

data/lib/scoutui/commands/update_url.rb

@@ -44,8 +44,11 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Perf navigate to #{normUrl} : #{_duration}"
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => title #{@drv.title.to_s}"
         _rc=true
+      rescue Selenium::WebDriver::Error::UnhandledAlertError => ex
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Alert : #{ex.message}"
+        _rc=true
       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 + " Error during processing: #{ex.class} - #{ex.message}"
         Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 

data/lib/scoutui/commands/upload_files.rb

@@ -40,7 +40,7 @@ module Scoutui::Commands
           _c = Scoutui::Commands::Type.new(_typeCmd, @drv)
           _c.run(driver: @drv)
 
-      #    puts __FILE__ + (__LINE__).to_s + "  Uploaded - pause"; STDIN.gets;
+      #    Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  Uploaded - pause"; STDIN.gets;
 
           _typeCmd={ 'page' => {'action' => "click(#{submit})"} }
           _c = Scoutui::Commands::ClickObject.new(_typeCmd)
@@ -52,7 +52,7 @@ module Scoutui::Commands
           _typeCmd={ 'page' => {'action' => "click(#{close})"} }
           _c = Scoutui::Commands::ClickObject.new(_typeCmd)
           _c.run(driver: @drv, dut: nil)
-          puts "++ CLOSED DLG **"; # STDIN.gets
+          Scoutui::Logger::LogMgr.instance.debug "++ CLOSED DLG **"; # STDIN.gets
         end
 
 

data/lib/scoutui/commands/utils.rb

@@ -61,6 +61,21 @@ module Scoutui::Commands
           '__DATE__' => lambda { Time.now().to_s },
           '__EMAIL__' => lambda { Faker::Internet.email.to_s},
           '__DDMMYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d%m%Y") },
+          '__DD/MM/YYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d/%m/%Y") },
+          '__DD/MM/YYYY\+\d+__' => lambda { |s|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__DD\/MM\/YYYY\+(\d+)__/)[1]
+            d=(Date.today + d.to_i).strftime("%d/%m/%Y")
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
+          '__DD/MM/YYYY\-\d+__' => lambda { |s|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__DD\/MM\/YYYY\-(\d+)__/)[1]
+            d=(Date.today - d.to_i).strftime("%d/%m/%Y")
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
           '__MM/DD/YY__' => lambda { Date.parse(Time.now.to_s).strftime("%m/%d/%y") },
           '__MM/DD/YY\+\d+__' => lambda { |s|
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
@@ -85,6 +100,13 @@ module Scoutui::Commands
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
             d
           },
+          '__MM/DD/YYYY\-\d+__' => lambda { |s|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__MM\/DD\/YYYY\-(\d+)__/)[1]
+            d=(Date.today - d.to_i).strftime("%m/%d/%Y")
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
           '__MMDDYYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m%d%Y") },
           '__MMDDYYYY\+\d+__' => lambda { |s|
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
@@ -251,7 +273,7 @@ module Scoutui::Commands
     end
 
     def isExistsAlert?(_action)
-      _action.is_a?(String) &&  !_action.match(/(exist[s]*_*alert|existAlert|existsAlert|existsJsAlert|existsJsConfirm|existsJsPrompt)\(/i).nil?
+      _action.is_a?(String) &&  !_action.match(/[!]*(exist[s]*_*alert|existAlert|existsAlert|existsJsAlert|existsJsConfirm|existsJsPrompt)\(/i).nil?
     end
 
     def isFrame?(_action)
@@ -263,7 +285,7 @@ module Scoutui::Commands
     end
 
     def isVerifyElt?(_action)
-      _action.is_a?(String) && !_action.match(/(verifyelt|verifyelement)\(/i).nil?
+      _action.is_a?(String) && !_action.match(/(verify[eE]lt|verify[eE]lement)\(/i).nil?
     end
 
     def isClick?(_action)

data/lib/scoutui/commands/verify_element.rb

@@ -96,13 +96,13 @@ module Scoutui::Commands
 
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " abort processing."
         Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{ex}"
-        puts __FILE__ + (__LINE__).to_s +  "\nBacktrace:\n\t#{ex.backtrace.join("\n\t")}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s +  "\nBacktrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
     end
 
     def execute(_drv, e=nil)
-      _execute(drv)
+      _execute(_drv)
     end
 
     def _execute(drv)
@@ -110,34 +110,85 @@ module Scoutui::Commands
       _e=getLocator()
 
       if _e.nil?
-        _e = @cmd.match(/(verifyelt|verifyelement)\s*\((.*)\)/)[2].to_s.strip
+        _e = @cmd.match(/(verify[eE]lt|verify[eE]lement)\s*\((.*)\)/)[2].to_s.strip
       end
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " verifyElement => #{_e}"  if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " verifyElement => #{_e}"
 
       _xpath = Scoutui::Base::UserVars.instance.get(_e)
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | translate : #{_xpath}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | translate : #{_xpath}"
 
 
       page_elt = Scoutui::Utils::TestUtils.instance.getPageElement(_xpath)
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process page request #{page_elt} => #{page_elt.class.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process page request #{page_elt} => #{page_elt.class.to_s}"
 
       xpath=nil
 
       if page_elt.is_a?(Hash) && page_elt.has_key?('locator')
 
         locator = Scoutui::Base::UserVars.instance.get(page_elt['locator'].to_s)
+        obj=Scoutui::Base::QBrowser.getElement(@drv, locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
 
+        if !obj.nil? && obj.is_a?(Selenium::WebDriver::Element) && obj.tag_name.downcase.match(/(select)/)
+          opt = Selenium::WebDriver::Support::Select.new(obj)
 
-        if page_elt.has_key?('visible_when') && page_elt['visible_when'].match(/title\(/)
+         # opts = _opt.selected_options
+
+          if !opt.nil?
+            opts = opt.options
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " opts => #{opts}"
+
+            optionList=[]
+            textList=[]
+            opts.each do |item|
+              textList << item.attribute('text')  if !item.attribute('text').nil?
+              optionList << item.attribute('value')  if !item.attribute('value').nil?
+            end
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s +  " optsText   : #{textList}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s +  " optsValues : #{optionList}"
+
+
+            if page_elt.has_key?('options')
+              diffSet = page_elt['options'] - textList
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " diffSet => #{diffSet} : #{diffSet.empty?}"
+
+              Testmgr::TestReport.instance.getReq('UI').tc('visible_when').add(diffSet.empty?, "Verify expected options exists for #{_e}  (unmatched: #{diffSet})")
+
+
+              Scoutui::Logger::LogMgr.instance.asserts.info "Verify expected options exists for #{_e}  (unmatched: #{diffSet}) - #{diffSet.empty?}"
+
+
+              setResult(diffSet.empty?)
+            end
+
+          end
+        end
+
+
+
+        if page_elt.has_key?('visible_when') && page_elt['visible_when'].is_a?(Array)
+
+          _expectedResults=Scoutui::Base::VisualTestFramework::processAsserts(@drv, page_elt['visible_when'])
+
+
+          Testmgr::TestReport.instance.getReq('UI').tc('visible_when').add(!obj.nil? && obj.displayed?, "Verify #{locator} is visible")
+
+
+          _expectedResults = _expectedResults && !obj.nil? && obj.displayed?
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " expectedResult : #{_expectedResults}"
+          return _expectedResults
+
+        elsif page_elt.has_key?('visible_when') && page_elt['visible_when'].match(/title\(/)
           current_title = @drv.title
           expected_title = Regexp.new(page_elt['visible_when'].match(/title\((.*)\)/)[1].to_s)
           rc=!expected_title.match(current_title).nil?
 
 
-
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Verify expected title (#{current_title}) matches (#{expected_title}) => " + rc.to_s
 
 #          Testmgr::TestReport.instance.getReq('UI').tc('visible_when').add(expected_title==current_title, "Verify title matches #{expected_title}")
@@ -205,9 +256,9 @@ module Scoutui::Commands
 
         page_elt.each do |elt|
 
-          puts __FILE__ + (__LINE__).to_s + " ELT => #{elt} : #{elt.to_s}"
-          puts __FILE__ + (__LINE__).to_s + "     ELT[0] : #{elt[0]}"
-          puts __FILE__ + (__LINE__).to_s + "     ELT[1] : #{elt[1]}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ELT => #{elt} : #{elt.to_s}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "     ELT[0] : #{elt[0]}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "     ELT[1] : #{elt[1]}"
 
           if elt.is_a?(Array)
             _h={ elt[0] => elt[1] }

data/lib/scoutui/eyes/eye_scout.rb

@@ -219,8 +219,9 @@ module Scoutui::Eyes
       Scoutui::Logger::LogMgr.instance.info "SCOUTUI VERSION : " + Scoutui::VERSION
 
       if Scoutui::Utils::TestUtils.instance.eyesEnabled?
-        Scoutui::Logger::LogMgr.instance.debug " testResults.methods = #{@testResults.methods.sort.to_s}"
+#       Scoutui::Logger::LogMgr.instance.debug " testResults.methods = #{@testResults.methods.sort.to_s}"
         Scoutui::Logger::LogMgr.instance.info " Eyes.TestResults.isNew      : #{@testResults.is_new.to_s}"
+        Scoutui::Logger::LogMgr.instance.info " Eyes.TestResults.Missing    : #{@testResults.missing.to_s}"
         Scoutui::Logger::LogMgr.instance.info " Eyes.TestResults.Matches    : #{@testResults.matches.to_s}"
         Scoutui::Logger::LogMgr.instance.info " Eyes.TestResults.Mismatches : #{@testResults.mismatches.to_s}"
         Scoutui::Logger::LogMgr.instance.info " Eyes.TestResults.Passed     : #{@testResults.passed?.to_s}"
@@ -233,6 +234,14 @@ module Scoutui::Eyes
 
       Testmgr::TestReport.instance.report()
 
+      if Scoutui::Utils::TestUtils.instance.abort?
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Aborted:"
+
+        Scoutui::Utils::TestUtils.instance.abortMessage.each do |msg|
+          Scoutui::Logger::LogMgr.instance.fatal msg
+        end
+      end
+
       Testmgr::TestReport.instance.junitReport(Scoutui::Utils::TestUtils.instance.getReporter())
 
 #     Testmgr::TestReport.instance.generateReport()
@@ -295,7 +304,7 @@ module Scoutui::Eyes
 
         @eyes=Scoutui::Eyes::EyeFactory.instance.createEyes()
 
-        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes => #{eyes}" if Scoutui::Utils::TestUtils.instance.isDebug?
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " eyes => #{eyes}"
 
         ## TBD - move the following into eye_scout ??
         if Scoutui::Utils::TestUtils.instance.eyesEnabled?
@@ -308,7 +317,6 @@ module Scoutui::Eyes
         end
 
       rescue => ex
-#        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 

data/lib/scoutui/eyes/utils.rb

@@ -115,9 +115,9 @@ module Scoutui::Eyes
 
       index = 1
       data['actualAppOutput'].each do |elem|
-        puts __FILE__ + (__LINE__).to_s + " elem => #{elem}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " elem => #{elem}"
         if (!elem.nil?)
-          puts __FILE__ + (__LINE__).to_s + " | o isMatching : #{elem['isMatching']}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | o isMatching : #{elem['isMatching']}"
 #         diff_urls[index] = diff_template % [index]
           diff_urls[index] = { :tag => elem['tag'].to_s, :isMatching => elem['isMatching'], :url => diff_template % [index], :index => index }
         end

data/lib/scoutui/utils/utils.rb

@@ -23,6 +23,7 @@ module Scoutui::Utils
     def initialize
 
       @currentMessage=""
+      @failedFastMessage=[]
       @coverage={:pages => []}
       @final_rc=false
       @metrics=nil
@@ -42,6 +43,7 @@ module Scoutui::Utils
       @options[:include_expected_as_asserts]=false
       @options[:role]=nil
       @options[:sauce_name]='unnamed'
+      @options[:sauce_tunnelid]=nil
       @options[:enable_eyes]=false
       @options[:enable_fullscreen]=true
       @options[:enable_sauce]=false
@@ -69,6 +71,16 @@ module Scoutui::Utils
     def setState(s, _d=nil)
       @execution_status=s
       @currentMessage=_d if !_d.nil?
+
+      if @execution_status==:abort && !_d.nil?
+        @failedFastMessage << _d.to_s
+        Scoutui::Logger::LogMgr.instance.fatal "[ABORT]: #{_d}"
+      end
+
+    end
+
+    def abortMessage
+      @failedFastMessage
     end
 
     def currentMessage
@@ -176,19 +188,25 @@ module Scoutui::Utils
     end
 
 
-    def parseCommandLine()
+    def parseCommandLine(args=nil)
 
-      OptionParser.new do |opt|
+      opt_parser = OptionParser.new do |opt|
         opt.on('-c', '--config TESTFILE') { |o|
             if !o.nil?
               @options[:json_config_file]=o
 
-              jFile = File.read(@options[:json_config_file])
-              @options[:test_config]=jsonData=JSON.parse(jFile)
+              if File.exist?(@options[:json_config_file])
+                jFile = File.read(@options[:json_config_file])
+                @options[:test_config]=jsonData=JSON.parse(jFile)
+              else
+                Scoutui::Utils::TestUtils.instance.setState(:abort, "Unable to access test config file: #{@options[:json_config_file]}")
+                raise "SCOUTUI::MissingFile::TestConfig : #{@options[:json_config_file]}"
+              end
+
             end
         }
         opt.on('--accounts [Account]')    { |o| @options[:accounts] = o }
-        opt.on('-b', '--browser [TYPE]', [:chrome, :firefox, :ie, :safari, :phantomjs], "Select browser (chrome, ie, firefox, safari)") { |o| @options[:browser] = o }
+        opt.on('-b', '--browser [TYPE]', [:chrome, :firefox, :edge, :ie, :safari, :phantomjs], "Select browser (chrome, ie, firefox, safari)") { |o| @options[:browser] = o }
         opt.on('--capabilities CAP') {  |o|
           @options[:capabilities]=o
 
@@ -316,8 +334,9 @@ module Scoutui::Utils
         opt.on('--sauce:browser Browser') { |o| @options[:sauce_browser] = o }
         opt.on('--sauce:browsername BrowserName') { |o| @options[:sauce_browsername] = o }
         opt.on('--sauce:platform Platform') { |o| @options[:sauce_platform] = o }
+        opt.on('--sauce:tunnelid TunnelID') { |o| @options[:sauce_tunnelid] = o }
         opt.on('--sauce:resolution Resolution') { |o| @options[:sauce_resolution] = o }
-        opt.on('--sauce:version Version') { |o| @options[:sauce_version] = o }
+        opt.on('--sauce:version Version') { |o| @options[:sauce_version] = o; Scoutui::Base::UserVars.instance.setVar('browser_version', o) }
 
         opt.on('--seleniumserver URL') { |o| @options[:selenium_server] = o }
 
@@ -325,7 +344,15 @@ module Scoutui::Utils
           @options[:viewport] = o
           Scoutui::Base::UserVars.instance.set('eyes.viewport', @options[:viewport])
         }
-      end.parse!
+        end
+#      end.parse!(args)
+
+      if !args.nil?
+        opt_parser.parse!(args)
+      else
+        opt_parser.parse!
+      end
+
 
       if Scoutui::Utils::TestUtils.instance.isDebug?
         Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " ScoutUI Version : " + Scoutui::VERSION
@@ -503,6 +530,10 @@ module Scoutui::Utils
       @options[:sauce_build] || nil
     end
 
+    def getSauceTunnel()
+      @options[:sauce_tunnelid]
+    end
+
     def getSeleniumServer()
       @options[:selenium_server]
     end
@@ -654,22 +685,22 @@ module Scoutui::Utils
       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}"
+        Scoutui::Logger::LogMgr.instance.debug __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}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " value => #{_v2}"
 
       end
 
       ## Global replaces
       _text_to_type = Scoutui::Base::UserVars.instance.get(_v2)
 
-      puts __FILE__ + (__LINE__).to_s + " rawText : #{_text_to_type}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " rawText : #{_text_to_type}"
       _text_to_type = Scoutui::Commands::Utils.instance.expandMacro(_text_to_type)
-      puts __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
 
       _text_to_type
     end
@@ -678,13 +709,13 @@ module Scoutui::Utils
 
     def expandVars(h)
 
-      puts __FILE__ + (__LINE__).to_s + " expandVars(#{h})"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " expandVars(#{h})"
 
       h.each do |k, v|
         if v.is_a?(Hash) || v.is_a?(Array)
           expandVars(v)
         else
-          puts("k is #{k}, value is #{v}")
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "k is #{k}, value is #{v}"
 
           h[k]=transpile(v)
         end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.5.4"
+  VERSION = "2.0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.5.4
+  version: 2.0.5.5
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -242,6 +242,7 @@ files:
 - lib/scoutui/base/q_form.rb
 - lib/scoutui/base/q_har_mgr.rb
 - lib/scoutui/base/requirements.rb
+- lib/scoutui/base/result_assertion.rb
 - lib/scoutui/base/test_context.rb
 - lib/scoutui/base/test_data.rb
 - lib/scoutui/base/test_scout.rb