scoutui 2.0.3.24.pre → 2.0.3.25.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55b2a4b345d1aa79dc5d04766d2d280ce4c7b07
-  data.tar.gz: 8f67dcd666962bb28e42abf885ad6125f3d67b30
+  metadata.gz: fc82c07173e93d9774896bf6ab4e621a00990174
+  data.tar.gz: 108d391194512236200a2abb6d7415643c83b0cd
 SHA512:
-  metadata.gz: 27a262f79300605d16d7b3d03dcad96e65e2a83155dc8035ade133a1b8ceec2aead811bd7227798388d0809ca763e7095b00b034cfc01c75da902755727a39ec
-  data.tar.gz: 27dec24457a1defbdb8f8d452112d562acf612df31ec2a39129fe64cfa626f47637238ed588a30ed26da8399a9a17a0ecbd471c9761fe17f16aec414d83b37a8
+  metadata.gz: 0ac17a5606dcc0191b1c28aa6870392bd52571a24182625ad10516e0b385c6d8ed4d42bf1a5c2d101091e505dafc7f3cec1b5f795eeb9e1a795aabae5eb1b8b4
+  data.tar.gz: 33692c0644b4076b37a0ee7f3f38f89f8edbfa792e3263536f5a98e2c24b21db7d9945b62e6d9ac27efae36daca50ba296b0c35324a61464b76dc040ba545fcf

data/examples/ex6/tests/test.sh

@@ -66,6 +66,7 @@ ruby $SCOUTUI_BIN  \
             --sauce:version "beta" \
             --sauce:resolution "1280x1024" \
        --host ${HOST} \
+       --failfast true \
        --debug \
        --dut "${CMD}"
 

data/lib/scoutui/base/visual_test_framework.rb

@@ -737,6 +737,11 @@ module Scoutui::Base
 
       dut_dupes.each do |e|
 
+        if Scoutui::Utils::TestUtils.instance.abort?
+          Scoutui::Logger::LogMgr.instance.error __FILE__ + (__LINE__).to_s + " ABORT"
+          return
+        end
+
         totalWindows = my_driver.window_handles.length
 
         Scoutui::Logger::LogMgr.instance.info '-' * 72 if Scoutui::Utils::TestUtils.instance.isDebug?
@@ -853,10 +858,8 @@ module Scoutui::Base
 
         if !(_action.nil? || _action.to_s.empty?)
 
-       #  if !Scoutui::Commands::processCommand(_action, e, my_driver)
-
-          Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{_action} is valid - #{Scoutui::Commands::Utils.instance.isValid?(_action).to_s}"
-          Testmgr::TestReport.instance.getReq('Command').get_child('isValid').add(Scoutui::Commands::Utils.instance.isValid?(_action), "Verify #{_action} is valid")
+          Scoutui::Logger::LogMgr.instance.asserts.info "Verify #{_action} is a valid command - #{Scoutui::Commands::Utils.instance.isValid?(_action).to_s}"
+          Testmgr::TestReport.instance.getReq('Command').get_child('isValid').add(Scoutui::Commands::Utils.instance.isValid?(_action), "Verify #{_action} is a valid command")
 
           begin
 
@@ -867,6 +870,10 @@ module Scoutui::Base
 
             _command = eyeScout.getStrategy().processCommand(_action, e)
 
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _command.Result => #{_command}, Passed? : #{_command.passed?}"
+
+
+
             if my_driver.window_handles.length > totalWindows
               Scoutui::Logger::LogMgr.instance.info "[post-cmd] Total Windows : #{my_driver.window_handles.length.to_s}"
             end
@@ -876,6 +883,11 @@ module Scoutui::Base
             if !_command.wasExecuted?
               processCommand(_action, e, my_driver)
             else
+              if Scoutui::Utils::TestUtils.instance.isFailFast? && !_command.passed?
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Failfast.";
+                Scoutui::Utils::TestUtils.instance.setState(:abort)
+                return
+              end
               Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Command #{_action} was already executed"
             end
 

data/lib/scoutui/commands/assign_var.rb

@@ -9,6 +9,7 @@ module Scoutui::Commands
       @drv=drv if !drv.nil?
       rc=nil
       obj=nil
+      _locator=nil
 
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
@@ -32,31 +33,36 @@ module Scoutui::Commands
 
       begin
 
-        if !obj.nil?
+        if expectObj
 
           # Refactor in qbrowser
 
-          wait = Selenium::WebDriver::Wait.new(:timeout =>  Scoutui::Commands::Utils.instance.getTimeout)
+          if !obj.nil?
 
-          isDisplayed=false
-          isDisplayed = wait.until {
-            true if obj.displayed?
-          }
+            wait = Selenium::WebDriver::Wait.new(:timeout =>  Scoutui::Commands::Utils.instance.getTimeout)
 
+            isDisplayed=false
+            isDisplayed = wait.until { obj.displayed? }
 
-          rc = obj.text  if _condition.match(/^\s*text/i)
-          rc = obj.attribute('value') if _condition.match(/^\s*value/i)
-          Scoutui::Base::UserVars.instance.setVar(_uservar, rc)
 
+            rc = obj.text  if _condition.match(/^\s*text/i)
+            rc = obj.attribute('value') if _condition.match(/^\s*value/i)
+            Scoutui::Base::UserVars.instance.setVar(_uservar, rc)
 
-          puts __FILE__ + (__LINE__).to_s + " rc :: #{Scoutui::Base::UserVars.instance.getVar(_uservar)}"
 
-          if isDisplayed
-            ;
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " rc :: #{Scoutui::Base::UserVars.instance.getVar(_uservar)}  => #{rc.to_s}"
+
+            if isDisplayed
+              ;
+            else
+              Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Element, #{_locator} is not displayed."
+            end
+
           else
-            Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Element, #{_locator} is not displayed."
+            Scoutui::Logger::LogMgr.instance.error __FILE__ + (__LINE__).to_s + " assign failed - unable to get element #{_locator}"
           end
 
+
         end
 
       rescue => ex

data/lib/scoutui/commands/click_object.rb

@@ -44,6 +44,7 @@ module Scoutui::Commands
     def execute(drv, e=nil)
       @drv=drv if !drv.nil?
 
+      bm=nil
       all_windows = @drv.window_handles.size
 
       _req = Scoutui::Utils::TestUtils.instance.getReq()
@@ -61,36 +62,8 @@ module Scoutui::Commands
 
       begin
 
-      #  _frames = Scoutui::Base::QBrowser.getObjectx(@drv, _locator, Scoutui::Commands::Utils.instance.getTimeout)
-
-        if false
-
-            if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('frames')
-              puts __FILE__ + (__LINE__).to_s + " frames => #{e['page']['frames']}";
-              frames=e['page']['frames']
-              frame_list=frames.split(/(frame\(.*\))\.(?=[\w])/)
-              frame_list.each do |_f|
-
-
-                if !_f.empty?
-                  _id = _f.match(/frame\((.*)\)/)[1]
-
-                  puts __FILE__ + (__LINE__).to_s + " switch_to.frame #{_id}"
-
-                  @drv.switch_to.frame(_id.to_s.strip)
-                end
-
-              end
-            end
-
-            obj = Scoutui::Base::QBrowser.getObject(@drv, _locator, Scoutui::Commands::Utils.instance.getTimeout)
-
-
-        end
-
         obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
 
-
         if obj
 
           # Refactor in qbrowser
@@ -98,9 +71,7 @@ module Scoutui::Commands
           wait = Selenium::WebDriver::Wait.new(:timeout =>  Scoutui::Commands::Utils.instance.getTimeout)
 
           isDisplayed=false
-          isDisplayed = wait.until {
-            true if obj.displayed?
-          }
+          isDisplayed = wait.until { obj.displayed? }
 
           if isDisplayed
 
@@ -119,7 +90,8 @@ module Scoutui::Commands
             end
 
             @drv.action.move_to(obj).perform
-            obj.click
+
+            bm=Benchmark.measure { obj.click }
 
             _clicked=true
 
@@ -151,6 +123,7 @@ module Scoutui::Commands
       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}")
 
+      setBenchmark(bm)
       setResult(_clicked)
     end
 

data/lib/scoutui/commands/command.rb

@@ -53,6 +53,10 @@ module Scoutui::Commands
       @locator
     end
 
+    def passed?
+      !@executed_result.nil? && @executed_result
+    end
+
     def result
       @rc
     end

data/lib/scoutui/commands/mouse_over.rb

@@ -49,7 +49,7 @@ module Scoutui::Commands
       @drv=drv if !drv.nil?
 
       begin
-        _locator = @cmd.match(/mouseover\s*\((.*)\)/)[1].to_s.strip
+        _locator = @cmd.match(/^\s*mouseover\s*\((.*)\)/)[1].to_s.strip
         obj = Scoutui::Base::QBrowser.getObject(@drv, _locator, Scoutui::Commands::Utils.instance.getTimeout)
 
         if !obj.nil?
@@ -92,8 +92,6 @@ module Scoutui::Commands
 
           end
 
-
-
         end
 
       rescue => ex

data/lib/scoutui/commands/select_object.rb

@@ -19,8 +19,8 @@ module Scoutui::Commands
 
         if !@cmd.match(/select\(/).nil?
 
-          _xpath = @cmd.match(/select\((.*),\s*/)[1].to_s
-          _val   = @cmd.match(/select\(.*,\s*(.*)\)/)[1].to_s
+          _xpath = @cmd.match(/^\s*select\((.*),\s*/)[1].to_s
+          _val   = @cmd.match(/^\s*select\(.*,\s*(.*)\)/)[1].to_s
 
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "Process SELECT #{_val} into  #{_xpath}"  if Scoutui::Utils::TestUtils.instance.isDebug?
@@ -28,47 +28,6 @@ module Scoutui::Commands
 
           if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('frames')
             puts __FILE__ + (__LINE__).to_s + " frames => #{e['page']['frames']}";
-
-
-            if false
-
-              frames=e['page']['frames']
-              frame_list=frames.split(/(frame\(.*\))\.(?=[\w])/)
-              frame_list.each do |_f|
-
-
-                if !_f.empty?
-                  _id = _f.match(/frame\((.*)\)/)[1]
-
-                  puts __FILE__ + (__LINE__).to_s + " switch_to.frame #{_id}"
-
-                  @drv.switch_to.frame(_id.to_s.strip)
-                end
-
-              end
-
-
-            end
-
-          end
-
-
-          #  obj = Scoutui::Base::QBrowser.getObject(@drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
-
-          if false
-            if Scoutui::Commands::Utils.instance.isFrameSearch?
-              hits = Scoutui::Base::QBrowser.frame_getObject(@drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
-
-              puts __FILE__ + (__LINE__).to_s + " hits => #{hits.class} : #{hits}"
-              if hits.is_a?(Array) && !hits.empty?
-                obj=hits[0]
-              elsif hits.is_a?(Selenium::WebDriver::Element)
-                obj=hits
-              end
-
-            else
-              obj = Scoutui::Base::QBrowser.getObject(@drv, _xpath, Scoutui::Commands::Utils.instance.getTimeout)
-            end
           end
 
           obj = Scoutui::Base::QBrowser.findElement(@drv, _xpath, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
@@ -89,7 +48,7 @@ module Scoutui::Commands
 
       #      obj.send_keys(Scoutui::Base::UserVars.instance.get(_val))
           else
-            Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " Unable to process command SELECT => #{obj.to_s}"
+            Scoutui::Logger::LogMgr.instance.warn  __FILE__ + (__LINE__).to_s + " Unable to process command SELECT => #{obj.to_s}"
           end
         end
 

data/lib/scoutui/commands/type.rb

@@ -77,7 +77,7 @@ module Scoutui::Commands
           obj = Scoutui::Base::QBrowser.findElement(@drv, _xpath, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " type(#{_val})"
-          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " tag : #{obj.tag_name}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " tag : #{obj.tag_name}" if obj.is_a?(Selenium::WebDriver::Element)
 
           if !obj.nil? &&
                 (obj.tag_name.downcase=='body' ||
@@ -155,7 +155,7 @@ module Scoutui::Commands
             end
 
           else
-            Scoutui::Logger::LogMgr.instance.commands.debug  __FILE__ + (__LINE__).to_s + " Unable to process command TYPE => #{obj.to_s}"
+            Scoutui::Logger::LogMgr.instance.commands.warn  __FILE__ + (__LINE__).to_s + " Unable to process command TYPE => #{obj.to_s}"
           end
         end
 

data/lib/scoutui/eyes/eye_scout.rb

@@ -52,39 +52,7 @@ module Scoutui::Eyes
       accountid.is_a?(Array) ? accountid[0] : accountid
     end
 
-    def Legacyget_diff_urls(session_id, view_key)
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "=== get_diffs_url(#{session_id} ==="
-
-      info = "https://eyes.applitools.com/api/sessions/#{session_id}/?ApiKey=#{view_key}&format=json"
-      diff_template = "https://eyes.applitools.com/api/sessions/#{session_id}/steps/%s/diff?ApiKey=#{view_key}"
-      diff_urls = Hash.new
-
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " info => #{info}"
-      response = HTTParty.get(info)
-
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " RESP => #{response.to_s}"
-
-      begin
-        data = JSON.parse(response.body)
-        index = 1
-        data['actualOutput'].each do |elem|
-          if !elem.nil? && (elem['isMatching'] == false)
-            #diff_urls[index] = diff_template % [index]
-            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " #{index.to_s} :#{elem['tag'].to_s}"
-            #diff_urls[index] = diff_template % [index]
-            diff_urls[index] = { :tag => elem['tag'].to_s, :url => diff_template % [index] }
-            index+=1
-          end
-        end
-
-        diff_urls
-
-      rescue JSON::ParserError
-        ;
-      end
-
-    end
 
 
     def get_diff_urls(session_id, account_id, view_key)
@@ -154,26 +122,7 @@ module Scoutui::Eyes
       end
     end
 
-    def Legacy_saveDiffs(_eyes, results, outdir, view_key)
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s +  "  saveDiffs(#{outdir.to_s})"
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | eyesResults => #{results.to_s}"
-
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " | steps : #{results.steps.to_s}"
-      session_id = get_session_id(results.url)
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " session => #{session_id}"
-
-      diffs = Legacyget_diff_urls(session_id, view_key)
-
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " diffs => #{diffs}"
-      if diffs.is_a?(Array)
-        diffs.each do |d|
-          Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " #{d.to_s}"
-        end
 
-        download_images(diffs, outdir)
-      end
-
-    end
 
     def saveDiffs(_eyes, results, outdir, view_key)
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s +  "  saveDiffs(#{outdir.to_s})"
@@ -215,6 +164,7 @@ module Scoutui::Eyes
         Scoutui::Logger::LogMgr.instance.debug  "  o " + k.to_s + " : " + v.to_s
       end
 
+
       Testmgr::TestReport.instance.getReq("EYES").testcase('Images').add(@testResults.steps.to_i > 0, "Verify at least 1 shot taken (#{@testResults.steps.to_s} shots)")
       Testmgr::TestReport.instance.getReq("EYES").testcase('Images').add(@testResults.missing.to_i==0, "Verify Eyes did not miss any screens (#{@testResults.missing.to_s} screens)")
 
@@ -233,7 +183,6 @@ module Scoutui::Eyes
         Scoutui::Logger::LogMgr.instance.info " Unable to download diff images - APPLITOOLS_VIEW_KEY not defined"
       end
 
-
       eyes().abort_if_not_closed if !eyes().nil?
     end
 
@@ -276,6 +225,8 @@ module Scoutui::Eyes
         Scoutui::Logger::LogMgr.instance.info " Eyes.TestResults.Steps      : #{@testResults.steps.to_s}"
       end
 
+      Testmgr::TestReport.instance.getReq("Execution").testcase('Status').add(!Scoutui::Utils::TestUtils.instance.abort?, "Verify execution did not abort.")
+
       Scoutui::Logger::LogMgr.instance.info " TestReport.Tap => #{@testResults.to_json}"
 
       Testmgr::TestReport.instance.report()
@@ -313,6 +264,9 @@ module Scoutui::Eyes
       Testmgr::TestReport.instance.addRequirement('Command')
       Testmgr::TestReport.instance.getReq('Command').add(Testmgr::TestCase.new('isValid', "isValid"))
 
+      Testmgr::TestReport.instance.addRequirement('Execution')
+      Testmgr::TestReport.instance.getReq('Execution').add(Testmgr::TestCase.new('Status', "Status"))
+
       Testmgr::TestReport.instance.getReq('UI').add(Testmgr::TestCase.new('expectJsAlert', 'expectJsAlert'))
 
       if Scoutui::Utils::TestUtils.instance.isDebug?

data/lib/scoutui/utils/utils.rb

@@ -18,6 +18,7 @@ module Scoutui::Utils
     attr_accessor :final_rc
 
     attr_accessor :coverage
+    attr_accessor :execution_status
 
     def initialize
 
@@ -25,6 +26,8 @@ module Scoutui::Utils
       @final_rc=false
       @metrics=nil
 
+      @execution_status = :ready
+
       @env_list={:accounts => 'SCOUTUI_ACCOUNTS', :browser => 'SCOUTUI_BROWSER', :applitools_api_key => 'APPLITOOLS_API_KEY'}
       @options={}
       @currentTest={:reqid => 'UI', :testcase => '00' }
@@ -44,6 +47,7 @@ module Scoutui::Utils
       @options[:match_level]='layout'
       @options[:default_wait]=30     # seconds
       @options[:debug]=false
+      @options[:fail_fast]=false
 
       @app_model=nil
 
@@ -52,6 +56,18 @@ module Scoutui::Utils
 
     end
 
+    def setState(s)
+      @execution_status=s
+    end
+
+    def abort?
+      @execution_status==:abort
+    end
+
+    def getState()
+      @execution_status
+    end
+
     def getPageCoverage()
       @coverage[:pages]
     end
@@ -60,6 +76,10 @@ module Scoutui::Utils
       @coverage[:pages] << p
     end
 
+    def isFailFast?
+      @options[:fail_fast]
+    end
+
     def getFinalRc()
       @final_rc
     end
@@ -190,6 +210,8 @@ module Scoutui::Utils
         opt.on('--match [LEVEL]', [:layout2, :layout, :strict, :exact, :content], "Select match level (layout, strict, exact, content)") { |o| @options[:match_level] = o }
         opt.on('--eyes:match [LEVEL]', [:layout2, :layout, :strict, :exact, :content], "Select match level (layout, strict, exact, content)") { |o| @options[:match_level] = o }
 
+        opt.on('--failfast Bool', [:true, :false]) { |o| @options[:fail_fast]  = !o.match(/true/i).nil? }
+
         opt.on("--pages a,b,c", Array, "List of page models") do |list|
           Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " list => #{list}"
           @options[:pages]=list
@@ -265,6 +287,7 @@ module Scoutui::Utils
         Scoutui::Logger::LogMgr.instance.info "PageModel file => #{@options[:page_model].to_s}"
         Scoutui::Logger::LogMgr.instance.info "Sauce.Run       => #{@options[:sauce_run].to_s}"
         Scoutui::Logger::LogMgr.instance.info "Sauce.Platform  => #{@options[:sauce_platform].to_s}"
+        Scoutui::Logger::LogMgr.instance.info "Failfast        => #{@options[:fail_fast]}"
       end
 
       @options

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.24.pre"
+  VERSION = "2.0.3.25.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.24.pre
+  version: 2.0.3.25.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler