scoutui 2.0.3.39.pre → 2.0.3.40.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70659ad4a781a8562a58c296d27846c8de09f62f
-  data.tar.gz: c868a849e7d2051695c51995bd3e7039db7a897c
+  metadata.gz: cde554dc3abdd091326a306b8081d0238f7600d1
+  data.tar.gz: 79992a934285ab8ff26402cfb38aeeaa73ceaede
 SHA512:
-  metadata.gz: acaf7c63f6c423d3425f014c31190ceedc60f0238a3733c1f7c45bb8f2f9d3a856b3ca3e818333d68167c9958685037aacef15f15c04ce5e0559d6c51ecad1e7
-  data.tar.gz: 68e3b810a1249bdaccc62c3f87232a9949db9b35076db61cc92640400454ded772f5fe447ccd57d71086359409806558cdcbe4a8172fb6c5aa75317e8f3f031f
+  metadata.gz: 05b7fef396b7022b454558852f425bb0d5cef219c51682bbd9ba2cf5bc8d1f23e1bce30d762e179d3c8f6e09227cb99c9bf6929857c4003b0b2290fb509d6571
+  data.tar.gz: 1be89b9263aa403af4febb2e91a99b292ffa892dfd95e0f69a71e761d1db6878f6c93f075880809be2c8631a9786bfd3deb4e092edc2d6d620ac56fcbc6de147

data/examples/enums/my_enum.rb

@@ -0,0 +1,30 @@
+require_relative '../../lib/scoutui'
+
+COLORS = [ RED = 0, YELLOW = 1, GREEN = 3]
+
+
+COLORS.each do |x|
+    puts x
+end
+
+
+
+puts "RED : #{COLORS[RED]}"
+
+Scoutui::Logger::LogMgr.instance.setLevel('debug')
+Scoutui::Logger::LogMgr.instance.debug "DEBUG - Hello"
+
+Scoutui::Logger::LogMgr.instance.setLevel('info')
+Scoutui::Logger::LogMgr.instance.info "INFO - Hello"
+
+Scoutui::Logger::LogMgr.instance.setLevel('warn')
+Scoutui::Logger::LogMgr.instance.warn "WARN - Hello"
+
+Scoutui::Logger::LogMgr.instance.setLevel('error')
+Scoutui::Logger::LogMgr.instance.error "ERROR - Hello"
+Scoutui::Logger::LogMgr.instance.fatal "FATAL - SHOULD SEE THIS"
+
+
+Scoutui::Logger::LogMgr.instance.setLevel('fatal')
+Scoutui::Logger::LogMgr.instance.fatal "FATAL - Hello"
+Scoutui::Logger::LogMgr.instance.error "ERROR - SHOULD NOT SEE THIS"

data/examples/ex6/tests/test.sh

@@ -67,7 +67,7 @@ ruby $SCOUTUI_BIN  \
             --sauce:resolution "1280x1024" \
        --host ${HOST} \
        --failfast true \
-       --debug \
+       --loglevel warn \
        --dut "${CMD}"
 
 }

data/lib/scoutui/appmodel/q_model.rb

@@ -181,7 +181,146 @@ module Scoutui::ApplicationModel
       result
     end
 
+    def flattenPageObject(h, path="")
+      rc=iterate(h, path)
+      if rc.is_a?(Array)
+        return rc[0]
+      end
+
+      nil
+    end
+
+    def iterate(h, path="")
+      rc=true
+      assertions=[]
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ===== iterate(#{h}, #{path}) ====="
+
+      if h.is_a?(String)
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => process #{h}"
+        if h.match(/^\s*(page)\s*\(.*\)\s*$/i)
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => process Page #{h}"
+          page_elt = getPageElement(h)
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{page_elt}"
+          assertions << iterate(page_elt, path)
+        else
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " UNKNOWN: #{h}"
+          assertions << "#{h} : unknown"
+        end
+
+      elsif h.is_a?(Hash) && h.has_key?('locator')
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == add #{h} =="
+        assertions << { :path => path, :data => h }
+
+      elsif h.is_a?(Hash)
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "Keys.size: #{h.keys[0]}"
+
+        if h.keys.size==1 && h[h.keys[0]].is_a?(Hash) && h[h.keys[0]].has_key?('locator')
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add assertion #{h}"
+          assertions << { :path => path, :data => h }
 
+        elsif h.keys.size==1 && h[h.keys[0]].is_a?(Hash)
+
+          # "id": {
+          # }
+
+          _id = h.keys[0]
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " LocatorID : #{_id}"
+
+          if true
+          h[_id].each_pair { |_k, _h|
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | id(#{_id}) => #{_k}, #{_h}"
+
+            if _h.keys.size==1 && _h[_h.keys[0]].is_a?(Hash) && !_h[_h.keys[0]].has_key?('locator')
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " id(#{_id}) => #{_h}"
+              _a = iterate(_h, "#{path}.#{_id}")
+              _a.each do |_e|
+                assertions << _e
+              end
+            elsif _h.keys.size==1 && _h[_h.keys[0]].is_a?(Hash) && _h[_h.keys[0]].has_key?('locator')
+              assertions << { :path => "#{path}.#{_id}", :data => h[_h.keys[0]] }
+            elsif _h.is_a?(Hash) && _h.has_key?('locator')
+              assertions << { :path => "#{path}.#{_id}.#{_k}", :data => _h }
+            else
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | id(#{path}.#{_id}.#{_k}) - #{_h}"
+
+              _h.each do |k, v|
+#                puts __FILE__ + (__LINE__).to_s + " processing #{_id}.#{k}, #{v}"
+                if v.is_a?(Hash) && v.has_key?('locator')
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " processing #{_id}.#{_k}.#{k}"
+                elsif v.is_a?(Hash) || v.is_a?(Array)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " processing #{_id}.#{k} - #{v}"
+                  _a = iterate(v, "#{path}.#{_id}.#{k}")
+                  _a.each do |_e|
+                    assertions << _e
+                  end
+                else
+                  Scoutui::Logger::LogMgr.instance.debug("Assert => k is #{k}, value is #{v}")
+             #     assertions << "#{k} #{v}"
+                  rc=rc && true
+                end
+              end
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " adding assertions id(#{_id}.#{_k}) - #{_h}"
+              assertions << "id(#{_id}.#{_k}) - #{_h}"
+            end
+
+          }
+          end
+
+
+
+        else
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ** process #{h} **"
+          _list=Array.new
+          h.each do |k, v|
+            if v.is_a?(Hash) && v.has_key?('locator')
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add to assertion #{k} => #{v}"
+              _list.push({ :path => "#{path}.get(#{k})", :dat => v })
+
+              Scoutui::Logger::LogMgr.instance.debug " _list ==> #{_list}"
+            elsif v.is_a?(Hash) || v.is_a?(Array)
+
+              # login_form => {"userid"=>{"locator"=>"#userid"}, "password"=>{"locator"=>"#pass"}}
+
+
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " >>>>  #{k} => #{v} <<<<<"
+
+
+              _a = iterate(v, "#{path}.get(#{k})")
+              _a.each do |_e|
+                assertions << _e
+              end
+            else
+              Scoutui::Logger::LogMgr.instance.debug(__FILE__ + (__LINE__).to_s + " k is #{k}, value is #{v}")
+              assertions << "#{k} #{v}"
+            end
+          end
+
+         # assertions << _list.flatten
+          if !_list.empty?
+            _list.each do |_e|
+              assertions << _e
+            end
+          end
+
+        end
+
+      else
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Huh?"
+        assertions << nil
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " assertions => #{assertions}"
+      assertions
+
+    end
 
   end
 

data/lib/scoutui/base/assertions.rb

@@ -331,9 +331,14 @@ module Scoutui::Base
 
       ##
       # Object must exist and be enabled to 'pass' assertion.
-      elsif _obj.is_a?(Selenium::WebDriver::Element) && _t.has_key?('cmd') && !_t['cmd'].empty? && _t['cmd'].match(/[!]*isEnabled/i)
+      elsif _t.has_key?('cmd') && !_t['cmd'].empty? && _t['cmd'].match(/[!]*isEnabled/i)
 
-        _enabled = _obj.enabled?
+        if !_obj.is_a?(Selenium::WebDriver::Element)
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " #{_execute_when} => element not found"
+          return false
+        end
+
+        _enabled = _obj.enabled? && (_obj.attribute("disabled").nil? && _obj.attribute("readonly").nil? )
 
         puts __FILE__ + (__LINE__).to_s + " _obj.enabled? => #{_enabled}"
 
@@ -436,12 +441,19 @@ module Scoutui::Base
           _locator = _t['locator']
           _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
 
+
+          _locator = Scoutui::Base::UserVars.instance.get(_locator)
+
           if _t.has_key?('frame') && !_t['frame'].nil?
             Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
           end
 
         elsif isVisibleCmd?(_execute_when)
            _locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
+
+
+           _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
+           _locator = Scoutui::Base::UserVars.instance.get(_locator)
         else
           Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " invalid visible cmd: #{_execute_when}"
         end
@@ -718,9 +730,9 @@ module Scoutui::Base
     end
 
 
-    def isEnabled(my_driver, page_elt, _req=nil, _immediate=false)
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEanbled(#{page_elt}"
-    end
+ #   def isEnabled(my_driver, page_elt, _req=nil, _immediate=false)
+ #     Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEanbled(#{page_elt}"
+ #   end
 
 
 

data/lib/scoutui/base/visual_test_framework.rb

@@ -948,8 +948,10 @@ module Scoutui::Base
 
               elsif Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
                 if !Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
-                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled #{_e} : failed"
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled #{_a} : failed"
                   _executeIt=false
+                else
+                  puts __FILE__ + (__LINE__).to_s + " IS_ENABLED : #{_a}"; STDIN.gets()
                 end
 
 

data/lib/scoutui/commands/commands.rb

@@ -197,7 +197,7 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isType?(_action)
         _cmd='Type'
         _c = Scoutui::Commands::Type.new(_action)
-        _c.run(driver: my_driver)
+        _c.run(driver: my_driver, dut: e)
       else
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Unknown command : #{_action}"
         rc=false

data/lib/scoutui/commands/type.rb

@@ -49,7 +49,7 @@ module Scoutui::Commands
     end
 
 
-    def execute(drv=nil, _notUsed=nil)
+    def execute(drv=nil, pageElt=nil)
       @drv=drv if !drv.nil?
 
       _isKb=false
@@ -69,8 +69,16 @@ module Scoutui::Commands
           _rc=true
           _isKb=true
         else
-          _xpath = @cmd.match(/^\s*type[\!]*\(([^,]*),\s*/)[1].to_s
-          _val   = @cmd.match(/^\s*type[\!]*\([^,]*,\s*(.*)\)/)[1].to_s
+         # _xpath = @cmd.match(/^\s*type[\!]*\(([^,]*),\s*/)[1].to_s
+         # _val   = @cmd.match(/^\s*type[\!]*\([^,]*,\s*(.*)\)/)[1].to_s
+
+          if @cmd.match(/^\s*type[\!]*\((.*),\s*'(.*)\s*'\)\s*$/)
+            _xpath = @cmd.match(/^\s*type[\!]*\((.*),\s*'(.*)\s*'\)\s*$/)[1]
+            _val   = @cmd.match(/^\s*type[\!]*\((.*),\s*'(.*)\s*'\)\s*$/)[2]
+          else
+            _xpath = @cmd.match(/^\s*type[\!]*\((.*),\s*(.*)\s*\)\s*$/)[1]
+            _val   = @cmd.match(/^\s*type[\!]*\((.*),\s*(.*)\s*\)\s*$/)[2]
+          end
 
           Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"
 
@@ -147,6 +155,27 @@ module Scoutui::Commands
                 Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
                 obj.send_keys(_text_to_type)
 
+                if !pageElt.nil? && pageElt['page'].has_key?('then')
+                  pageElt['page']['then'].each do |_subcmd|
+                    if _subcmd.is_a?(String)
+
+
+                      puts __FILE__ + (__LINE__).to_s + " | then => #{_subcmd}"
+
+                      if _subcmd.match(/^\s*press\(__TAB__\)$/)
+                        @drv.action.send_keys(:tab).perform
+                      elsif _subcmd.match(/^\s*press\(__DOWN__\)$/)
+                        @drv.action.send_keys(:arrow_down).perform
+                      elsif _subcmd.match(/^\s*press\(__UP__\)$/)
+                        @drv.action.send_keys(:arrow_up).perform
+                      elsif _subcmd.match(/^\s*press\(__ENTER__\)\s*$/)
+                        @drv.action.send_keys(:enter).perform
+                      end
+
+                    end
+                  end
+                end
+
                 if !obj.nil? && false
                   arr=_text_to_type.split(/__ENTER__/)
 

data/lib/scoutui/eyes/utils.rb

@@ -55,7 +55,7 @@ module Scoutui::Eyes
     end
 
     def download_diffs(results, view_key, destination)
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " download_diffs(#{destination}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " download_diffs(#{results}, #{destination})"
       session_id = get_session_id(results.url)
       batch_id = get_batch_id(results.url)
       diff_urls = get_diff_urls(batch_id, session_id, view_key)

data/lib/scoutui/logger/log_mgr.rb

@@ -1,23 +1,23 @@
-
-
 require 'singleton'
 require 'logging'
 
 module Scoutui::Logger
 
-
-
   class LogMgr
     include Singleton
 
+    LOGLEVELS = [ DEBUG = 0,  INFO = 1, WARN = 2, ERROR = 3, FATAL = 4]
+
     attr_accessor :root
     attr_accessor :commands
     attr_accessor :benchmarks
+    attr_accessor :level
 
     def initialize
 
       @root = Logging.logger(STDOUT)
       @root.level = :debug
+      @level = LOGLEVELS[DEBUG]
 
       Logging.appenders.stderr('Standard Error', :level => :error)
 
@@ -65,6 +65,20 @@ module Scoutui::Logger
 
     def setLevel(_level)
       @root.level = _level.to_sym
+
+      _l = _level.to_s
+      if _l.match(/debug/i)
+        @level = LOGLEVELS[DEBUG]
+      elsif _l.match(/info/i)
+        @level = LOGLEVELS[INFO]
+      elsif _l.match(/warn/i)
+        @level = LOGLEVELS[WARN]
+      elsif _l.match(/error/i)
+        @level = LOGLEVELS[ERROR]
+      elsif _l.match(/fatal/i)
+        @level = LOGLEVELS[FATAL]
+      end
+
     end
 
     def warn(txt)
@@ -102,16 +116,16 @@ module Scoutui::Logger
 
     def log(level, txt)
 
-      if level.match(/info/i)
-        @root.info txt
+      if level.match(/debug/i)
+        @root.debug txt if DEBUG >= @level
+      elsif level.match(/info/i)
+        @root.info txt  if INFO >= @level
       elsif level.match(/warn/i)
-        @root.warn txt
-      elsif level.match(/debug/i)
-        @root.debug txt
+        @root.warn txt  if WARN >= @level
       elsif level.match(/error/i)
-        @root.error txt
+        @root.error txt if ERROR >= @level
       elsif level.match(/fatal/i)
-        @root.fatal txt
+        @root.fatal txt  if FATAL >= @level
       end
 
     end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.39.pre"
+  VERSION = "2.0.3.40.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.39.pre
+  version: 2.0.3.40.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -224,6 +224,7 @@ files:
 - examples/data_driven/data/queries.yml
 - examples/data_driven/data/requirements.yml
 - examples/db/sqlclient.rb
+- examples/enums/my_enum.rb
 - examples/ex1/commands.holidays.yml
 - examples/ex1/commands.yml
 - examples/ex1/test-example.sh