scoutui 2.0.3.25.pre → 2.0.3.26.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc82c07173e93d9774896bf6ab4e621a00990174
-  data.tar.gz: 108d391194512236200a2abb6d7415643c83b0cd
+  metadata.gz: 7c6783826768bc5977a384aa09b0e27983ad1288
+  data.tar.gz: 42feaae713b7d18c646bb03ae2a69a2486426868
 SHA512:
-  metadata.gz: 0ac17a5606dcc0191b1c28aa6870392bd52571a24182625ad10516e0b385c6d8ed4d42bf1a5c2d101091e505dafc7f3cec1b5f795eeb9e1a795aabae5eb1b8b4
-  data.tar.gz: 33692c0644b4076b37a0ee7f3f38f89f8edbfa792e3263536f5a98e2c24b21db7d9945b62e6d9ac27efae36daca50ba296b0c35324a61464b76dc040ba545fcf
+  metadata.gz: 981d41edbbe8bc9d4b2139653eb30cdbb0b32adebe99962b41fff99cfaa99ba9a5149bd6ff8d12e68205f7c252dbde42cc33c925369cd6cf1ce32312f2f343f7
+  data.tar.gz: faeb7c953e1eb6cfd5b83d12f2bcc5e12a14cb7749f213e0e31bbb54ee562eaa65c01f5685471a334208b4ce1415124f3662a93ac8c1ce61d27cad66085466bb

data/examples/ex6/tests/test.sh

@@ -51,7 +51,7 @@ run1()
 
 ruby $SCOUTUI_BIN  \
        --config ${TESTCFG} \
-       --user "expense.admin@scoutui.com" --password password1 \
+       --user "expense.admin@scoutui.com" --password password1 --role qa \
        --diff /tmp/vt \
        --pages ../appmodel/model.json \
        --eyes:run false \

data/lib/scoutui/base/assertions.rb

@@ -15,6 +15,167 @@ module Scoutui::Base
       @drv=_drv
     end
 
+    def isValue?(my_driver, page_elt)
+
+      rc = false
+      _txt = nil
+
+      if page_elt.is_a?(String) && page_elt.match(/^\s*(text|value)\s*\(/)
+        #
+        # text(page(home).get(elt))
+        # value(page(home).get(elt))
+        #
+        _processed=true
+        condition = page_elt.match(/(value|text)\((.*)\)/)[1].to_s
+        tmpObj = page_elt.match(/(value|text)\((.*)\)/)[2].to_s
+        expectedVal = page_elt.match(/(value|text)\s*\(.*\)\s*\=\s*(.*)/)[2].to_s
+
+        xpath = Scoutui::Base::UserVars.instance.get(tmpObj)
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " locator : #{xpath}"; #gets
+
+        obj = Scoutui::Base::QBrowser.getObject(my_driver, xpath, Scoutui::Commands::Utils.instance.getTimeout)
+
+        puts __FILE__ + (__LINE__).to_s + " #{condition} : #{obj}"
+
+        if !obj.nil?
+          if condition.match(/^text/)
+            _txt = obj.text
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " text : #{_txt}"
+            expected_regex = Regexp.new(expectedVal)
+            rc =  !_txt.to_s.match(expected_regex).nil?
+          elsif condition.match(/^value/)
+            _txt = obj.attribute('value')
+            expected_regex = Regexp.new(expectedVal)
+            rc =  !_txt.to_s.match(expected_regex).nil?
+          end
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "txt/val: #{_txt}  rc => #{rc}"
+        end
+
+      end
+
+      rc
+    end
+
+
+    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}"
+
+      _obj = Scoutui::Base::QBrowser.findElement(my_driver, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
+
+      _state = _obj.enabled?
+
+      puts __FILE__ + (__LINE__).to_s + " _obj.enabled? => #{_state}"
+
+      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
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled?(#{_execute_when}) => #{rc}"
+      rc
+    end
+
+    def isSelected?(my_driver, _execute_when)
+      rc=true
+
+      _locator = _execute_when.match(/^\s*[!]*(isSelected|selected)\((.*)\)\s*$/i)[2].to_s
+      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)
+
+      _state = _obj.selected?
+      puts __FILE__ + (__LINE__).to_s + " _obj.selected? => #{_state}"
+
+      if _execute_when.match(/^\s*!(isSelected|selected)/i) && _state
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " !isSelected(#{_locator}) : false"
+        rc=false
+      elsif _execute_when.match(/^\s*(isSelected|selected)/i) && !_state
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isSelected(#{_locator}) : false"
+        rc=false
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isSelected?(#{_execute_when}) => #{rc}"
+      rc
+    end
+
+
+    def isVisible?(my_driver, _execute_when)
+      rc=true
+
+      begin
+        _locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
+        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)
+
+        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
+
+
+        puts __FILE__ + (__LINE__).to_s + " _obj.displayed? => #{_state}"
+
+        if _execute_when.match(/^\s*!visible/i) && _state
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " !visible(#{_locator}) : false"
+          rc=false
+        elsif _execute_when.match(/^\s*visible/i) && !_state
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " visible(#{_locator}) : false"
+          rc=false
+        end
+
+      rescue => ex
+        rc=false
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class.to_s}"
+        puts __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " visible?(#{_execute_when}) => #{rc}"
+      rc
+    end
+
+
+    def isRole?(_execute_when)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isRole?(#{_execute_when})"
+
+      rc=false
+
+      if _execute_when.match(/^\s*(isrole|role)\s*(.*)\s*$/i)
+        _role = _execute_when.match(/^\s*(isrole|role)\s*(.*)\s*$/i)[2].to_s
+        _expected_role = Scoutui::Utils::TestUtils.instance.getRole()
+
+        Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Trigger: expected : #{_expected_role.to_s}, actual: #{_role.to_s}"
+
+        if !_expected_role.nil?
+          if _role.match(/#{_expected_role}/i)
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " role matches"
+            rc=true
+          else
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " roles do not match"
+          end
+
+        elsif _expected_role.nil?
+          Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Skip role based assertion since role was not provided"
+        end
+
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isRole() => #{rc}"
+      rc
+    end
+
 
     def assertPage(my_driver, _pg, _req=nil)
       if _req.nil?
@@ -191,6 +352,8 @@ module Scoutui::Base
       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/visual_test_framework.rb

@@ -453,14 +453,19 @@ module Scoutui::Base
 
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
-      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + "\to Expected:  #{e[STEP_KEY]['expected'].class.to_s}"  if Scoutui::Utils::TestUtils.instance.isDebug?
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + "processExpected()"
 
       Scoutui::Base::Assertions.instance.setDriver(my_driver)
 
       if e[STEP_KEY].has_key?('expected')
+
         expected_list=e[STEP_KEY]['expected']
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{expected_list}"
+
 
         if expected_list.is_a?(Array)
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process Arr of Expected"
           expected_list.each do |_condition|
             verifyCondition(my_driver, _condition)
           end
@@ -819,6 +824,77 @@ module Scoutui::Base
                next
             end
 
+          elsif _execute_when.is_a?(String) && _execute_when.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)
+
+
+            if !Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _execute_when)
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled => false"
+              next
+            end
+
+          elsif _execute_when.is_a?(String) && _execute_when.match(/^\s*[!]*isSelected\((.*)\)\s*$/i)
+
+            if !Scoutui::Base::Assertions.instance.isSelected?(my_driver, _execute_when)
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isSelected => false"
+              next
+            end
+
+          elsif _execute_when.is_a?(Array)
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process series of execute_when : #{_execute_when}"
+
+            _executeIt=true
+
+            _execute_when.each do |_a|
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " exeucute_when => #{_a}"
+
+              if _a.is_a?(String) && _a.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)
+                if !Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled #{_e} : failed"
+                  _executeIt=false
+                end
+
+
+              elsif _a.is_a?(String) && _a.match(/^\s*(isrole|role)\(.*\)\s*/i)
+
+                if !Scoutui::Base::Assertions.instance.isRole?(_a)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isRole #{_a} : failed"
+                  _executeIt = false
+                end
+
+              elsif _a.is_a?(String) && _a.match(/^\s*[!]*visible\((.*)\)\s*$/i)
+
+                if !Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " visible #{_a} : failed"
+                  _executeIt = false
+                end
+
+              elsif _a.is_a?(String) && _a.match(/^\s*[!]*(isSelected|selected)\((.*)\)\s*$/i)
+
+                if !Scoutui::Base::Assertions.instance.isSelected?(my_driver, _a)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isSelected => false"
+                  _executeIt=false
+                end
+
+              elsif _a.is_a?(String) && _a.match(/(value|text)\s*\(.*\)\s*\=\s*(.*)/i)
+
+                if !Scoutui::Base::Assertions.instance.isValue?(my_driver, _a)
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " value doesnt match"
+                  _executeIt = false
+                end
+
+              end
+
+              if !_executeIt
+                break
+              end
+
+            end
+
+            if !_executeIt
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Dont execute"
+              next
+            end
+
 
           elsif _execute_when.is_a?(String)
             _rc=Scoutui::Base::Assertions.instance.isVisible(my_driver, _execute_when, _reqid, true)

data/lib/scoutui/commands/utils.rb

@@ -184,7 +184,7 @@ module Scoutui::Commands
 
     def isSelectWindow?(_action)
       Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " isSelectWindow?(#{_action})"
-      !_action.match(/select_window/i).nil?
+      !_action.match(/^\s*select_window/i).nil?
     end
 
     def isExistsAlert?(_action)
@@ -236,7 +236,7 @@ module Scoutui::Commands
     end
 
     def isSelect?(_action)
-      !_action.nil? && _action.match(/select/i)
+      !_action.nil? && _action.match(/^\s*select\s*\(/i)
     end
 
     def isNavigate?(_action)

data/lib/scoutui/version.rb

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

metadata

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