scoutui 2.0.3.43.pre → 2.0.3.44.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf3942661d1fe07e101908d524e05f1c388897b
-  data.tar.gz: d774623387644c2afdced96ed5d0ebaa920f1d6d
+  metadata.gz: 91a8993f5c845bd67a31b1781ffe9c9d8638974a
+  data.tar.gz: 7d40b45a17bf991aa6732305534356ebe944ef03
 SHA512:
-  metadata.gz: 7f39521a4b9e5ea566ada4a894a4258ed0fc762e77f090f69afe1fca3d350e1d6f8c284720f2cfe8fc0562133df844e2075109e0ac1476d71cbe1e88160fd758
-  data.tar.gz: 026c38f168d7826c1afd94f2f6d239b1daeff6d989e75a9cf73e81615d5c78c5acaf4d176f122a20f2d61a42b8967d88423319f45fb896c4f7778d506ef1fae9
+  metadata.gz: 3fb9559720831f36e8b8d583e6c98c2d80ce8670a7c2c32612802ef78a4ef1e0327c1670d7bcd42e270a3cf68d25a6810773f7f0ce417ace73a3978d47e7b862
+  data.tar.gz: 1f332172c1af3ce2f00d046b01f655619a0832b447323bd0761f8f27c2ed8112c385a69497bf8dc5a8d1a8d3408308caf9978ac2391d2d48c3b1a549adc92ec8

data/lib/scoutui/base/assertions.rb

@@ -343,14 +343,6 @@ module Scoutui::Base
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " check if Enabled"
         end
 
-#        puts __FILE__ + (__LINE__).to_s + " disabled: #{_obj.attribute("disabled")}"
-#        puts __FILE__ + (__LINE__).to_s + " readonly: #{_obj.attribute("readonly")}"
-#        puts __FILE__ + (__LINE__).to_s + " foo: #{_obj.attribute("foo")} isNil?: #{_obj.attribute("foo").nil?}"
-#        puts __FILE__ + (__LINE__).to_s + " enabled:  #{_obj.enabled?}"
-
-#        _enabled = _obj.enabled? && !(_obj.attribute("disabled") || _obj.attribute("readonly") )
-#        _enabled=false if _enabled.nil?
-
         _enabled = Scoutui::Base::QBrowser.isEnabled?(_obj, my_driver, _locator)
 
         puts __FILE__ + (__LINE__).to_s + " _obj.enabled? => #{_enabled}"
@@ -477,12 +469,7 @@ module Scoutui::Base
 
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " obj => #{_obj}"
 
-        _state = false
-        if !_obj.nil? && _obj.is_a?(Selenium::WebDriver::Element)
-          wait = Selenium::WebDriver::Wait.new(:timeout =>  Scoutui::Commands::Utils.instance.getTimeout)
-          _state = wait.until { _obj.displayed? }
-        end
-
+        _state = Scoutui::Base::QBrowser.isDisplayed?(_obj)
 
         if !_enableAsserts
           _rc=false
@@ -742,13 +729,6 @@ module Scoutui::Base
       puts __FILE__ + (__LINE__).to_s + " Pause debug"; gets
     end
 
-
- #   def isEnabled(my_driver, page_elt, _req=nil, _immediate=false)
- #     Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEanbled(#{page_elt}"
- #   end
-
-
-
     #
     # { reqid : <pageElt> }
     def isVisible(my_driver, page_elt, _req=nil, _immediate=false)

data/lib/scoutui/base/q_browser.rb

@@ -31,16 +31,33 @@ module Scoutui::Base
     end
 
     def self.wait_for_displayed(drv, locator, _timeout=30)
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " wait_for_displayed(#{xpath}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " wait_for_displayed(#{locator}"
       rc=nil
       begin
-        Selenium::WebDriver::Wait.new(timeout: _timeout).until { rc=drv.find_element(:xpath => xpath).displayed? }
+        Selenium::WebDriver::Wait.new(timeout: _timeout).until { rc=drv.find_element(:xpath => locator).displayed? }
       rescue => ex
         ;
       end
       rc
     end
 
+    # Check if the object (not a String) is an Element that is displayed.
+    def self.isDisplayed?(_obj, _timeout=Scoutui::Commands::Utils.instance.getTimeout)
+      rc=false
+
+      if !_obj.nil? && _obj.is_a?(Selenium::WebDriver::Element)
+        begin
+          wait = Selenium::WebDriver::Wait.new(:timeout =>  _timeout)
+          rc = wait.until { _obj.displayed? }
+        rescue Selenium::WebDriver::Error::TimeOutError
+          ;
+        end
+
+      end
+
+      rc
+    end
+
     def self.wait_for_exist(drv, xpath, _timeout=30)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " wait_for_exist(#{xpath}"
       rc=nil

data/lib/scoutui/base/visual_test_framework.rb

@@ -581,7 +581,7 @@ module Scoutui::Base
             if !xpath.match(/^\s*!visible\(.*\)$/).nil?
               _rc = false
               _e=nil
-              _timeout=10
+              _timeout=12
 
               if xpath.match(/^\s*!visible\((.*,\s*\d+\s*)\)$/)
                 _e = xpath.match(/^\s*!visible\((.*),\s*\d+\s*\)$/)[1].to_s.strip
@@ -1110,19 +1110,26 @@ module Scoutui::Base
 
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == Process SaveAs #{_saveAs}=="
 
-              _f=File.open(_saveAs, 'w')
+              begin
+                _f=File.open(_saveAs, 'w')
 
-              if _saveAs.match(/.*\.json\s*$/)
-                _f.puts Scoutui::Utils::TestUtils.instance.expandVars(e[STEP_KEY]['saveas']['data']).to_json
+                if _saveAs.match(/.*\.json\s*$/)
+                  _f.puts Scoutui::Utils::TestUtils.instance.expandVars(e[STEP_KEY]['saveas']['data']).to_json
 
-              elsif _saveAs.match(/.*\.(yml|yaml)\s*$/i)
-                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Generate a YAML file"
-                _f.write(Scoutui::Utils::TestUtils.instance.expandVars(e[STEP_KEY]['saveas']['data'].to_yaml))
-              else
-                Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Unknown file extension."
+                elsif _saveAs.match(/.*\.(yml|yaml)\s*$/i)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Generate a YAML file"
+                  _f.write(Scoutui::Utils::TestUtils.instance.expandVars(e[STEP_KEY]['saveas']['data'].to_yaml))
+                else
+                  Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Unknown file extension."
+                end
+
+              rescue => ex
+                puts __FILE__ + (__LINE__).to_s + " #{ex}"
+                puts  ex.backtrace
+              ensure
+                _f.close
               end
 
-              _f.close
             end
 
 

data/lib/scoutui/commands/click_object.rb

@@ -151,15 +151,14 @@ module Scoutui::Commands
                 _clicked=true
 
               rescue Selenium::WebDriver::Error::UnknownError
-                puts __FILE__ + (__LINE__).to_s + " Selenium::WebDriver::Error::UnknownError"
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Retry #{_i} - Selenium::WebDriver::Error::UnknownError"
                 _retry=true
               end
 
               break if !_retry
             end
 
-
-
+            Scoutui::Logger::LogMgr.instance.debug + " clicked(#{_locator}): #{_clicked}"
 
             page_elt = Scoutui::Utils::TestUtils.instance.getPageElement(_locator)
 

data/lib/scoutui/commands/highlight.rb

@@ -27,7 +27,7 @@ module Scoutui::Commands
       rc=true
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Highlight.execute(#{@cmd})"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Highlight.execute(#{@cmd}), req:#{_req}"
 
       @drv=drv if !drv.nil?
 
@@ -66,12 +66,16 @@ module Scoutui::Commands
 
           _rc = _highlight(obj, e)
 
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight(#{e}) : #{_rc}"
+
           if q.has_key?('frame')
             @drv.switch_to.default_content
             Scoutui::Commands::Utils.instance.resetFrameSearch
           end
 
-          rc &&= _rc
+          rc = rc && _rc
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ||| assert?  => #{assert?.to_s} : _rc:#{_rc}    rc:#{rc}"
 
           if assert?
             Testmgr::TestReport.instance.getReq(_req).testcase('highlight').add(!obj.nil?, "Verify object #{elt} to highlight exists : #{obj.class.to_s}")
@@ -80,6 +84,9 @@ module Scoutui::Commands
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight(#{elt} : #{obj.class.to_s}"
           end
 
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight(#{elt.to_s} : #{_rc}"
+
         end
 
       rescue => ex
@@ -87,6 +94,7 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " highlight.rc ==> #{rc}"
       setResult(rc)
     end
 

data/lib/scoutui/commands/utils.rb

@@ -127,6 +127,9 @@ module Scoutui::Commands
 
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " expandMacro(#{_text_to_type})"
 
+      if _text_to_type.nil? || _text_to_type.empty?
+        return ""
+      end
 
       @transList.each_pair do |_k, _v|
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.43.pre"
+  VERSION = "2.0.3.44.pre"
 end

metadata

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