scoutui 2.0.3.29.pre → 2.0.3.30.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d84c794cae92dd79cce22350ab9384e82ec4569
-  data.tar.gz: bffc895c5992b8bcbbbdfe63d2977fc2d3ac36c7
+  metadata.gz: bec2331d9973d87b6ebde0aa7d385835cd64d28e
+  data.tar.gz: 1773cec8ac473fac69be4a81cd86ee4b3a05823c
 SHA512:
-  metadata.gz: d4f33996046dd9dda7e351056b926995877969033b674ad9ba41828cef58de0b11293151fa00448049a4dc0c2a74f8b42bb3c4f543e9b7ab4cb060c4ffc80308
-  data.tar.gz: 1308726062f9fff6cfae328a657bb72571a3a878eb081a703942f21fd42c7b003a1881be52a2c1c825701c2145d597dc65262e10cb6a3a5924faf79c03eafc85
+  metadata.gz: f0bb080dd63f6f999f572991459bc34dafa68b5f471b5b1e9e2192df7464a7657137388c4c424bd7461426bba572fd6d02b87566a5f2c2346bf5ac4e9aaa5ba2
+  data.tar.gz: c79d401e27bd6b1d506f3b74e4aac4786ed0328ecfbe03389baf126692dfc6c87a7014a00ff002752f94bc754729702645951816a1d172c73982790b095d34b3

data/examples/yaml/dut.yml

@@ -0,0 +1,5 @@
+page:
+  asserts:
+   - one
+   - two:
+       foo: bar

data/examples/yaml/ex_yaml.rb

@@ -0,0 +1,18 @@
+require 'yaml'
+
+
+
+y = YAML.load_stream File.read('./dut.yml')
+
+
+puts y
+
+i=0
+y.each do |e|
+  puts "#{i}. #{e}"
+
+  e['page']['asserts'].each do |a|
+    puts "=> #{a}"
+  end
+  i+=1
+end

data/lib/scoutui/base/assertions.rb

@@ -9,16 +9,86 @@ module Scoutui::Base
     include Singleton
 
     attr_accessor :drv
+    attr_accessor :assertionTypes
 
+    def initialize
+      @assertionTypes=[
+          { :cmd => 'isEnabled',   :pattern => '^\s*[!]*isEnabled\((.*)\)\s*$'},
+          { :cmd => 'visible',     :pattern => '^\s*[!]*visible\((.*)\)\s*$'}
+      ]
+
+    end
+
+
+    def isValidAssertType(_a)
+
+      puts __FILE__ + (__LINE__).to_s + " isValidAssertionType(#{_a})"
+      @assertionTypes.each do |e|
+        _p=e[:pattern]
+
+        puts __FILE__ + (__LINE__).to_s + " == verify #{_p} =="
+
+        if _a.match(/#{_p}/)
+          return e
+        end
+      end
+
+      puts _FILE__ + (__LINE__).to_s + " => unknown command : #{_a}"
+      return nil
+    end
 
     def setDriver(_drv)
       @drv=_drv
     end
 
+
+    # _a : frame(xyz).frame(123), <locator>
+    def _parseFrameLoc(_cmd, _a)
+      rc=nil
+
+      begin
+        _fMatch=nil
+
+        _pattern='(frame\(.*\)[\.frame\(.*\)]*)\s*,\s*(.*)\s*$'
+
+        c=_a.match(/^\s*([!]*#{_cmd})\((.*)\)\s*$/)
+
+        if c
+          cmd = c[1].strip
+          _fMatch = c[2].match(/#{_pattern}/)
+        end
+
+
+        if _fMatch
+          f=c[2].strip
+
+          puts __FILE__ + (__LINE__).to_s + " arg: #{f}"
+
+          rc = { 'cmd' => cmd,
+                 'frame'    =>  _fMatch[1].strip,
+                 'locator'  =>  _fMatch[2].strip }
+        elsif c
+          rc = {
+              'cmd' => cmd,
+              'locator' => c[2].strip
+          }
+        end
+
+      rescue => ex
+        ;
+      end
+
+      rc
+    end
+
     def isEnabledCmd?(_a)
       _a.is_a?(String) && _a.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)
     end
 
+    def isEnabledFrameCmd?(_a)
+      _parseFrameLoc('isEnabled', _a)
+    end
+
     def isRoleCmd?(_a)
       _a.is_a?(String) && _a.match(/^\s*(isrole|role)\(.*\)\s*/i)
     end
@@ -41,6 +111,35 @@ module Scoutui::Base
     end
 
 
+    def isVisibleFrameCmd?(_a)
+      rc=nil
+
+      puts __FILE__ + (__LINE__).to_s + " [isVisibleFrameCmd]: #{_a}"
+
+      begin
+        if isVisibleCmd?(_a)
+
+          _pattern='(frame\(.*\)[\.frame\(.*\)]*)\s*,\s*(.*)\s*$'
+
+          f=_a.match(/^\s*[!]*visible\((.*)\)\s*$/)[1].strip
+
+          puts __FILE__ + (__LINE__).to_s + " arg: #{f}"
+          rc = { 'frame'    =>  f.match(/#{_pattern}/)[1].strip,
+                 'locator'  =>  f.match(/#{_pattern}/)[2].strip }
+
+        else
+          puts "=> NOT vsibleCmd"
+        end
+
+      rescue => ex
+        ;
+      end
+
+      puts __FILE__ + (__LINE__).to_s + " isVisibleCmd?(#{_a}) : #{rc}"
+      rc
+    end
+
+
     def isTitle(my_driver, _execute_when)
 
       rc=nil
@@ -105,21 +204,42 @@ module Scoutui::Base
     def isEnabled?(my_driver, _execute_when)
       rc=true
 
-      _locator = _execute_when.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)[1].to_s
-      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isChecked => #{_locator}"
+     # _locator = _execute_when.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)[1].to_s
+      _locator=nil
+      _obj=nil
 
-      _obj = Scoutui::Base::QBrowser.findElement(my_driver, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
+      _t = isEnabledFrameCmd?(_execute_when)
 
-      _state = _obj.enabled?
+      if !_t.nil?
+        _locator = _t['locator']
 
-      puts __FILE__ + (__LINE__).to_s + " _obj.enabled? => #{_state}"
+        if _t.has_key?('frame')
+          Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
+        end
 
-      if _execute_when.match(/^\s*!isEnabled/i) && _state
-        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " !isEnabled(#{_locator}) : false"
-        rc=false
-      elsif _execute_when.match(/^\s*isEnabled/i) && !_state
-        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled(#{_locator}) : false"
-        rc=false
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isChecked => #{_locator}"
+        _obj = Scoutui::Base::QBrowser.findElement(my_driver, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
+      else
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " invalid visible cmd: #{_execute_when}"
+      end
+
+
+      if _obj.is_a?(Selenium::WebDriver::Element) && _t.has_key?('cmd') && !_t['cmd'].empty?
+
+        _enabled = _obj.enabled?
+
+        puts __FILE__ + (__LINE__).to_s + " _obj.enabled? => #{_enabled}"
+
+        if _execute_when.match(/^\s*!isEnabled/i) && _enabled
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " !isEnabled(#{_locator}) : false"
+          rc=false
+        elsif _execute_when.match(/^\s*isEnabled/i) && !_enabled
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled(#{_locator}) : false"
+          rc=false
+        end
+
+      else
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Element not found: #{_execute_when}"
       end
 
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled?(#{_execute_when}) => #{rc}"
@@ -154,7 +274,18 @@ module Scoutui::Base
       rc=true
 
       begin
-        _locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
+
+        _t = isVisibleFrameCmd?(_execute_when)
+
+        if !_t.nil?
+          _locator = _t['locator']
+          Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
+        elsif isVisibleCmd?(_execute_when)
+           _locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
+        else
+          Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " invalid visible cmd: #{_execute_when}"
+        end
+
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " visible => #{_locator}"
 
         _obj = Scoutui::Base::QBrowser.findElement(my_driver, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)

data/lib/scoutui/base/visual_test_framework.rb

@@ -333,12 +333,22 @@ module Scoutui::Base
 
           _rc=nil
 
-          if Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
-            _rc=Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
+
+          _assertType=Scoutui::Base::Assertions.instance.isValidAssertType(_a)
+
+          if !_assertType.nil?
+
+
+            if _assertType[:cmd]=='isEnabled'   # Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
+              _rc=Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
+            elsif _assertType[:cmd]=='visible'
+              _rc=Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a)
+            end
+
           elsif Scoutui::Base::Assertions.instance.isRoleCmd?(_a)
             _rc=Scoutui::Base::Assertions.instance.isRole?(_a)
-          elsif Scoutui::Base::Assertions.instance.isVisibleCmd?(_a)
-            _rc=Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a)
+#          elsif Scoutui::Base::Assertions.instance.isVisibleCmd?(_a)
+#            _rc=Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a)
           elsif Scoutui::Base::Assertions.instance.isSelectedCmd?(_a)
             _rc=Scoutui::Base::Assertions.instance.isSelected?(my_driver, _a)
           elsif Scoutui::Base::Assertions.instance.isValueCmd?(_a)
@@ -350,6 +360,8 @@ module Scoutui::Base
           if !_rc.nil?
             Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + "Verify #{_a} - #{_rc}"
             Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(_rc, "Verify #{_a}")
+
+            Scoutui::Commands::Utils.instance.resetFrameSearch()
           end
 
         end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.29.pre"
+  VERSION = "2.0.3.30.pre"
 end

data/scoutui.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "eyes_selenium", ">= 2.28"
+  spec.add_development_dependency "eyes_selenium", ">= 2.33"
   spec.add_development_dependency "selenium-webdriver", ">= 2.53.4"
   spec.add_development_dependency "httparty", ">=0.13.7"
   spec.add_development_dependency "json", ">= 1.8.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.29.pre
+  version: 2.0.3.30.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.28'
+        version: '2.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.28'
+        version: '2.33'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +228,8 @@ files:
 - examples/eyes/diff.rb
 - examples/eyes/ex2.rb
 - examples/eyes_results/response.json
+- examples/yaml/dut.yml
+- examples/yaml/ex_yaml.rb
 - lib/scoutui.rb
 - lib/scoutui/appmodel/q_model.rb
 - lib/scoutui/base/assertions.rb